Mercurial > hg
changeset 11399:0ebc8be6f52a
i18n-sv: split messages into paragraphs
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 19 Jun 2010 17:19:15 +0200 |
| parents | 805bf1c944d3 |
| children | e5b7841e0008 |
| files | i18n/sv.po |
| diffstat | 1 files changed, 3961 insertions(+), 2523 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/sv.po Sat Jun 19 17:19:15 2010 +0200 +++ b/i18n/sv.po Sat Jun 19 17:19:15 2010 +0200 @@ -1,14 +1,14 @@ # Swedish translation for Mercurial # Svensk översättning för Mercurial # Copyright (C) 2009-2010 Matt Mackall and others -# +# # Translation dictionary: -# +# # changeset ändring # commit arkivera # merge sammanfoga # tag märke -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" @@ -31,62 +31,72 @@ msgid "Commands" msgstr "Kommandon" -msgid "" -" options:\n" -"\n" -msgstr "" -" flaggor:\n" -"\n" - -#, python-format -msgid "" -" aliases: %s\n" -"\n" -msgstr "" -" alias: %s\n" -"\n" - -msgid "" -"hooks for controlling repository access\n" -"\n" +msgid " options:" +msgstr " flaggor:" + +#, python-format +msgid " aliases: %s" +msgstr " alias: %s" + +msgid "hooks for controlling repository access" +msgstr "" + +msgid "" "This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets.\n" -"\n" +"of a repository when receiving incoming changesets." +msgstr "" + +msgid "" "The authorization is matched based on the local user name on the\n" "system where the hook runs, and not the committer of the original\n" -"changeset (since the latter is merely informative).\n" -"\n" +"changeset (since the latter is merely informative)." +msgstr "" + +msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" "preventing authenticating users from doing anything other than\n" "pushing or pulling. The hook is not safe to use if users have\n" "interactive shell access, as they can then disable the hook.\n" "Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them.\n" -"\n" -"To use this hook, configure the acl extension in your hgrc like this::\n" -"\n" +"is no way to distinguish them." +msgstr "" + +msgid "To use this hook, configure the acl extension in your hgrc like this::" +msgstr "" + +msgid "" " [extensions]\n" -" acl =\n" -"\n" +" acl =" +msgstr "" + +msgid "" " [hooks]\n" -" pretxnchangegroup.acl = python:hgext.acl.hook\n" -"\n" +" pretxnchangegroup.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" " [acl]\n" " # Check whether the source of incoming changes is in this list\n" " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" -" sources = serve\n" -"\n" +" sources = serve" +msgstr "" + +msgid "" "The allow and deny sections take a subtree pattern as key (with a glob\n" "syntax by default), and a comma separated list of users as the\n" "corresponding value. The deny list is checked before the allow list\n" -"is. ::\n" -"\n" +"is. ::" +msgstr "" + +msgid "" " [acl.allow]\n" " # If acl.allow is not present, all users are allowed by default.\n" " # An empty acl.allow section means no users allowed.\n" " docs/** = doc_writer\n" -" .hgtags = release_engineer\n" -"\n" +" .hgtags = release_engineer" +msgstr "" + +msgid "" " [acl.deny]\n" " # If acl.deny is not present, no users are refused by default.\n" " # An empty acl.deny section means all users allowed.\n" @@ -102,38 +112,47 @@ msgid "acl: access denied for changeset %s" msgstr "" -msgid "" -"track a line of development with movable markers\n" -"\n" +msgid "track a line of development with movable markers" +msgstr "" + +msgid "" "Bookmarks are local movable markers to changesets. Every bookmark\n" "points to a changeset identified by its hash. If you commit a\n" "changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark shifts to the new changeset.\n" -"\n" +"bookmark shifts to the new changeset." +msgstr "" + +msgid "" "It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" +"merge, hg update)." +msgstr "" + +msgid "" "By default, when several bookmarks point to the same changeset, they\n" "will all move forward together. It is possible to obtain a more\n" "git-like experience by adding the following configuration option to\n" -"your .hgrc::\n" -"\n" +"your .hgrc::" +msgstr "" + +msgid "" " [bookmarks]\n" -" track.current = True\n" -"\n" +" track.current = True" +msgstr "" + +msgid "" "This will cause Mercurial to track the bookmark that you are currently\n" "using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"track a line of development with movable markers\n" -"\n" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" " deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark.\n" -"\n" +" 'hg update' to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" " You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" @@ -177,117 +196,171 @@ msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" -msgid "" -"hooks for integrating with the Bugzilla bug tracker\n" -"\n" +msgid "hooks for integrating with the Bugzilla bug tracker" +msgstr "" + +msgid "" "This hook extension adds comments on bugs in Bugzilla when changesets\n" "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" -"bug status.\n" -"\n" +"bug status." +msgstr "" + +msgid "" "The hook updates the Bugzilla database directly. Only Bugzilla\n" -"installations using MySQL are supported.\n" -"\n" +"installations using MySQL are supported." +msgstr "" + +msgid "" "The hook relies on a Bugzilla script to send bug change notification\n" "emails. That script changes between Bugzilla versions; the\n" "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" "be run by Mercurial as the user pushing the change; you will need to\n" -"ensure the Bugzilla install file permissions are set appropriately.\n" -"\n" +"ensure the Bugzilla install file permissions are set appropriately." +msgstr "" + +msgid "" "The extension is configured through three different configuration\n" -"sections. These keys are recognized in the [bugzilla] section:\n" -"\n" +"sections. These keys are recognized in the [bugzilla] section:" +msgstr "" + +msgid "" "host\n" -" Hostname of the MySQL server holding the Bugzilla database.\n" -"\n" +" Hostname of the MySQL server holding the Bugzilla database." +msgstr "" + +msgid "" "db\n" -" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -"\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'." +msgstr "" + +msgid "" "user\n" -" Username to use to access MySQL server. Default 'bugs'.\n" -"\n" +" Username to use to access MySQL server. Default 'bugs'." +msgstr "" + +msgid "" "password\n" -" Password to use to access MySQL server.\n" -"\n" +" Password to use to access MySQL server." +msgstr "" + +msgid "" "timeout\n" -" Database connection timeout (seconds). Default 5.\n" -"\n" +" Database connection timeout (seconds). Default 5." +msgstr "" + +msgid "" "version\n" " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" -" to 2.18.\n" -"\n" +" to 2.18." +msgstr "" + +msgid "" "bzuser\n" " Fallback Bugzilla user name to record comments with, if changeset\n" -" committer cannot be found as a Bugzilla user.\n" -"\n" +" committer cannot be found as a Bugzilla user." +msgstr "" + +msgid "" "bzdir\n" " Bugzilla install directory. Used by default notify. Default\n" -" '/var/www/html/bugzilla'.\n" -"\n" +" '/var/www/html/bugzilla'." +msgstr "" + +msgid "" "notify\n" " The command to run to get Bugzilla to send bug change notification\n" " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" " and 'user' (committer bugzilla email). Default depends on version;\n" " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" -" %(id)s %(user)s\".\n" -"\n" +" %(id)s %(user)s\"." +msgstr "" + +msgid "" "regexp\n" " Regular expression to match bug IDs in changeset commit message.\n" " Must contain one \"()\" group. The default expression matches 'Bug\n" " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" -" 1234 and 5678' and variations thereof. Matching is case insensitive.\n" -"\n" +" 1234 and 5678' and variations thereof. Matching is case insensitive." +msgstr "" + +msgid "" "style\n" -" The style file to use when formatting comments.\n" -"\n" +" The style file to use when formatting comments." +msgstr "" + +msgid "" "template\n" " Template to use when formatting comments. Overrides style if\n" " specified. In addition to the usual Mercurial keywords, the\n" -" extension specifies::\n" -"\n" +" extension specifies::" +msgstr "" + +msgid "" " {bug} The Bugzilla bug ID.\n" " {root} The full pathname of the Mercurial repository.\n" " {webroot} Stripped pathname of the Mercurial repository.\n" -" {hgweb} Base URL for browsing Mercurial repositories.\n" -"\n" +" {hgweb} Base URL for browsing Mercurial repositories." +msgstr "" + +msgid "" " Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" -"\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'" +msgstr "" + +msgid "" "strip\n" " The number of slashes to strip from the front of {root} to produce\n" -" {webroot}. Default 0.\n" -"\n" +" {webroot}. Default 0." +msgstr "" + +msgid "" "usermap\n" " Path of file containing Mercurial committer ID to Bugzilla user ID\n" " mappings. If specified, the file should contain one mapping per\n" -" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" -"\n" +" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section." +msgstr "" + +msgid "" "The [usermap] section is used to specify mappings of Mercurial\n" "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" -"\"committer\"=\"Bugzilla user\"\n" -"\n" -"Finally, the [web] section supports one entry:\n" -"\n" +"\"committer\"=\"Bugzilla user\"" +msgstr "" + +msgid "Finally, the [web] section supports one entry:" +msgstr "" + +msgid "" "baseurl\n" " Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" -"\n" -"Activating the extension::\n" -"\n" +" templates as {hgweb}." +msgstr "" + +msgid "Activating the extension::" +msgstr "" + +msgid "" " [extensions]\n" -" bugzilla =\n" -"\n" +" bugzilla =" +msgstr "" + +msgid "" " [hooks]\n" " # run bugzilla hook on every change pulled or pushed in here\n" -" incoming.bugzilla = python:hgext.bugzilla.hook\n" -"\n" -"Example configuration:\n" -"\n" +" incoming.bugzilla = python:hgext.bugzilla.hook" +msgstr "" + +msgid "Example configuration:" +msgstr "" + +msgid "" "This example configuration is for a collection of Mercurial\n" "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" -"installation in /opt/bugzilla-3.2. ::\n" -"\n" +"installation in /opt/bugzilla-3.2. ::" +msgstr "" + +msgid "" " [bugzilla]\n" " host=localhost\n" " password=XYZZY\n" @@ -297,20 +370,28 @@ " template=Changeset {node|short} in {root|basename}.\n" " {hgweb}/{webroot}/rev/{node|short}\\n\n" " {desc}\\n\n" -" strip=5\n" -"\n" +" strip=5" +msgstr "" + +msgid "" " [web]\n" -" baseurl=http://dev.domain.com/hg\n" -"\n" +" baseurl=http://dev.domain.com/hg" +msgstr "" + +msgid "" " [usermap]\n" -" user@emaildomain.com=user.name@bugzilladomain.com\n" -"\n" -"Commits add a comment to the Bugzilla bug record of the form::\n" -"\n" +" user@emaildomain.com=user.name@bugzilladomain.com" +msgstr "" + +msgid "Commits add a comment to the Bugzilla bug record of the form::" +msgstr "" + +msgid "" " Changeset 3b16791d6642 in repository-name.\n" -" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" -"\n" -" Changeset commit comment. Bug 1234.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642" +msgstr "" + +msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format @@ -387,9 +468,10 @@ msgid "command to display child changesets" msgstr "" -msgid "" -"show the children of the given or working directory revision\n" -"\n" +msgid "show the children of the given or working directory revision" +msgstr "" + +msgid "" " Print the children of the working directory's revisions. If a\n" " revision is given via -r/--rev, the children of that revision will\n" " be printed. If a file argument is given, revision in which the\n" @@ -414,38 +496,55 @@ msgid "analyzing" msgstr "analyserar" -msgid "" -"histogram of changes to the repository\n" -"\n" +msgid "histogram of changes to the repository" +msgstr "" + +msgid "" " This command will display a histogram representing the number\n" " of changed lines or revisions, grouped according to the given\n" " template. The default template will group changes by author.\n" " The --dateformat option may be used to group the results by\n" -" date instead.\n" -"\n" +" date instead." +msgstr "" + +msgid "" " Statistics are based on the number of changed lines, or\n" " alternatively the number of matching revisions if the\n" -" --changesets option is specified.\n" -"\n" -" Examples::\n" -"\n" +" --changesets option is specified." +msgstr "" + +msgid " Examples::" +msgstr "" + +msgid "" " # display count of changed lines for every committer\n" -" hg churn -t '{author|email}'\n" -"\n" +" hg churn -t '{author|email}'" +msgstr "" + +msgid "" " # display daily activity graph\n" -" hg churn -f '%H' -s -c\n" -"\n" +" hg churn -f '%H' -s -c" +msgstr "" + +msgid "" " # display activity of developers by month\n" -" hg churn -f '%Y-%m' -s -c\n" -"\n" +" hg churn -f '%Y-%m' -s -c" +msgstr "" + +msgid "" " # display count of lines changed in every year\n" -" hg churn -f '%Y' -s\n" -"\n" +" hg churn -f '%Y' -s" +msgstr "" + +msgid "" " It is possible to map alternate email addresses to a main address\n" -" by providing a file using the following format::\n" -"\n" -" <alias email> <actual email>\n" -"\n" +" by providing a file using the following format::" +msgstr "" + +msgid " <alias email> <actual email>" +msgstr "" + +msgid "" " Such a file may be specified with the --aliases option, otherwise\n" " a .hgchurn file will be looked for in the working directory root.\n" " " @@ -478,39 +577,72 @@ msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" msgstr "hg churn [-d DATUM] [-r REV] [--aliases FIL] [FIL]" -msgid "" -"colorize output from some commands\n" -"\n" -"This extension modifies the status and resolve commands to add color to " -"their\n" +msgid "colorize output from some commands" +msgstr "färglägg utmatning från vissa kommandon" + +msgid "" +"This extension modifies the status and resolve commands to add color to their\n" "output to reflect file status, the qseries command to add color to reflect\n" "patch status (applied, unapplied, missing), and to diff-related\n" "commands to highlight additions, removals, diff headers, and trailing\n" -"whitespace.\n" -"\n" +"whitespace." +msgstr "" +"Denna utökning modifierar kommandona status och resolve för att färglägga\n" +"deras utmaning för att spegla filstatus, qseries-kommandon för att\n" +"färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n" +"diff-relaterade kommandon för att framhäva additioner, borttagningar,\n" +"diffhuvuden, och eftersläpande blanktecken." + +msgid "" "Other effects in addition to color, like bold and underlined text, are\n" "also available. Effects are rendered with the ECMA-48 SGR control\n" "function (aka ANSI escape codes). This module also provides the\n" -"render_text function, which can be used to add effects to any text.\n" -"\n" -"Default effects may be overridden from the .hgrc file::\n" -"\n" +"render_text function, which can be used to add effects to any text." +msgstr "" +"Andra effekter förutom färg, såsom fet och understryken text, är också\n" +"tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n" +"(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" +"render_text, som kan användas för att lägga till effekter på valfri text." + +msgid "Default effects may be overridden from the .hgrc file::" +msgstr "Standardeffekter kan ersättas från .hgrc-filen::" + +msgid "" " [color]\n" " status.modified = blue bold underline red_background\n" " status.added = green bold\n" " status.removed = red bold blue_background\n" " status.deleted = cyan bold underline\n" " status.unknown = magenta bold underline\n" -" status.ignored = black bold\n" -"\n" +" status.ignored = black bold" +msgstr "" +" [color]\n" +" status.modified = blue bold underline red_background\n" +" status.added = green bold\n" +" status.removed = red bold blue_background\n" +" status.deleted = cyan bold underline\n" +" status.unknown = magenta bold underline\n" +" status.ignored = black bold" + +msgid "" " # 'none' turns off all effects\n" " status.clean = none\n" -" status.copied = none\n" -"\n" +" status.copied = none" +msgstr "" +" # 'none' stänger av alla effekter\n" +" status.clean = none\n" +" status.copied = none" + +msgid "" " qseries.applied = blue bold underline\n" " qseries.unapplied = black bold\n" -" qseries.missing = red bold\n" -"\n" +" qseries.missing = red bold" +msgstr "" +" qseries.applied = blue bold underline\n" +" qseries.unapplied = black bold\n" +" qseries.missing = red bold" + +msgid "" " diff.diffline = bold\n" " diff.extended = cyan bold\n" " diff.file_a = red bold\n" @@ -519,53 +651,8 @@ " diff.deleted = red\n" " diff.inserted = green\n" " diff.changed = white\n" -" diff.trailingwhitespace = bold red_background\n" -"\n" -" resolve.unresolved = red bold\n" -" resolve.resolved = green bold\n" -"\n" -" bookmarks.current = green\n" -"\n" -"The color extension will try to detect whether to use ANSI codes or\n" -"Win32 console APIs, unless it is made explicit::\n" -"\n" -" [color]\n" -" mode = ansi\n" -"\n" -"Any value other than 'ansi', 'win32', or 'auto' will disable color.\n" -"\n" -msgstr "" -"färglägg utmatning från vissa kommandon\n" -"\n" -"Denna utökning modifierar kommandona status och resolve för att färglägga\n" -"deras utmaning för att spegla filstatus, qseries-kommandon för att\n" -"färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n" -"diff-relaterade kommandon för att framhäva additioner, borttagningar,\n" -"diffhuvuden, och eftersläpande blanktecken.\n" -"\n" -"Andra effekter förutom färg, såsom fet och understryken text, är också\n" -"tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n" -"(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" -"render_text, som kan användas för att lägga till effekter på valfri text.\n" -"\n" -"Standardeffekter kan ersättas från .hgrc-filen::\n" -"\n" -" [color]\n" -" status.modified = blue bold underline red_background\n" -" status.added = green bold\n" -" status.removed = red bold blue_background\n" -" status.deleted = cyan bold underline\n" -" status.unknown = magenta bold underline\n" -" status.ignored = black bold\n" -"\n" -" # 'none' stänger av alla effekter\n" -" status.clean = none\n" -" status.copied = none\n" -"\n" -" qseries.applied = blue bold underline\n" -" qseries.unapplied = black bold\n" -" qseries.missing = red bold\n" -"\n" +" diff.trailingwhitespace = bold red_background" +msgstr "" " diff.diffline = bold\n" " diff.extended = cyan bold\n" " diff.file_a = red bold\n" @@ -574,21 +661,34 @@ " diff.deleted = red\n" " diff.inserted = green\n" " diff.changed = white\n" -" diff.trailingwhitespace = bold red_background\n" -"\n" +" diff.trailingwhitespace = bold red_background" + +msgid "" +" resolve.unresolved = red bold\n" +" resolve.resolved = green bold" +msgstr "" " resolve.unresolved = red bold\n" -" resolve.resolved = green bold\n" -"\n" -" bookmarks.current = green\n" -"\n" +" resolve.resolved = green bold" + +msgid " bookmarks.current = green" +msgstr " bookmarks.current = green" + +msgid "" +"The color extension will try to detect whether to use ANSI codes or\n" +"Win32 console APIs, unless it is made explicit::" +msgstr "" "Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n" -"konsolen i Win32 om det inte anges explicit::\n" -"\n" +"konsolen i Win32 om det inte anges explicit::" + +msgid "" " [color]\n" -" mode = ansi\n" -"\n" -"Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg.\n" -"\n" +" mode = ansi" +msgstr "" +" [color]\n" +" mode = ansi" + +msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color." +msgstr "Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg." #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" @@ -603,11 +703,13 @@ msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" -msgid "" -"convert a foreign SCM repository to a Mercurial one.\n" -"\n" -" Accepted source formats [identifiers]:\n" -"\n" +msgid "convert a foreign SCM repository to a Mercurial one." +msgstr "" + +msgid " Accepted source formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -616,72 +718,103 @@ " - Monotone [mtn]\n" " - GNU Arch [gnuarch]\n" " - Bazaar [bzr]\n" -" - Perforce [p4]\n" -"\n" -" Accepted destination formats [identifiers]:\n" -"\n" +" - Perforce [p4]" +msgstr "" + +msgid " Accepted destination formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" -" - Subversion [svn] (history on branches is not preserved)\n" -"\n" +" - Subversion [svn] (history on branches is not preserved)" +msgstr "" + +msgid "" " If no revision is given, all revisions will be converted.\n" " Otherwise, convert will only import up to the named revision\n" -" (given in a format understood by the source).\n" -"\n" +" (given in a format understood by the source)." +msgstr "" + +msgid "" " If no destination directory name is specified, it defaults to the\n" " basename of the source with '-hg' appended. If the destination\n" -" repository doesn't exist, it will be created.\n" -"\n" +" repository doesn't exist, it will be created." +msgstr "" + +msgid "" " By default, all sources except Mercurial will use --branchsort.\n" " Mercurial uses --sourcesort to preserve original revision numbers\n" -" order. Sort modes have the following effects:\n" -"\n" +" order. Sort modes have the following effects:" +msgstr "" + +msgid "" " --branchsort convert from parent to child revision when possible,\n" " which means branches are usually converted one after\n" -" the other. It generates more compact repositories.\n" -"\n" +" the other. It generates more compact repositories." +msgstr "" + +msgid "" " --datesort sort revisions by date. Converted repositories have\n" " good-looking changelogs but are often an order of\n" " magnitude larger than the same ones generated by\n" -" --branchsort.\n" -"\n" +" --branchsort." +msgstr "" + +msgid "" " --sourcesort try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" -"\n" +" supported by Mercurial sources." +msgstr "" + +msgid "" " If <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so::\n" -"\n" -" <source ID> <destination ID>\n" -"\n" +" revision, like so::" +msgstr "" + +msgid " <source ID> <destination ID>" +msgstr "" + +msgid "" " If the file doesn't exist, it's automatically created. It's\n" " updated on each commit copied, so convert-repo can be interrupted\n" -" and can be run repeatedly to copy new commits.\n" -"\n" +" and can be run repeatedly to copy new commits." +msgstr "" + +msgid "" " The [username mapping] file is a simple text file that maps each\n" " source commit author to a destination commit author. It is handy\n" " for source SCMs that use unix logins to identify authors (eg:\n" " CVS). One line per author mapping and the line format is:\n" -" srcauthor=whatever string you want\n" -"\n" +" srcauthor=whatever string you want" +msgstr "" + +msgid "" " The filemap is a file that allows filtering and remapping of files\n" " and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives::\n" -"\n" -" include path/to/file\n" -"\n" -" exclude path/to/file\n" -"\n" -" rename from/file to/file\n" -"\n" +" contain one of the following directives::" +msgstr "" + +msgid " include path/to/file" +msgstr "" + +msgid " exclude path/to/file" +msgstr "" + +msgid " rename from/file to/file" +msgstr "" + +msgid "" " The 'include' directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" " exclusion of all other files and directories not explicitly\n" " included. The 'exclude' directive causes files or directories to\n" " be omitted. The 'rename' directive renames a file or directory. To\n" " rename from a subdirectory into the root of the repository, use\n" -" '.' as the path to rename to.\n" -"\n" +" '.' as the path to rename to." +msgstr "" + +msgid "" " The splicemap is a file that allows insertion of synthetic\n" " history, letting you specify the parents of a revision. This is\n" " useful if you want to e.g. give a Subversion merge two parents, or\n" @@ -694,8 +827,10 @@ " should be used as the new parents for that node. For example, if\n" " you have merged \"release-1.0\" into \"trunk\", then you should\n" " specify the revision on \"trunk\" as the first parent and the one on\n" -" the \"release-1.0\" branch as the second.\n" -"\n" +" the \"release-1.0\" branch as the second." +msgstr "" + +msgid "" " The branchmap is a file that allows you to rename a branch when it is\n" " being brought in from whatever external repository. When used in\n" " conjunction with a splicemap, it allows for a powerful combination\n" @@ -705,11 +840,15 @@ " \"original_branch_name\" is the name of the branch in the source\n" " repository, and \"new_branch_name\" is the name of the branch is the\n" " destination repository. This can be used to (for instance) move code\n" -" in one repository from \"default\" to a named branch.\n" -"\n" +" in one repository from \"default\" to a named branch." +msgstr "" + +msgid "" " Mercurial Source\n" -" ----------------\n" -"\n" +" ----------------" +msgstr "" + +msgid "" " --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" @@ -718,11 +857,15 @@ " store original revision ID in changeset (forces target IDs to\n" " change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" -" convert start revision and its descendants\n" -"\n" +" convert start revision and its descendants" +msgstr "" + +msgid "" " CVS Source\n" -" ----------\n" -"\n" +" ----------" +msgstr "" + +msgid "" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" " access to the repository files is not needed, unless of course the\n" @@ -731,10 +874,13 @@ " commands to find files to convert. This means that unless a\n" " filemap is given, all files under the starting directory will be\n" " converted, and that any directory reorganization in the CVS\n" -" sandbox is ignored.\n" -"\n" -" The options shown are the defaults.\n" -"\n" +" sandbox is ignored." +msgstr "" + +msgid " The options shown are the defaults." +msgstr "" + +msgid "" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -761,16 +907,22 @@ " Specify a Python function to be called after the changesets\n" " are calculated from the the CVS log. The function is passed\n" " a list with the changeset entries, and can modify the changesets\n" -" in-place, or add or delete them.\n" -"\n" +" in-place, or add or delete them." +msgstr "" + +msgid "" " An additional \"debugcvsps\" Mercurial command allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" " parameters and output are similar to that of cvsps 2.1. Please see\n" -" the command help for more details.\n" -"\n" +" the command help for more details." +msgstr "" + +msgid "" " Subversion Source\n" -" -----------------\n" -"\n" +" -----------------" +msgstr "" + +msgid "" " Subversion source detects classical trunk/branches/tags layouts.\n" " By default, the supplied \"svn://repo/path/\" source URL is\n" " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" @@ -780,58 +932,80 @@ " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" " can be overridden with following options. Set them to paths\n" " relative to the source URL, or leave them blank to disable auto\n" -" detection.\n" -"\n" +" detection." +msgstr "" + +msgid "" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" " --config convert.svn.tags=tags (directory name)\n" " specify the directory containing tags\n" " --config convert.svn.trunk=trunk (directory name)\n" -" specify the name of the trunk branch\n" -"\n" +" specify the name of the trunk branch" +msgstr "" + +msgid "" " Source history can be retrieved starting at a specific revision,\n" " instead of being integrally converted. Only single branch\n" -" conversions are supported.\n" -"\n" +" conversions are supported." +msgstr "" + +msgid "" " --config convert.svn.startrev=0 (svn revision number)\n" -" specify start Subversion revision.\n" -"\n" +" specify start Subversion revision." +msgstr "" + +msgid "" " Perforce Source\n" -" ---------------\n" -"\n" +" ---------------" +msgstr "" + +msgid "" " The Perforce (P4) importer can be given a p4 depot path or a\n" " client specification as source. It will convert all files in the\n" " source to a flat Mercurial repository, ignoring labels, branches\n" " and integrations. Note that when a depot path is given you then\n" " usually should specify a target directory, because otherwise the\n" -" target may be named ...-hg.\n" -"\n" +" target may be named ...-hg." +msgstr "" + +msgid "" " It is possible to limit the amount of source history to be\n" -" converted by specifying an initial Perforce revision.\n" -"\n" +" converted by specifying an initial Perforce revision." +msgstr "" + +msgid "" " --config convert.p4.startrev=0 (perforce changelist number)\n" -" specify initial Perforce revision.\n" -"\n" +" specify initial Perforce revision." +msgstr "" + +msgid "" " Mercurial Destination\n" -" ---------------------\n" -"\n" +" ---------------------" +msgstr "" + +msgid "" " --config convert.hg.clonebranches=False (boolean)\n" " dispatch source branches in separate clones.\n" " --config convert.hg.tagsbranch=default (branch name)\n" " tag revisions branch name\n" " --config convert.hg.usebranchnames=True (boolean)\n" -" preserve branch names\n" -"\n" -" " -msgstr "" - -msgid "" -"create changeset information from CVS\n" -"\n" +" preserve branch names" +msgstr "" + +msgid " " +msgstr "" + +msgid "create changeset information from CVS" +msgstr "" + +msgid "" " This command is intended as a debugging tool for the CVS to\n" " Mercurial converter, and can be used as a direct replacement for\n" -" cvsps.\n" -"\n" +" cvsps." +msgstr "" + +msgid "" " Hg debugcvsps reads the CVS rlog for current directory (or any\n" " named directory) in the CVS repository, and converts the log to a\n" " series of changesets based on matching commit log entries and\n" @@ -904,9 +1078,7 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" -msgid "" -"warning: lightweight checkouts may cause conversion failures, try with a " -"regular branch instead.\n" +msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" msgstr "" msgid "bzr source type could not be determined\n" @@ -1026,8 +1198,7 @@ msgstr "" #, python-format -msgid "" -"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1136,8 +1307,7 @@ msgstr "" #, python-format -msgid "" -"tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1187,9 +1357,7 @@ 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" +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" @@ -1274,37 +1442,50 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" -msgid "" -"command to allow external programs to compare revisions\n" -"\n" +msgid "command to allow external programs to compare revisions" +msgstr "" + +msgid "" "The extdiff Mercurial extension allows you to use external programs\n" "to compare revisions, or revision with working directory. The external\n" "diff programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" -"files to compare.\n" -"\n" +"files to compare." +msgstr "" + +msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" -"\n" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +msgstr "" + +msgid "" " [extdiff]\n" " # add new command that runs GNU diff(1) in 'context diff' mode\n" " cdiff = gdiff -Nprc5\n" " ## or the old way:\n" " #cmd.cdiff = gdiff\n" -" #opts.cdiff = -Nprc5\n" -"\n" +" #opts.cdiff = -Nprc5" +msgstr "" + +msgid "" " # add new command called vdiff, runs kdiff3\n" -" vdiff = kdiff3\n" -"\n" +" vdiff = kdiff3" +msgstr "" + +msgid "" " # add new command called meld, runs meld (no need to name twice)\n" -" meld =\n" -"\n" +" meld =" +msgstr "" + +msgid "" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" -" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" -"\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" +msgstr "" + +msgid "" "You can use -I/-X and list of file or directory names like normal \"hg\n" "diff\" command. The extdiff extension makes snapshots of only needed\n" "files, so running the external diff program will actually be pretty\n" @@ -1325,18 +1506,23 @@ msgid "cleaning up temp directory\n" msgstr "" -msgid "" -"use external program to diff repository (or selected files)\n" -"\n" +msgid "use external program to diff repository (or selected files)" +msgstr "" + +msgid "" " Show differences between revisions for the specified files, using\n" " an external program. The default program used is diff, with\n" -" default options \"-Npru\".\n" -"\n" +" default options \"-Npru\"." +msgstr "" + +msgid "" " To select a different program, use the -p/--program option. The\n" " program will be passed the names of two directories to compare. To\n" " pass additional options to the program, use -o/--option. These\n" -" will be passed before the names of the directories to compare.\n" -"\n" +" will be passed before the names of the directories to compare." +msgstr "" + +msgid "" " When two revision arguments are given, then changes are shown\n" " between those revisions. If only one revision is specified then\n" " that revision is compared to the working directory, and, when no\n" @@ -1357,17 +1543,13 @@ msgstr "" #, python-format -msgid "" -"use %(path)s to diff repository (or selected files)\n" -"\n" +msgid "use %(path)s to diff repository (or selected files)" +msgstr "" + +#, python-format +msgid "" " Show differences between revisions for the specified files, using\n" -" the %(path)s program.\n" -"\n" -" When two revision arguments are given, then changes are shown\n" -" between those revisions. If only one revision is specified then\n" -" that revision is compared to the working directory, and, when no\n" -" revisions are specified, the working directory files are compared\n" -" to its parent." +" the %(path)s program." msgstr "" #, python-format @@ -1377,28 +1559,34 @@ msgid "pull, update and merge in one command" msgstr "" -msgid "" -"pull changes from a remote repository, merge new changes if needed.\n" -"\n" +msgid "pull changes from a remote repository, merge new changes if needed." +msgstr "" + +msgid "" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository.\n" -"\n" +" or URL and adds them to the local repository." +msgstr "" + +msgid "" " If the pulled changes add a new branch head, the head is\n" " automatically merged, and the result of the merge is committed.\n" " Otherwise, the working directory is updated to include the new\n" -" changes.\n" -"\n" +" changes." +msgstr "" + +msgid "" " When a merge occurs, the newly pulled changes are assumed to be\n" " \"authoritative\". The head of the new changes is used as the first\n" " parent, with local changes as the second. To switch the merge\n" -" order, use --switch-parent.\n" -"\n" +" order, use --switch-parent." +msgstr "" + +msgid "" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -msgid "" -"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" msgid "outstanding uncommitted merge" @@ -1410,23 +1598,18 @@ msgid "working directory is missing some files" msgstr "" -msgid "" -"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" #, python-format msgid "pulling from %s\n" msgstr "drar från %s\n" -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" - -#, python-format -msgid "" -"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" -"\" to merge them)\n" +msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." +msgstr "" + +#, python-format +msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" msgstr "" #, python-format @@ -1488,14 +1671,12 @@ msgid "No valid signature for %s\n" msgstr "" -msgid "" -"add a signature for the current or given revision\n" -"\n" +msgid "add a signature for the current or given revision" +msgstr "" + +msgid "" " If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" or tip if no revision is checked out." msgstr "" msgid "uncommitted merge - please provide a specific revision" @@ -1508,9 +1689,7 @@ msgid "Error while signing" msgstr "" -msgid "" -"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" -"force)" +msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" msgstr "" msgid "unknown signature version" @@ -1540,15 +1719,14 @@ msgid "hg sigs" msgstr "" -msgid "" -"command to view revision graphs from a shell\n" -"\n" +msgid "command to view revision graphs from a shell" +msgstr "kommando för att se revisionsgrafer i ett skal" + +msgid "" "This extension adds a --graph option to the incoming, outgoing and log\n" "commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" -"kommando för att se revisionsgrafer i ett skal\n" -"\n" "Denna utökning lägger till flaggan --graph till kommandona incoming,\n" "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" "revisionsgrafen.\n" @@ -1557,21 +1735,21 @@ msgid "--graph option is incompatible with --%s" msgstr "flaggan --graph är inkompatibel med --%s" -msgid "" -"show revision history alongside an ASCII revision graph\n" -"\n" +msgid "show revision history alongside an ASCII revision graph" +msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf" + +msgid "" " Print a revision history alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" +" ASCII characters." +msgstr "" +" Visa en revisionshistorik bredvid en revisionsgraf ritad med\n" +" ASCII-tecken." + +msgid "" " Nodes printed as an @ character are parents of the working\n" " directory.\n" " " msgstr "" -"visa revisionshistorik vid sidan av en ASCII-revisionsgraf\n" -"\n" -" Visa en revisionshistorik bredvid en revisionsgraf ritad med\n" -" ASCII-tecken.\n" -"\n" " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" " " @@ -1597,12 +1775,15 @@ msgid "hg glog [OPTION]... [FILE]" msgstr "hg glog [FLAGGA]... [FIL]" -msgid "" -"hooks for integrating with the CIA.vc notification service\n" -"\n" +msgid "hooks for integrating with the CIA.vc notification service" +msgstr "" + +msgid "" "This is meant to be run as a changegroup or incoming hook. To\n" -"configure it, set the following options in your hgrc::\n" -"\n" +"configure it, set the following options in your hgrc::" +msgstr "" + +msgid "" " [cia]\n" " # your registered CIA user name\n" " user = foo\n" @@ -1622,13 +1803,17 @@ " # Make sure to set email.from if you do this.\n" " #url = http://cia.vc/\n" " # print message instead of sending it (optional)\n" -" #test = False\n" -"\n" +" #test = False" +msgstr "" + +msgid "" " [hooks]\n" " # one of these:\n" " changegroup.cia = python:hgcia.hook\n" -" #incoming.cia = python:hgcia.hook\n" -"\n" +" #incoming.cia = python:hgcia.hook" +msgstr "" + +msgid "" " [web]\n" " # If you want hyperlinks (optional)\n" " baseurl = http://server/path/to/repo\n" @@ -1645,32 +1830,45 @@ msgid "email.from must be defined when sending by email" msgstr "" -msgid "" -"browse the repository in a graphical way\n" -"\n" +msgid "browse the repository in a graphical way" +msgstr "" + +msgid "" "The hgk extension allows browsing the history of a repository in a\n" "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" -"distributed with Mercurial.)\n" -"\n" +"distributed with Mercurial.)" +msgstr "" + +msgid "" "hgk consists of two parts: a Tcl script that does the displaying and\n" "querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" "the contrib directory, and the extension is shipped in the hgext\n" -"repository, and needs to be enabled.\n" -"\n" +"repository, and needs to be enabled." +msgstr "" + +msgid "" "The hg view command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" -"the path to hgk in your .hgrc file::\n" -"\n" +"the path to hgk in your .hgrc file::" +msgstr "" + +msgid "" " [hgk]\n" -" path=/location/of/hgk\n" -"\n" +" path=/location/of/hgk" +msgstr "" + +msgid "" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add::\n" -"\n" +"Assuming you had already configured extdiff vdiff command, just add::" +msgstr "" + +msgid "" " [hgk]\n" -" vdiff=vdiff\n" -"\n" +" vdiff=vdiff" +msgstr "" + +msgid "" "Revisions context menu will now display additional entries to fire\n" "vdiff on hovered and selected revisions.\n" msgstr "" @@ -1756,18 +1954,23 @@ msgid "hg debug-rev-list [OPTION]... REV..." msgstr "" -msgid "" -"syntax highlighting for hgweb (requires Pygments)\n" -"\n" +msgid "syntax highlighting for hgweb (requires Pygments)" +msgstr "" + +msgid "" "It depends on the Pygments syntax highlighting library:\n" -"http://pygments.org/\n" -"\n" -"There is a single configuration option::\n" -"\n" +"http://pygments.org/" +msgstr "" + +msgid "There is a single configuration option::" +msgstr "" + +msgid "" " [web]\n" -" pygments_style = <style>\n" -"\n" -"The default is 'colorful'.\n" +" pygments_style = <style>" +msgstr "" + +msgid "The default is 'colorful'.\n" msgstr "" msgid "accelerate status report using Linux's inotify service" @@ -1776,9 +1979,10 @@ msgid "start an inotify server for this repository" msgstr "" -msgid "" -"debugging information for inotify extension\n" -"\n" +msgid "debugging information for inotify extension" +msgstr "" + +msgid "" " Prints the list of directories being watched by the inotify server.\n" " " msgstr "" @@ -1913,9 +2117,7 @@ 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" +msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists" msgstr "" #, python-format @@ -1930,20 +2132,24 @@ msgid "unrecognized query type: %s\n" msgstr "" -msgid "" -"expand expressions into changelog and summaries\n" -"\n" +msgid "expand expressions into changelog and summaries" +msgstr "" + +msgid "" "This extension allows the use of a special syntax in summaries, which\n" "will be automatically expanded into links or any other arbitrary\n" -"expression, much like InterWiki does.\n" -"\n" +"expression, much like InterWiki does." +msgstr "" + +msgid "" "A few example patterns (link to bug tracking, etc.) that may be used\n" -"in your hgrc::\n" -"\n" +"in your hgrc::" +msgstr "" + +msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" -"i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" @@ -1955,52 +2161,76 @@ msgid "interhg: invalid regexp for %s: %s\n" msgstr "" -msgid "" -"expand keywords in tracked files\n" -"\n" +msgid "expand keywords in tracked files" +msgstr "" + +msgid "" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" -"tracked text files selected by your configuration.\n" -"\n" +"tracked text files selected by your configuration." +msgstr "" + +msgid "" "Keywords are only expanded in local repositories and not stored in the\n" "change history. The mechanism can be regarded as a convenience for the\n" -"current user or for archive distribution.\n" -"\n" +"current user or for archive distribution." +msgstr "" + +msgid "" "Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files.\n" -"\n" -"Example::\n" -"\n" +"hgrc files." +msgstr "" + +msgid "Example::" +msgstr "" + +msgid "" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" -" x* = ignore\n" -"\n" +" x* = ignore" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories.\n" -"\n" +"lose speed in huge repositories." +msgstr "" + +msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" -"available templates and filters.\n" -"\n" +"available templates and filters." +msgstr "" + +msgid "" "An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\".\n" -"\n" +"returns a date like \"2006/09/18 15:13:13\"." +msgstr "" + +msgid "" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes.\n" -"\n" +"kwdemo\" to control the results of your config changes." +msgstr "" + +msgid "" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" -"history.\n" -"\n" +"history." +msgstr "" + +msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\".\n" -"\n" +"\"hg kwexpand\"." +msgstr "" + +msgid "" "Also, when committing with the record extension or using mq's qrecord,\n" "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" "the files in question to update keyword expansions after all changes\n" -"have been checked in.\n" -"\n" +"have been checked in." +msgstr "" + +msgid "" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" "{desc}\" expands to the first line of the changeset description.\n" @@ -2020,17 +2250,23 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "" -"print [keywordmaps] configuration and an expansion example\n" -"\n" +msgid "print [keywordmaps] configuration and an expansion example" +msgstr "" + +msgid "" " Show current, custom, or default keyword template maps and their\n" -" expansions.\n" -"\n" +" expansions." +msgstr "" + +msgid "" " Extend the current configuration by specifying maps as arguments\n" -" and using -f/--rcfile to source an external hgrc file.\n" -"\n" -" Use -d/--default to disable current configuration.\n" -"\n" +" and using -f/--rcfile to source an external hgrc file." +msgstr "" + +msgid " Use -d/--default to disable current configuration." +msgstr "" + +msgid "" " See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" @@ -2077,31 +2313,42 @@ "\tkeywords expanded\n" msgstr "" -msgid "" -"expand keywords in the working directory\n" -"\n" -" Run after (re)enabling keyword expansion.\n" -"\n" +msgid "expand keywords in the working directory" +msgstr "" + +msgid " Run after (re)enabling keyword expansion." +msgstr "" + +msgid "" " kwexpand refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"show files configured for keyword expansion\n" -"\n" +msgid "show files configured for keyword expansion" +msgstr "" + +msgid "" " List which files in the working directory are matched by the\n" -" [keyword] configuration patterns.\n" -"\n" +" [keyword] configuration patterns." +msgstr "" + +msgid "" " Useful to prevent inadvertent keyword expansion and to speed up\n" " execution by including only files that are actual candidates for\n" -" expansion.\n" -"\n" +" expansion." +msgstr "" + +msgid "" " See \"hg help keyword\" on how to construct patterns both for\n" -" inclusion and exclusion of files.\n" -"\n" +" inclusion and exclusion of files." +msgstr "" + +msgid "" " With -A/--all and -v/--verbose the codes used to show the status\n" -" of files are::\n" -"\n" +" of files are::" +msgstr "" + +msgid "" " K = keyword expansion candidate\n" " k = keyword expansion candidate (not tracked)\n" " I = ignored\n" @@ -2109,12 +2356,15 @@ " " msgstr "" -msgid "" -"revert expanded keywords in the working directory\n" -"\n" +msgid "revert expanded keywords in the working directory" +msgstr "" + +msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\".\n" -"\n" +" problems with \"hg import\" or \"hg merge\"." +msgstr "" + +msgid "" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" @@ -2146,35 +2396,51 @@ msgid "hg kwshrink [OPTION]... [FILE]..." msgstr "" -msgid "" -"manage a stack of patches\n" -"\n" +msgid "manage a stack of patches" +msgstr "" + +msgid "" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" -"applied patches (subset of known patches).\n" -"\n" +"applied patches (subset of known patches)." +msgstr "" + +msgid "" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" -"\n" -"Common tasks (use \"hg help command\" for more details)::\n" -"\n" +"directory. Applied patches are both patch files and changesets." +msgstr "" + +msgid "Common tasks (use \"hg help command\" for more details)::" +msgstr "" + +msgid "" " create new patch qnew\n" -" import existing patch qimport\n" -"\n" +" import existing patch qimport" +msgstr "" + +msgid "" " print patch series qseries\n" -" print applied patches qapplied\n" -"\n" +" print applied patches qapplied" +msgstr "" + +msgid "" " add known patch to applied stack qpush\n" " remove patch from applied stack qpop\n" -" refresh contents of top applied patch qrefresh\n" -"\n" +" refresh contents of top applied patch qrefresh" +msgstr "" + +msgid "" "By default, mq will automatically use git patches when required to\n" "avoid losing file mode changes, copy records, binary files or empty\n" -"files creations or deletions. This behaviour can be configured with::\n" -"\n" +"files creations or deletions. This behaviour can be configured with::" +msgstr "" + +msgid "" " [mq]\n" -" git = auto/keep/yes/no\n" -"\n" +" git = auto/keep/yes/no" +msgstr "" + +msgid "" "If set to 'keep', mq will obey the [diff] section configuration while\n" "preserving existing git patches upon qrefresh. If set to 'yes' or\n" "'no', mq will override the [diff] section and always generate git or\n" @@ -2414,9 +2680,7 @@ msgid "cannot refresh a revision with children" msgstr "" -msgid "" -"refresh interrupted while patch was popped! (revert --all, qpush to " -"recover)\n" +msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2510,13 +2774,15 @@ msgid "adding %s to series file\n" msgstr "" -msgid "" -"remove patches from queue\n" -"\n" -" The patches must not be applied, and at least one patch is required. " -"With\n" -" -k/--keep, the patch files are preserved in the patch directory.\n" -"\n" +msgid "remove patches from queue" +msgstr "" + +msgid "" +" The patches must not be applied, and at least one patch is required. With\n" +" -k/--keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." msgstr "" @@ -2533,60 +2799,79 @@ msgid "all patches applied\n" msgstr "" -msgid "" -"import a patch\n" -"\n" +msgid "import a patch" +msgstr "" + +msgid "" " The patch is inserted into the series after the last applied\n" " patch. If no patches have been applied, qimport prepends the patch\n" -" to the series.\n" -"\n" +" to the series." +msgstr "" + +msgid "" " The patch will have the same name as its source file unless you\n" -" give it a new one with -n/--name.\n" -"\n" +" give it a new one with -n/--name." +msgstr "" + +msgid "" " You can register an existing patch inside the patch directory with\n" -" the -e/--existing flag.\n" -"\n" +" the -e/--existing flag." +msgstr "" + +msgid "" " With -f/--force, an existing patch of the same name will be\n" -" overwritten.\n" -"\n" +" overwritten." +msgstr "" + +msgid "" " An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" " With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" " important for preserving rename/copy information and permission\n" -" changes.\n" -"\n" +" changes." +msgstr "" + +msgid "" " To import a patch from standard input, pass - as the patch file.\n" " When importing from standard input, a patch name must be specified\n" " using the --name flag.\n" " " msgstr "" -msgid "" -"init a new queue repository (DEPRECATED)\n" -"\n" +msgid "init a new queue repository (DEPRECATED)" +msgstr "" + +msgid "" " The queue repository is unversioned by default. If\n" " -c/--create-repo is specified, qinit will create a separate nested\n" " repository for patches (qinit -c may also be run later to convert\n" " an unversioned patch repository into a versioned one). You can use\n" -" qcommit to commit changes to this queue repository.\n" -"\n" +" qcommit to commit changes to this queue repository." +msgstr "" + +msgid "" " This command is deprecated. Without -c, it's implied by other relevant\n" " commands. With -c, use hg init --mq instead." msgstr "" -msgid "" -"clone main and patch repository at same time\n" -"\n" +msgid "clone main and patch repository at same time" +msgstr "" + +msgid "" " If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" " applied in destination. If you clone remote repository, be sure\n" -" before that it has no patches applied.\n" -"\n" +" before that it has no patches applied." +msgstr "" + +msgid "" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" +" default. Use -p <url> to change." +msgstr "" + +msgid "" " The patch directory must be a nested Mercurial repository, as\n" " would be created by init --mq.\n" " " @@ -2607,14 +2892,11 @@ msgid "updating destination repository\n" msgstr "" -msgid "" -"commit changes in the queue repository (DEPRECATED)\n" -"\n" -" This command is deprecated; use hg commit --mq instead." -msgstr "" -"arkivera ändringar i köarkivet (FÖRÅLDRAD)\n" -"\n" -" Detta är ett föråldrat kommando; använd hg commit --mq istället." +msgid "commit changes in the queue repository (DEPRECATED)" +msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" + +msgid " This command is deprecated; use hg commit --mq instead." +msgstr " Detta är ett föråldrat kommando; använd hg commit --mq istället." msgid "print the entire series file" msgstr "" @@ -2628,24 +2910,31 @@ msgid "print the name of the previous patch" msgstr "" -msgid "" -"create a new patch\n" -"\n" +msgid "create a new patch" +msgstr "" + +msgid "" " qnew creates a new patch on top of the currently-applied patch (if\n" " any). The patch will be initialized with any outstanding changes\n" " in the working directory. You may also use -I/--include,\n" " -X/--exclude, and/or a list of files after the patch name to add\n" " only changes to matching files to the new patch, leaving the rest\n" -" as uncommitted modifications.\n" -"\n" +" as uncommitted modifications." +msgstr "" + +msgid "" " -u/--user and -d/--date can be used to set the (given) user and\n" " date, respectively. -U/--currentuser and -D/--currentdate set user\n" -" to current user and date to current date.\n" -"\n" +" to current user and date to current date." +msgstr "" + +msgid "" " -e/--edit, -m/--message or -l/--logfile set the patch header as\n" " well as the commit message. If none is specified, the header is\n" -" empty and the commit message is '[mq]: PATCH'.\n" -"\n" +" empty and the commit message is '[mq]: PATCH'." +msgstr "" + +msgid "" " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" @@ -2653,16 +2942,21 @@ " " msgstr "" -msgid "" -"update the current patch\n" -"\n" +msgid "update the current patch" +msgstr "" + +msgid "" " If any file patterns are provided, the refreshed patch will\n" " contain only the modifications that match those patterns; the\n" -" remaining modifications will remain in the working directory.\n" -"\n" +" remaining modifications will remain in the working directory." +msgstr "" + +msgid "" " If -s/--short is specified, files currently included in the patch\n" -" will be refreshed just like matched files and remain in the patch.\n" -"\n" +" will be refreshed just like matched files and remain in the patch." +msgstr "" + +msgid "" " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" @@ -2673,14 +2967,17 @@ msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" msgstr "" -msgid "" -"diff of the current patch and subsequent modifications\n" -"\n" +msgid "diff of the current patch and subsequent modifications" +msgstr "" + +msgid "" " Shows a diff which includes the current patch as well as any\n" " changes which have been made in the working directory since the\n" " last refresh (thus showing what the current patch would become\n" -" after a qrefresh).\n" -"\n" +" after a qrefresh)." +msgstr "" + +msgid "" " Use 'hg diff' if you only want to see the changes made since the\n" " last qrefresh, or 'hg export qtip' if you want to see changes made\n" " by the current patch without including changes made since the\n" @@ -2688,16 +2985,19 @@ " " msgstr "" -msgid "" -"fold the named patches into the current patch\n" -"\n" +msgid "fold the named patches into the current patch" +msgstr "" + +msgid "" " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" " with the new cumulative patch, and the folded patches will be\n" " deleted. With -k/--keep, the folded patch files will not be\n" -" removed afterwards.\n" -"\n" +" removed afterwards." +msgstr "" + +msgid "" " The header for each folded patch will be concatenated with the\n" " current patch header, separated by a line of '* * *'." msgstr "" @@ -2723,21 +3023,27 @@ msgid "push or pop patches until named patch is at top of stack" msgstr "" -msgid "" -"set or print guards for a patch\n" -"\n" +msgid "set or print guards for a patch" +msgstr "" + +msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" " pushed only if the qselect command has activated it. A patch with\n" " a negative guard (\"-foo\") is never pushed if the qselect command\n" -" has activated it.\n" -"\n" +" has activated it." +msgstr "" + +msgid "" " With no arguments, print the currently active guards.\n" " With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'.\n" -"\n" -" To set guards on another patch::\n" -"\n" +" NOTE: Specifying negative guards now requires '--'." +msgstr "" + +msgid " To set guards on another patch::" +msgstr "" + +msgid "" " hg qguard other.patch -- +2.6.17 -stable\n" " " msgstr "" @@ -2755,9 +3061,10 @@ msgid "print the header of the topmost or specified patch" msgstr "" -msgid "" -"push the next patch onto the stack\n" -"\n" +msgid "push the next patch onto the stack" +msgstr "" + +msgid "" " When -f/--force is applied, all local changes in patched files\n" " will be lost.\n" " " @@ -2770,9 +3077,10 @@ msgid "merging with queue at: %s\n" msgstr "" -msgid "" -"pop the current patch off the stack\n" -"\n" +msgid "pop the current patch off the stack" +msgstr "" + +msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" " top of the stack.\n" @@ -2783,9 +3091,10 @@ msgid "using patch queue: %s\n" msgstr "" -msgid "" -"rename a patch\n" -"\n" +msgid "rename a patch" +msgstr "" + +msgid "" " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" @@ -2802,16 +3111,13 @@ msgid "renaming %s to %s\n" msgstr "döper om %s till %s\n" -msgid "" -"restore the queue state saved by a revision (DEPRECATED)\n" -"\n" -" This command is deprecated, use rebase --mq instead." -msgstr "" - -msgid "" -"save current queue state (DEPRECATED)\n" -"\n" -" This command is deprecated, use rebase --mq instead." +msgid "restore the queue state saved by a revision (DEPRECATED)" +msgstr "" + +msgid " This command is deprecated, use rebase --mq instead." +msgstr "" + +msgid "save current queue state (DEPRECATED)" msgstr "" #, python-format @@ -2826,45 +3132,59 @@ msgid "copy %s to %s\n" msgstr "" -msgid "" -"strip a revision and all its descendants from the repository\n" -"\n" +msgid "strip a revision and all its descendants from the repository" +msgstr "" + +msgid "" " If one of the working directory's parent revisions is stripped, the\n" " working directory will be updated to the parent of the stripped\n" " revision.\n" " " msgstr "" -msgid "" -"set or print guarded patches to push\n" -"\n" +msgid "set or print guarded patches to push" +msgstr "" + +msgid "" " Use the qguard command to set or print guards on patch, then use\n" " 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" -"\n" +" match the current guard. For example::" +msgstr "" + +msgid "" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" -" qselect stable\n" -"\n" +" qselect stable" +msgstr "" + +msgid "" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" " it has a negative match) but push bar.patch (because it has a\n" -" positive match).\n" -"\n" +" positive match)." +msgstr "" + +msgid "" " With no arguments, prints the currently active guards.\n" -" With one argument, sets the active guard.\n" -"\n" +" With one argument, sets the active guard." +msgstr "" + +msgid "" " Use -n/--none to deactivate guards (no other arguments needed).\n" " When no guards are active, patches with positive guards are\n" -" skipped and patches with negative guards are pushed.\n" -"\n" +" skipped and patches with negative guards are pushed." +msgstr "" + +msgid "" " qselect can change the guards on applied patches. It does not pop\n" " guarded patches by default. Use --pop to pop back to the last\n" " applied patch that is not guarded. Use --reapply (which implies\n" " --pop) to push back to the current patch afterwards, but skip\n" -" guarded patches.\n" -"\n" +" guarded patches." +msgstr "" + +msgid "" " Use -s/--series to print a list of all guards in the series file\n" " (no other arguments needed). Use -v for more information." msgstr "" @@ -2898,18 +3218,23 @@ msgid "reapplying unguarded patches\n" msgstr "" -msgid "" -"move applied patches into repository history\n" -"\n" +msgid "move applied patches into repository history" +msgstr "" + +msgid "" " Finishes the specified revisions (corresponding to applied\n" " patches) by moving them out of mq control into regular repository\n" -" history.\n" -"\n" +" history." +msgstr "" + +msgid "" " Accepts a revision range or the -a/--applied option. If --applied\n" " is specified, all applied mq revisions are removed from mq\n" " control. Otherwise, the given revisions must be at the base of the\n" -" stack of applied patches.\n" -"\n" +" stack of applied patches." +msgstr "" + +msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" " to upstream.\n" @@ -3185,33 +3510,47 @@ msgid "hg qfinish [-a] [REV]..." msgstr "" -msgid "" -"hooks for sending email notifications at commit/push time\n" -"\n" +msgid "hooks for sending email notifications at commit/push time" +msgstr "" + +msgid "" "Subscriptions can be managed through a hgrc file. Default mode is to\n" -"print messages to stdout, for testing and configuring.\n" -"\n" +"print messages to stdout, for testing and configuring." +msgstr "" + +msgid "" "To use, configure the notify extension and enable it in hgrc like\n" -"this::\n" -"\n" +"this::" +msgstr "" + +msgid "" " [extensions]\n" -" notify =\n" -"\n" +" notify =" +msgstr "" + +msgid "" " [hooks]\n" " # one email for each incoming changeset\n" " incoming.notify = python:hgext.notify.hook\n" " # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" +" changegroup.notify = python:hgext.notify.hook" +msgstr "" + +msgid "" " [notify]\n" -" # config items go here\n" -"\n" -"Required configuration items::\n" -"\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -"Optional configuration items::\n" -"\n" +" # config items go here" +msgstr "" + +msgid "Required configuration items::" +msgstr "" + +msgid " config = /path/to/file # file containing subscriptions" +msgstr "" + +msgid "Optional configuration items::" +msgstr "" + +msgid "" " test = True # print messages to stdout for testing\n" " strip = 3 # number of slashes to strip for url paths\n" " domain = example.com # domain to use if committer missing domain\n" @@ -3222,31 +3561,40 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " -"list\n" +" sources = serve # notify if source of incoming changes in this list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" " from = user@host.com # email address to send as if none given\n" " [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits" +msgstr "" + +msgid "" "The notify config file has same format as a regular hgrc file. It has\n" "two sections so you can express subscriptions in whatever way is\n" -"handier for you.\n" -"\n" -"::\n" -"\n" +"handier for you." +msgstr "" + +msgid "::" +msgstr "" + +msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" -" user@host = pattern\n" -"\n" +" user@host = pattern" +msgstr "" + +msgid "" " [reposubs]\n" " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" -" pattern = user@host\n" -"\n" -"Glob patterns are matched against path to repository root.\n" -"\n" +" pattern = user@host" +msgstr "" + +msgid "Glob patterns are matched against path to repository root." +msgstr "" + +msgid "" "If you like, you can put notify config file in repository that users\n" "can push changes to, they can manage their own subscriptions.\n" msgstr "" @@ -3262,140 +3610,193 @@ #, python-format msgid "" "\n" -"diffs (truncated from %d to %d lines):\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"diffs (%d lines):\n" -"\n" +"diffs (truncated from %d to %d lines):" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):" msgstr "" #, python-format msgid "notify: suppressing notification for merge %d:%s\n" msgstr "" -msgid "" -"browse command output with an external pager\n" -"\n" -"To set the pager that should be used, set the application variable::\n" -"\n" +msgid "browse command output with an external pager" +msgstr "" + +msgid "To set the pager that should be used, set the application variable::" +msgstr "" + +msgid "" " [pager]\n" -" pager = LESS='FSRX' less\n" -"\n" +" pager = LESS='FSRX' less" +msgstr "" + +msgid "" "If no pager is set, the pager extensions uses the environment variable\n" -"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" -"\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." +msgstr "" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting::\n" -"\n" +"setting::" +msgstr "" + +msgid "" " [pager]\n" -" quiet = True\n" -"\n" +" quiet = True" +msgstr "" + +msgid "" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list::\n" -"\n" +"pager.ignore list::" +msgstr "" + +msgid "" " [pager]\n" -" ignore = version, help, update\n" -"\n" +" ignore = version, help, update" +msgstr "" + +msgid "" "You can also enable the pager only for certain commands using\n" -"pager.attend. Below is the default list of commands to be paged::\n" -"\n" +"pager.attend. Below is the default list of commands to be paged::" +msgstr "" + +msgid "" " [pager]\n" -" attend = annotate, cat, diff, export, glog, log, qdiff\n" -"\n" +" attend = annotate, cat, diff, export, glog, log, qdiff" +msgstr "" + +msgid "" "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" +"paged." +msgstr "" + +msgid "If pager.attend is present, pager.ignore will be ignored." +msgstr "" + +msgid "" "To ignore global commands like \"hg version\" or \"hg help\", you have to\n" "specify them in the global .hgrc\n" msgstr "" -msgid "" -"interpret suffixes to refer to ancestor revisions\n" -"\n" +msgid "interpret suffixes to refer to ancestor revisions" +msgstr "" + +msgid "" "This extension allows you to use git-style suffixes to refer to the\n" -"ancestors of a specific revision.\n" -"\n" -"For example, if you can refer to a revision as \"foo\", then::\n" -"\n" +"ancestors of a specific revision." +msgstr "" + +msgid "For example, if you can refer to a revision as \"foo\", then::" +msgstr "" + +msgid "" " foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" -" foo^ = foo^1\n" -"\n" +" foo^ = foo^1" +msgstr "" + +msgid "" " foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" -msgid "" -"command to send changesets as (a series of) patch emails\n" -"\n" +msgid "command to send changesets as (a series of) patch emails" +msgstr "" + +msgid "" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" -"describes the series as a whole.\n" -"\n" +"describes the series as a whole." +msgstr "" + +msgid "" "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" "first line of the changeset description as the subject text. The\n" -"message contains two or three body parts:\n" -"\n" +"message contains two or three body parts:" +msgstr "" + +msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\".\n" -"\n" +"- The patch itself, as generated by \"hg export\"." +msgstr "" + +msgid "" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" -"mail and news readers, and in mail archives.\n" -"\n" +"mail and news readers, and in mail archives." +msgstr "" + +msgid "" "With the -d/--diffstat option, you will be prompted for each changeset\n" "with a diffstat summary and the changeset summary, so you can be sure\n" -"you are sending the right changes.\n" -"\n" +"you are sending the right changes." +msgstr "" + +msgid "" "To configure other defaults, add a section like this to your hgrc\n" -"file::\n" -"\n" +"file::" +msgstr "" + +msgid "" " [email]\n" " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ...\n" -"\n" +" bcc = bcc1, bcc2, ..." +msgstr "" + +msgid "" "Use ``[patchbomb]`` as configuration section name if you need to\n" -"override global ``[email]`` address settings.\n" -"\n" +"override global ``[email]`` address settings." +msgstr "" + +msgid "" "Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb.\n" -"\n" +"as a patchbomb." +msgstr "" + +msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" "the \"email\" command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" "variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright.\n" -"\n" +"message, so you can verify everything is alright." +msgstr "" + +msgid "" "The -m/--mbox option is also very useful. Instead of previewing each\n" "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::\n" -"\n" -" % mutt -R -f mbox\n" -"\n" +"files, e.g. with mutt::" +msgstr "" + +msgid " % mutt -R -f mbox" +msgstr "" + +msgid "" "When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::\n" -"\n" -" % formail -s sendmail -bm -t < mbox\n" -"\n" -"That should be all. Now your patchbomb is on its way out.\n" -"\n" +"package), to send each message out::" +msgstr "" + +msgid " % formail -s sendmail -bm -t < mbox" +msgstr "" + +msgid "That should be all. Now your patchbomb is on its way out." +msgstr "" + +msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -3416,53 +3817,66 @@ msgid "diffstat rejected" msgstr "diffstat avvisad" -msgid "" -"send changesets by email\n" -"\n" +msgid "send changesets by email" +msgstr "" + +msgid "" " By default, diffs are sent in the format generated by hg export,\n" " one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole.\n" -"\n" +" introduction, which describes the series as a whole." +msgstr "" + +msgid "" " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" " The message contains two or three parts. First, the changeset\n" " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\".\n" -"\n" +" \"hg export\"." +msgstr "" + +msgid "" " By default the patch is included as text in the email body for\n" " easy reviewing. Using the -a/--attach option will instead create\n" " an attachment for the patch. With -i/--inline an inline attachment\n" -" will be created.\n" -"\n" +" will be created." +msgstr "" + +msgid "" " With -o/--outgoing, emails will be generated for patches not found\n" " in the destination repository (or only those which are ancestors\n" -" of the specified revisions if any are provided)\n" -"\n" +" of the specified revisions if any are provided)" +msgstr "" + +msgid "" " With -b/--bundle, changesets are selected as for --outgoing, but a\n" " single email containing a binary Mercurial bundle as an attachment\n" -" will be sent.\n" -"\n" -" Examples::\n" -"\n" +" will be sent." +msgstr "" + +msgid "" " hg email -r 3000 # send patch 3000 only\n" " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" " hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" +" hg email 3000 # send patch 3000 (deprecated)" +msgstr "" + +msgid "" " hg email -o # send all patches not in default\n" " hg email -o DEST # send all patches not in DEST\n" " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " -"default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " -"DEST\n" -"\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -3482,14 +3896,11 @@ msgid "" "\n" -"Write the introductory message for the patch series.\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"This patch series consists of %d patches.\n" -"\n" +"Write the introductory message for the patch series." +msgstr "" + +#, python-format +msgid "This patch series consists of %d patches." msgstr "" msgid "Final summary:\n" @@ -3573,16 +3984,20 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" -msgid "" -"show progress bars for some actions\n" -"\n" +msgid "show progress bars for some actions" +msgstr "" + +msgid "" "This extension uses the progress information logged by hg commands\n" "to draw progress bars that are as informative as possible. Some progress\n" "bars only offer indeterminate information, while others have a definite\n" -"end point.\n" -"\n" -"The following settings are available::\n" -"\n" +"end point." +msgstr "" + +msgid "The following settings are available::" +msgstr "" + +msgid "" " [progress]\n" " delay = 3 # number of seconds (float) before showing the progress bar\n" " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" @@ -3592,8 +4007,10 @@ " clear-complete = True # clear the progress bar after it's done\n" " disable = False # if true, don't show a progress bar\n" " assume-tty = False # if true, ALWAYS show a progress bar, unless\n" -" # disable is given\n" -"\n" +" # disable is given" +msgstr "" + +msgid "" "Valid entries for the format field are topic, bar, number, unit, and\n" "item. item defaults to the last 20 characters of the item, but this\n" "can be changed by adding either ``-<num>`` which would take the last\n" @@ -3603,27 +4020,38 @@ msgid "command to delete untracked files from the working directory" msgstr "" -msgid "" -"removes files not tracked by Mercurial\n" -"\n" +msgid "removes files not tracked by Mercurial" +msgstr "" + +msgid "" " Delete files not known to Mercurial. This is useful to test local\n" -" and uncommitted changes in an otherwise-clean source tree.\n" -"\n" -" This means that purge will delete:\n" -"\n" +" and uncommitted changes in an otherwise-clean source tree." +msgstr "" + +msgid " This means that purge will delete:" +msgstr "" + +msgid "" " - Unknown files: files marked with \"?\" by \"hg status\"\n" " - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" -"\n" -" But it will leave untouched:\n" -"\n" +" they contain files under source control management" +msgstr "" + +msgid " But it will leave untouched:" +msgstr "" + +msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" -"\n" +" - New files added to the repository (with \"hg add\")" +msgstr "" + +msgid "" " If directories are given on the command line, only files in these\n" -" directories are considered.\n" -"\n" +" directories are considered." +msgstr "" + +msgid "" " Be careful with purge, as you could irreversibly delete some files\n" " you forgot to add to the repository. If you only want to print the\n" " list of files that this program would delete, use the --print\n" @@ -3662,29 +4090,37 @@ msgid "hg purge [OPTION]... [DIR]..." msgstr "" -msgid "" -"command to move sets of revisions to a different ancestor\n" -"\n" +msgid "command to move sets of revisions to a different ancestor" +msgstr "" + +msgid "" "This extension lets you rebase changesets in an existing Mercurial\n" -"repository.\n" -"\n" +"repository." +msgstr "" + +msgid "" "For more information:\n" "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" -msgid "" -"move changeset (and descendants) to a different branch\n" -"\n" +msgid "move changeset (and descendants) to a different branch" +msgstr "" + +msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" " history (the source) onto another (the destination). This can be\n" " useful for linearizing local changes relative to a master\n" -" development tree.\n" -"\n" +" development tree." +msgstr "" + +msgid "" " If you don't specify a destination changeset (``-d/--dest``),\n" " rebase uses the tipmost head of the current named branch as the\n" " destination. (The destination changeset is not modified by\n" -" rebasing, but new changesets are added as its descendants.)\n" -"\n" +" rebasing, but new changesets are added as its descendants.)" +msgstr "" + +msgid "" " You can specify which changesets to rebase in two ways: as a\n" " \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" " for a topologically related set of changesets (the \"source\n" @@ -3695,21 +4131,27 @@ " ``-b`` is less precise but more convenient than ``-s``: you can\n" " specify any changeset in the source branch, and rebase will select\n" " the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" -" uses the parent of the working directory as the base.\n" -"\n" +" uses the parent of the working directory as the base." +msgstr "" + +msgid "" " By default, rebase recreates the changesets in the source branch\n" " as descendants of dest and then destroys the originals. Use\n" " ``--keep`` to preserve the original source changesets. Some\n" " changesets in the source branch (e.g. merges from the destination\n" -" branch) may be dropped if they no longer contribute any change.\n" -"\n" +" branch) may be dropped if they no longer contribute any change." +msgstr "" + +msgid "" " One result of the rules for selecting the destination changeset\n" " and source branch is that, unlike ``merge``, rebase will do\n" " nothing if you are at the latest (tipmost) head of a named branch\n" " with two heads. You need to explicitly specify source and/or\n" " destination (or ``update`` to the other head, if it's the head of\n" -" the intended source branch).\n" -"\n" +" the intended source branch)." +msgstr "" + +msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" " continued with --continue/-c or aborted with --abort/-a.\n" " " @@ -3793,9 +4235,7 @@ msgid "rebase from the specified changeset" msgstr "" -msgid "" -"rebase from the base of the specified changeset (up to greatest common " -"ancestor of base and dest)" +msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)" msgstr "" msgid "rebase onto the specified changeset" @@ -3885,30 +4325,41 @@ msgid "record change %d/%d to %r?" msgstr "" -msgid "" -"interactively select changes to commit\n" -"\n" +msgid "interactively select changes to commit" +msgstr "" + +msgid "" " If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be candidates for recording.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" will be candidates for recording." +msgstr "" + +msgid " See 'hg help dates' for a list of formats valid for -d/--date." +msgstr "" + +msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible::\n" -"\n" +" possible::" +msgstr "" + +msgid "" " y - record this change\n" -" n - skip this change\n" -"\n" +" n - skip this change" +msgstr "" + +msgid "" " s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" +" f - record remaining changes to this file" +msgstr "" + +msgid "" " d - done, skip remaining changes and files\n" " a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" q - quit, recording no changes" +msgstr "" + +msgid " ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -3932,27 +4383,38 @@ msgid "recreates hardlinks between repository clones" msgstr "" -msgid "" -"recreate hardlinks between two repositories\n" -"\n" +msgid "recreate hardlinks between two repositories" +msgstr "" + +msgid "" " 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" +" hardlinked so that they only use the space of a single repository." +msgstr "" + +msgid "" " 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" +" both repositories end up pulling the same changes." +msgstr "" + +msgid "" " 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" +" repository." +msgstr "" + +msgid "" " This command lets you recreate those hardlinks and reclaim that\n" -" wasted space.\n" -"\n" +" wasted space." +msgstr "" + +msgid "" " 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" +" \"default-relink\", then \"default\", in [paths]." +msgstr "" + +msgid "" " Do not attempt any read operations on this repository while the\n" " command is running. (Both repositories will be locked against\n" " writes.)\n" @@ -3994,40 +4456,56 @@ msgid "[ORIGIN]" msgstr "" -msgid "" -"extend schemes with shortcuts to repository swarms\n" -"\n" +msgid "extend schemes with shortcuts to repository swarms" +msgstr "" + +msgid "" "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" +"lot of repositories to act like a scheme, for example::" +msgstr "" + +msgid "" " [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" +" py = http://code.python.org/hg/" +msgstr "" + +msgid "After that you can use it like::" +msgstr "" + +msgid " hg clone py://trunk/" +msgstr "" + +msgid "" "Additionally there is support for some more complex schemas, for\n" -"example used by Google Code::\n" -"\n" +"example used by Google Code::" +msgstr "" + +msgid "" " [schemes]\n" -" gcode = http://{1}.googlecode.com/hg/\n" -"\n" +" gcode = http://{1}.googlecode.com/hg/" +msgstr "" + +msgid "" "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" +"just appended to an URL." +msgstr "" + +msgid "For convenience, the extension adds these schemes by default::" +msgstr "" + +msgid "" " [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" -" kiln = https://{1}.kilnhg.com/Repo/\n" -"\n" +" kiln = https://{1}.kilnhg.com/Repo/" +msgstr "" + +msgid "" "You can override a predefined scheme by defining a new scheme with the\n" "same name.\n" msgstr "" @@ -4035,12 +4513,15 @@ msgid "share a common history between several working directories" msgstr "" -msgid "" -"create a new shared repository\n" -"\n" +msgid "create a new shared repository" +msgstr "" + +msgid "" " Initialize a new repository and working directory that shares its\n" -" history with another repository.\n" -"\n" +" history with another repository." +msgstr "" + +msgid "" " NOTE: using rollback or extensions that destroy/modify history\n" " (mq, rebase, etc.) can cause considerable confusion with shared\n" " clones. In particular, if two shared clones are both updated to\n" @@ -4059,11 +4540,13 @@ msgid "[-U] SOURCE [DEST]" msgstr "" -msgid "" -"command to transplant changesets from another branch\n" -"\n" -"This extension allows you to transplant patches from another branch.\n" -"\n" +msgid "command to transplant changesets from another branch" +msgstr "" + +msgid "This extension allows you to transplant patches from another branch." +msgstr "" + +msgid "" "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" "map from a changeset hash to its hash in the source repository.\n" msgstr "" @@ -4138,38 +4621,52 @@ msgid "no such option\n" msgstr "inget sådant alternativ\n" -msgid "" -"transplant changesets from another branch\n" -"\n" +msgid "transplant changesets from another branch" +msgstr "" + +msgid "" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form::\n" -"\n" -" (transplanted from CHANGESETHASH)\n" -"\n" +" specified, log messages will have a comment appended of the form::" +msgstr "" + +msgid " (transplanted from CHANGESETHASH)" +msgstr "" + +msgid "" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" -" $1 and the patch as $2.\n" -"\n" +" $1 and the patch as $2." +msgstr "" + +msgid "" " If --source/-s is specified, selects changesets from the named\n" " repository. If --branch/-b is specified, selects changesets from\n" " the branch holding the named revision, up to that revision. If\n" " --all/-a is specified, all changesets on the branch will be\n" " transplanted, otherwise you will be prompted to select the\n" -" changesets you want.\n" -"\n" +" changesets you want." +msgstr "" + +msgid "" " hg transplant --branch REVISION --all will rebase the selected\n" " branch (up to the named revision) onto your current working\n" -" directory.\n" -"\n" +" directory." +msgstr "" + +msgid "" " You can optionally mark selected transplanted changesets as merge\n" " changesets. You will not be prompted to transplant any ancestors\n" " of a merged transplant, and you can merge descendants of them\n" -" normally instead of transplanting them.\n" -"\n" +" normally instead of transplanting them." +msgstr "" + +msgid "" " If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser.\n" -"\n" +" an interactive changeset browser." +msgstr "" + +msgid "" " If a changeset application fails, you can fix the merge by hand\n" " and then resume where you left off by calling hg transplant\n" " --continue/-c.\n" @@ -4221,44 +4718,57 @@ msgid "filter changesets through FILTER" msgstr "" -msgid "" -"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." -msgstr "" - -msgid "" -"allow the use of MBCS paths with problematic encodings\n" -"\n" +msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "allow the use of MBCS paths with problematic encodings" +msgstr "" + +msgid "" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" "This extension can be used to fix the issue with those encodings by\n" "wrapping some functions to convert to Unicode string before path\n" -"operation.\n" -"\n" -"This extension is useful for:\n" -"\n" +"operation." +msgstr "" + +msgid "This extension is useful for:" +msgstr "" + +msgid "" "- Japanese Windows users using shift_jis encoding.\n" "- Chinese Windows users using big5 encoding.\n" "- All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" -"\n" -"This extension is not needed for:\n" -"\n" +" case-insensitive file system." +msgstr "" + +msgid "This extension is not needed for:" +msgstr "" + +msgid "" "- Any user who use only ASCII chars in path.\n" -"- Any user who do not use any of problematic encodings.\n" -"\n" -"Note that there are some limitations on using this extension:\n" -"\n" -"- You should use single encoding in one repository.\n" -"\n" +"- Any user who do not use any of problematic encodings." +msgstr "" + +msgid "Note that there are some limitations on using this extension:" +msgstr "" + +msgid "- You should use single encoding in one repository." +msgstr "" + +msgid "" "\n" "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" -"You can specify the encoding by config option::\n" -"\n" +"You can specify the encoding by config option::" +msgstr "" + +msgid "" " [win32mbcs]\n" -" encoding = sjis\n" -"\n" -"It is useful for the users who want to commit with UTF-8 log message.\n" +" encoding = sjis" +msgstr "" + +msgid "It is useful for the users who want to commit with UTF-8 log message.\n" msgstr "" #, python-format @@ -4268,31 +4778,41 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -msgid "" -"perform automatic newline conversion\n" -"\n" -"To perform automatic newline conversion, use::\n" -"\n" +msgid "perform automatic newline conversion" +msgstr "" + +msgid "To perform automatic newline conversion, use::" +msgstr "" + +msgid "" " [extensions]\n" " win32text =\n" " [encode]\n" " ** = cleverencode:\n" -" # or ** = macencode:\n" -"\n" +" # or ** = macencode:" +msgstr "" + +msgid "" " [decode]\n" " ** = cleverdecode:\n" -" # or ** = macdecode:\n" -"\n" -"If not doing conversion, to make sure you do not commit CRLF/CR by " -"accident::\n" -"\n" +" # or ** = macdecode:" +msgstr "" + +msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgstr "" + +msgid "" " [hooks]\n" " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" -"\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr" +msgstr "" + +msgid "" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled::\n" -"\n" +"pushed or pulled::" +msgstr "" + +msgid "" " [hooks]\n" " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" @@ -4318,13 +4838,21 @@ msgid "" "\n" "To prevent this mistake in your local repository,\n" -"add to Mercurial.ini or .hg/hgrc:\n" -"\n" +"add to Mercurial.ini or .hg/hgrc:" +msgstr "" + +#, python-format +msgid "" "[hooks]\n" -"pretxncommit.%s = python:hgext.win32text.forbid%s\n" -"\n" -"and also consider adding:\n" -"\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s" +msgstr "" + +#, python-format +msgid "and also consider adding:" +msgstr "" + +#, python-format +msgid "" "[extensions]\n" "win32text =\n" "[encode]\n" @@ -4333,21 +4861,29 @@ "** = %sdecode:\n" msgstr "" -msgid "" -"discover and advertise repositories on the local network\n" -"\n" +msgid "discover and advertise repositories on the local network" +msgstr "" + +msgid "" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" -"without knowing their actual IP address.\n" -"\n" +"without knowing their actual IP address." +msgstr "" + +msgid "" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository::\n" -"\n" +"in your repository::" +msgstr "" + +msgid "" " $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" -"\n" +" $ hg serve" +msgstr "" + +msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgstr "" + +msgid "" " $ hg paths\n" " zc-test = http://example.com:8000/test\n" msgstr "" @@ -4608,22 +5144,36 @@ msgid "empty commit message" msgstr "" -msgid "" -"add the specified files on the next commit\n" -"\n" +msgid "add the specified files on the next commit" +msgstr "lägg till de specificerade filerna i nästa arkivering" + +msgid "" " Schedule files to be version controlled and added to the\n" -" repository.\n" -"\n" +" repository." +msgstr " Schemalägg filer att versionshanteras och läggas till i arkivet." + +msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget.\n" -"\n" -" If no names are given, add all files to the repository.\n" -"\n" -" .. container:: verbose\n" -"\n" +" undo an add before that, see hg forget." +msgstr "" +" Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" +" ångra en addering innan dess, se hg forget." + +msgid " If no names are given, add all files to the repository." +msgstr " Om inga namn anges, läggs alla filer till i arkivet." + +msgid " .. container:: verbose" +msgstr " .. container:: verbose" + +msgid "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::\n" -"\n" +" automatically by ``hg add``::" +msgstr "" +" An example showing how new (unknown) files are added\n" +" Ett exempel som visar hur nya (okända) filer läggs\n" +" till automatiskt av ``hg add``::" + +msgid "" " $ ls\n" " foo.c\n" " $ hg status\n" @@ -4634,21 +5184,6 @@ " A foo.c\n" " " msgstr "" -"lägg till de specificerade filerna i nästa arkivering\n" -"\n" -" Schemalägg filer att versionshanteras och läggas till i arkivet.\n" -"\n" -" Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" -" ångra en addering innan dess, se hg forget.\n" -"\n" -" Om inga namn anges, läggs alla filer till i arkivet.\n" -"\n" -" .. container:: verbose\n" -"\n" -" An example showing how new (unknown) files are added\n" -" Ett exempel som visar hur nya (okända) filer läggs\n" -" till automatiskt av ``hg add``::\n" -"\n" " $ ls\n" " foo.c\n" " $ hg status\n" @@ -4659,16 +5194,24 @@ " A foo.c\n" " " -msgid "" -"add all new files, delete all missing files\n" -"\n" +msgid "add all new files, delete all missing files" +msgstr "lägg till alla nya nya filer, radera alla saknade filer" + +msgid "" " Add all new files and remove all missing files from the\n" -" repository.\n" -"\n" +" repository." +msgstr " Lägg till alla nya filer och radera alla saknade filer från arkivet." + +msgid "" " New files are ignored if they match any of the patterns in\n" " .hgignore. As with add, these changes take effect at the next\n" -" commit.\n" -"\n" +" commit." +msgstr "" +" 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." + +msgid "" " Use the -s/--similarity option to detect renamed files. With a\n" " parameter greater than 0, this compares every removed file with\n" " every added file and records those similar enough as renames. This\n" @@ -4677,14 +5220,6 @@ " 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" @@ -4699,28 +5234,28 @@ msgid "similarity must be between 0 and 100" msgstr "likhet måste vara mellan 0 och 100" -msgid "" -"show changeset information by line for each file\n" -"\n" +msgid "show changeset information by line for each file" +msgstr "visa ändringsinformation för varje rad i filer" + +msgid "" " List changes in files, showing the revision id responsible for\n" -" each line\n" -"\n" +" each line" +msgstr " Visa ändringar i filer, och ansvarigt revisions-ID för varje rad" + +msgid "" " This command is useful for discovering when a change was made and\n" -" by whom.\n" -"\n" +" by whom." +msgstr "" +" Detta kommando är användbart för att upptäcka när en ändring gjordes\n" +" och av vem." + +msgid "" " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" " nor desirable.\n" " " msgstr "" -"visa ändringsinformation för varje rad i filer\n" -"\n" -" Visa ändringar i filer, och ansvarigt revisions-ID för varje rad\n" -"\n" -" Detta kommando är användbart för att upptäcka när en ändring gjordes\n" -" och av vem.\n" -"\n" " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" " om resultatet antagligen inte kommer att vara användbart.\n" @@ -4736,53 +5271,55 @@ msgid "%s: binary file\n" msgstr "" -msgid "" -"create an unversioned archive of a repository revision\n" -"\n" +msgid "create an unversioned archive of a repository revision" +msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision" + +msgid "" " By default, the revision used is the parent of the working\n" -" directory; use -r/--rev to specify a different revision.\n" -"\n" +" directory; use -r/--rev to specify a different revision." +msgstr "" +" Som standard används revisonen för arbetskatalogens förälder; använd\n" +" -r/--rev för att specificera en annan revision." + +msgid "" " The archive type is automatically detected based on file\n" -" extension (or override using -t/--type).\n" -"\n" -" Valid types are:\n" -"\n" +" extension (or override using -t/--type)." +msgstr "" +" Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n" +" med hjälp av -t/--type)." + +msgid " Valid types are:" +msgstr " Giltiga typer är:" + +msgid "" " :``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" -"\n" -" Each member added to an archive file has a directory prefix\n" -" prepended. Use -p/--prefix to specify a format string for the\n" -" prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " -msgstr "" -"skapa ett icke versionshanterat arkiv från en arkivrevision\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" -" Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n" -" med hjälp av -t/--type).\n" -"\n" -" Giltiga typer är:\n" -"\n" +" :``zip``: zip archive, compressed using deflate" +msgstr "" " :``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" +" :``zip``: zip-arkiv, komprimerad med deflate" + +msgid "" +" The exact name of the destination archive or directory is given\n" +" using a format string; see 'hg help export' for details." +msgstr "" " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" -" formatsträng; se 'hg help export' för detaljer.\n" -"\n" +" formatsträng; se 'hg help export' för detaljer." + +msgid "" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use -p/--prefix to specify a format string for the\n" +" prefix. The default is the basename of the archive, with suffixes\n" +" removed.\n" +" " +msgstr "" " 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" @@ -4797,41 +5334,36 @@ msgid "cannot archive plain files to stdout" msgstr "kan inte arkivera rena filer till stdout" -msgid "" -"reverse effect of earlier changeset\n" -"\n" +msgid "reverse effect of earlier changeset" +msgstr "omvänd effekten från en tidigare ändring" + +msgid "" " Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset.\n" -"\n" +" changeset is a child of the backed out changeset." +msgstr "" +" Arkivera de återkallade ändringarna som en ny ändring. Den nya\n" +" ändringen är ett barn till den återkallade ändringen." + +msgid "" " If you backout a changeset other than the tip, a new head is\n" " created. This head will be the new tip and you should merge this\n" -" backout changeset with another head.\n" -"\n" +" backout changeset with another head." +msgstr "" +" Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n" +" Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n" +" ett annat huvud." + +msgid "" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" " changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge.\n" -"\n" -" 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" +" The result of this merge is not committed, as with a normal merge." +msgstr "" " 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" -" " +" vanlig sammanfogning." msgid "please specify just one revision" msgstr "specificera bara en revision" @@ -4869,9 +5401,10 @@ msgid "(use \"backout --merge\" if you want to auto-merge)\n" msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n" -msgid "" -"subdivision search of changesets\n" -"\n" +msgid "subdivision search of changesets" +msgstr "genomsökning av ändringar med halveringsmetoden" + +msgid "" " This command helps to find changesets which introduce problems. To\n" " use, mark the earliest changeset you know exhibits the problem as\n" " bad, then mark the latest changeset which is free from the problem\n" @@ -4879,31 +5412,31 @@ " for testing (unless the -U/--noupdate option is specified). Once\n" " you have performed tests, mark the working directory as good or\n" " bad, and bisect will either update to another candidate changeset\n" -" or announce that it has found the bad revision.\n" -"\n" -" As a shortcut, you can also use the revision argument to mark a\n" -" revision as good or bad without checking it out first.\n" -"\n" -" If you supply a command, it will be used for automatic bisection.\n" -" Its exit status will be used to mark revisions as good or bad:\n" -" status 0 means good, 125 means to skip the revision, 127\n" -" (command not found) will abort the bisection, and any other\n" -" non-zero exit status means the revision is bad.\n" -" " -msgstr "" -"genomsökning av ändringar med halveringsmetoden\n" -"\n" +" or announce that it has found the bad revision." +msgstr "" " Detta kommando hjälper till att hitta ändringar som skapar problem. För\n" " att använda, markera den tidigaste ändringen du vet har problemet som\n" " dålig, och markera sedan den senaste problemfria ändringen som bra.\n" " Bisect uppdaterar din arbetskatalog till en revision för testning (om\n" " inte -U/--noupdate anges). När du har testat, markera arbetskatalogen\n" " som bra eller dålig, och bisect kommer endera att uppdatera till en\n" -" annan kandidat eller meddela att den dåliga revisionen har hittats.\n" -"\n" +" annan kandidat eller meddela att den dåliga revisionen har hittats." + +msgid "" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first." +msgstr "" " Som en genväg kan du också använda revisionsargumentet för att markera\n" -" en revision som bra eller dålig utan att kontrollera den först.\n" -"\n" +" en revision som bra eller dålig utan att kontrollera den först." + +msgid "" +" If you supply a command, it will be used for automatic bisection.\n" +" Its exit status will be used to mark revisions as good or bad:\n" +" status 0 means good, 125 means to skip the revision, 127\n" +" (command not found) will abort the bisection, and any other\n" +" non-zero exit status means the revision is bad.\n" +" " +msgstr "" " Om du tillhandahåller ett kommando, kommer det att användas för\n" " automatisk genomsökning. Dess returkod kommer att användas för att ange\n" " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" @@ -4918,12 +5451,10 @@ msgstr "Den första dåliga revisionen är:\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" -msgstr "" -"Tack vare skippade revisioner, är den första bra revisionen någon av:\n" +msgstr "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "" -"Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" +msgstr "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" msgid "cannot bisect (no known good revisions)" msgstr "kan inte genomsöka (inga kända bra revisioner)" @@ -4953,41 +5484,43 @@ msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "Testar ändring %d:%s (%d ändringar kvar, ~%d test)\n" -msgid "" -"set or show the current branch name\n" -"\n" +msgid "set or show the current branch name" +msgstr "sätt eller visa det aktuella grennamnet" + +msgid "" " With no argument, show the current branch name. With one argument,\n" " set the working directory branch name (the branch will not exist\n" " in the repository until the next commit). Standard practice\n" " recommends that primary development take place on the 'default'\n" -" branch.\n" -"\n" -" Unless -f/--force is specified, branch will not let you set a\n" -" branch name that already exists, even if it's inactive.\n" -"\n" -" Use -C/--clean to reset the working directory branch to that of\n" -" 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. Use\n" -" 'hg commit --close-branch' to mark this branch as closed.\n" -" " -msgstr "" -"sätt eller visa det aktuella grennamnet\n" -"\n" +" branch." +msgstr "" " Utan arguments visas det aktuella grennamnet. Med ett argument\n" " sätts arbetskatalogens grennamn (grenen existerar inte i arkivet\n" " förrän nästa arkivering). Standardförfarandet är att all primär\n" -" utveckling sker i grenen 'default'.\n" -"\n" +" utveckling sker i grenen 'default'." + +msgid "" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive." +msgstr "" " Om inte -f/--force är specificerad, kommer branch inte att tillåta\n" " dig att sätta ett grennamn som redan existerar, även om den är\n" -" inaktiv.\n" -"\n" +" inaktiv." + +msgid "" +" Use -C/--clean to reset the working directory branch to that of\n" +" the parent of the working directory, negating a previous branch\n" +" change." +msgstr "" " Använd -C/--clean för att återställa arbetskatalogens gren till\n" " samma som förälderns arbetskatalog, och återställer ett tidigare\n" -" grenbyte.\n" -"\n" +" grenbyte." + +msgid "" +" 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 "" " Använd kommandot 'hg update' för att byta till en existerande gren.\n" " Använd 'hg commit --close-branch' för att markera grenen som stängd.\n" " " @@ -4996,37 +5529,36 @@ msgid "reset working directory to branch %s\n" msgstr "återställ arbetskatalogen till grenen %s\n" -msgid "" -"a branch of the same name already exists (use 'hg update' to switch to it)" -msgstr "" -"en gren med samma namn finns redan (kör 'hg update' för att byta till den)" +msgid "a branch of the same name already exists (use 'hg update' to switch to it)" +msgstr "en gren med samma namn finns redan (kör 'hg update' för att byta till den)" #, python-format msgid "marked working directory as branch %s\n" msgstr "markerade arbetskatalogen som grenen %s\n" -msgid "" -"list repository named branches\n" -"\n" +msgid "list repository named branches" +msgstr "visa namngivna grenar i arkivet" + +msgid "" " List the repository's named branches, indicating which ones are\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" -" " -msgstr "" -"visa namngivna grenar i arkivet\n" -"\n" +" been marked closed (see hg commit --close-branch)." +msgstr "" " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n" " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n" -" som stängda (se hg commit --close-branch).\n" -"\n" +" som stängda (se hg commit --close-branch)." + +msgid "" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads." +msgstr "" " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n" -" den innehåller arkivhuvuden.\n" -"\n" +" den innehåller arkivhuvuden." + +msgid "" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" " Använd kommandot 'hg update' för att byta till en existerande gren.\n" " " @@ -5036,48 +5568,51 @@ msgid " (inactive)" msgstr " (inaktiv)" -msgid "" -"create a changegroup file\n" -"\n" +msgid "create a changegroup file" +msgstr "skapa en ändringsgruppsfil" + +msgid "" " Generate a compressed changegroup file collecting changesets not\n" -" known to be in another repository.\n" -"\n" +" known to be in another repository." +msgstr "" +" Skapa en komprimerad ändringsgruppfil genom att samla ihop ändringar\n" +" som inte finns i ett annat arkiv." + +msgid "" " If you omit the destination repository, then hg assumes the\n" " destination will have all the nodes you specify with --base\n" " parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null).\n" -"\n" +" -a/--all (or --base null)." +msgstr "" +" Om inget destinationsarkiv anges, så antar hg att destinationen har\n" +" alla noder du anger med parametrar av typen --base. För att skapa en\n" +" bunt med alla ändringar, använd -a/--all (eller --base null)." + +msgid "" " You can change compression method with the -t/--type option.\n" " The available compression methods are: none, bzip2, and\n" -" gzip (by default, bundles are compressed using bzip2).\n" -"\n" +" gzip (by default, bundles are compressed using bzip2)." +msgstr "" +" Du kan ändra kompressionsmetod med flaggan -t/--type. De tillgänliga\n" +" kompressionsmetoderna är: none, bzip2, och gzip (som standard\n" +" komprimeras buntar med bzip2)." + +msgid "" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" " command. This is useful when direct push and pull are not\n" -" available or when exporting an entire repository is undesirable.\n" -"\n" -" Applying bundles preserves all changeset contents including\n" -" permissions, copy/rename information, and revision history.\n" -" " -msgstr "" -"skapa en ändringsgruppsfil\n" -"\n" -" Skapa en komprimerad ändringsgruppfil genom att samla ihop ändringar\n" -" som inte finns i ett annat arkiv.\n" -"\n" -" Om inget destinationsarkiv anges, så antar hg att destinationen har\n" -" alla noder du anger med parametrar av typen --base. För att skapa en\n" -" bunt med alla ändringar, använd -a/--all (eller --base null).\n" -"\n" -" Du kan ändra kompressionsmetod med flaggan -t/--type. De tillgänliga\n" -" kompressionsmetoderna är: none, bzip2, och gzip (som standard\n" -" komprimeras buntar med bzip2).\n" -"\n" +" available or when exporting an entire repository is undesirable." +msgstr "" " Buntfilen kan överföras med konventionella metoder och appliceras i\n" " ett annat arkiv med kommandot unbundle eller pull. Detta är\n" " användbart när en direkt push och pull inte är tillgängliga eller\n" -" när export av ett helt arkiv inte är intressant.\n" -"\n" +" när export av ett helt arkiv inte är intressant." + +msgid "" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " +msgstr "" " Applicering av buntar bevarar all ändringsinnehåll inklusive\n" " tillstånd, information om kopior/namnbyte, och revisionshistorik.\n" " " @@ -5088,54 +5623,419 @@ msgid "unknown bundle type specified with --type" msgstr "okänd bunttyp specificerad med --type" -msgid "" -"output the current or given revision of files\n" -"\n" +msgid "output the current or given revision of files" +msgstr "visa den aktuella eller angivna revisionen för filer" + +msgid "" " Print the specified files as they were at the given revision. If\n" " no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" +" or tip if no revision is checked out." +msgstr "" +" Visa de angivna filerna som de ser ut i den angivna revisionen. Om\n" +" ingen revision anges, så används arbetskatalogens förälder, eller tip\n" +" om ingen revision är uthämtad." + +msgid "" " 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" +" for the export command, with the following additions:" +msgstr "" +" Utmatning kan vara till en fil, och då anges filnamnet med en\n" +" formatsträng. Formatteringsreglerna är samma som för kommandot\n" +" export, med följande tillägg:" + +msgid "" " :``%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 "" -"visa den aktuella eller angivna revisionen för filer\n" -"\n" -" Visa de angivna filerna som de ser ut i den angivna revisionen. Om\n" -" ingen revision anges, så används arbetskatalogens förälder, eller tip\n" -" om ingen revision är uthämtad.\n" -"\n" -" Utmatning kan vara till en fil, och då anges filnamnet med en\n" -" formatsträng. Formatteringsreglerna är samma som för kommandot\n" -" export, med följande tillägg:\n" -"\n" " :``%s``: basnamn på den visade filen\n" " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n" " :``%p``: rotrelativ sökvägsnamn för den visade filen\n" " " -msgid "" -"make a copy of an existing repository\n" -"\n" -" Create a copy of an existing repository in a new directory.\n" -"\n" +#, fuzzy +msgid "make a copy of an existing repository" +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid " Create a copy of an existing repository in a new directory." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " If no destination directory name is specified, it defaults to the\n" -" basename of the source.\n" -"\n" +" basename of the source." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " The location of the source is added to the new repository's\n" -" .hg/hgrc file, as the default to be used for future pulls.\n" -"\n" -" See 'hg help urls' for valid source format details.\n" -"\n" +" .hg/hgrc file, as the default to be used for future pulls." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid " See 'hg help urls' for valid source format details." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " 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" -"\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " A set of changesets (tags, or branch names) to pull may be specified\n" " 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" @@ -5143,33 +6043,459 @@ " 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" +" in the destination." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" -" local source repositories.\n" -"\n" +" local source repositories." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" " to the repository data, not to the working directory). Some\n" " filesystems, such as AFS, implement hardlinking incorrectly, but\n" " do not report errors. In these cases, use the --pull option to\n" -" avoid hardlinking.\n" -"\n" +" avoid hardlinking." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " In some cases, you can clone repositories and the working directory\n" -" using full hardlinks with ::\n" -"\n" -" $ cp -al REPO REPOCLONE\n" -"\n" +" using full hardlinks with ::" +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid " $ cp -al REPO REPOCLONE" +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" " the operation is up to you) and you have to make sure your editor\n" " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" -" metadata under the .hg directory, such as mq.\n" -"\n" +" metadata under the .hg directory, such as mq." +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " Mercurial will update the working directory to the first applicable\n" -" revision from this list:\n" -"\n" +" revision from this list:" +msgstr "" +"gör en kopia av ett existerande arkiv\n" +"\n" +" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" +"\n" +" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" +" källan att användas.\n" +"\n" +" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" +" som standardplats att användas för framtida dragningar.\n" +"\n" +" Se 'hg help urls' för detaljer om giltiga källformat.\n" +"\n" +" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" +" ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" +" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" +" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" +" 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 (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" +"\n" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar.\n" +"\n" +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::\n" +"\n" +" $ cp -al ARKIV ARKIVKLON\n" +"\n" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq.\n" +"\n" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:\n" +"\n" +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip\n" +" " + +#, fuzzy +msgid "" " a) null if -U or the source repository has no changesets\n" " b) if -u . and the source repository is local, the first parent of\n" " the source repository's working directory\n" @@ -5244,42 +6570,38 @@ msgid "cannot specify both --noupdate and --updaterev" msgstr "kan inte ange både --noupdate och --updaterev" -msgid "" -"commit the specified files or all outstanding changes\n" -"\n" +msgid "commit the specified files or all outstanding changes" +msgstr "arkivera de angivna filerna eller alla ändringar" + +msgid "" " Commit changes to the given files into the repository. Unlike a\n" " centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes.\n" -"\n" -" If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be committed.\n" -"\n" -" If you are committing the result of a merge, do not provide any\n" -" filenames or -I/-X filters.\n" -"\n" -" If no commit message is specified, the configured editor is\n" -" started to prompt you for a message.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"arkivera de angivna filerna eller alla ändringar\n" -"\n" +" for a way to actively distribute your changes." +msgstr "" " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" " från ett centralicerat RCS, är detta en lokal operation. Se hg push\n" -" för ett sätt att aktivt distribuera dina ändringar.\n" -"\n" +" för ett sätt att aktivt distribuera dina ändringar." + +msgid "" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed." +msgstr "" " Om filer inte anges, kommer alla ändringar som \"hg status\"\n" -" rapporterar att arkiveras.\n" -"\n" +" rapporterar att arkiveras." + +msgid "" +" If you are committing the result of a merge, do not provide any\n" +" filenames or -I/-X filters." +msgstr "" " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n" -" eller flaggorna -I/-X.\n" -"\n" +" eller flaggorna -I/-X." + +msgid "" +" If no commit message is specified, the configured editor is\n" +" started to prompt you for a message." +msgstr "" " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" -" att startas och fråga om meddelandet.\n" -"\n" -" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" -" " +" att startas och fråga om meddelandet." msgid "nothing changed\n" msgstr "inget ändrat\n" @@ -5291,31 +6613,32 @@ msgid "committed changeset %d:%s\n" msgstr "arkiverade ändringen %d:%s\n" -msgid "" -"mark files as copied for the next commit\n" -"\n" +msgid "mark files as copied for the next commit" +msgstr "markera filer som kopierade vid nästa arkivering" + +msgid "" " Mark dest as having copies of source files. If dest is a\n" " directory, copies are put in that directory. If dest is a file,\n" -" the source must be a single file.\n" -"\n" +" the source must be a single file." +msgstr "" +" Markera dest som kopia av källfilerna. Om dest är en katalog,\n" +" placeras kopiorna i den katalogen. Om dest är en fil, måste källan\n" +" vara en enda fil." + +msgid "" " By default, this command copies the contents of files as they\n" " exist in the working directory. If invoked with -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" operation is recorded, but no copying is performed." +msgstr "" +" Som standard kopierar detta kommando filinnehållet som det ser ut i\n" +" arbetskatalogen. Om det aktiveras med -A/--after, sparas operationen\n" +" men ingen kopiering utförs." + +msgid "" " This command takes effect with the next commit. To undo a copy\n" " before that, see hg revert.\n" " " msgstr "" -"markera filer som kopierade vid nästa arkivering\n" -"\n" -" Markera dest som kopia av källfilerna. Om dest är en katalog,\n" -" placeras kopiorna i den katalogen. Om dest är en fil, måste källan\n" -" vara en enda fil.\n" -"\n" -" Som standard kopierar detta kommando filinnehållet som det ser ut i\n" -" arbetskatalogen. Om det aktiveras med -A/--after, sparas operationen\n" -" men ingen kopiering utförs.\n" -"\n" " Kommandot slår igenom vid nästa arkivering. För att ångra en\n" " kopiering innan dess, se hg revert.\n" " " @@ -5354,31 +6677,31 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr ".hg/dirstate överrensstämmer inte med nuvarande förälders manifest" -msgid "" -"show combined config settings from all hgrc files\n" -"\n" -" With no arguments, print names and values of all config items.\n" -"\n" +msgid "show combined config settings from all hgrc files" +msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer" + +msgid " With no arguments, print names and values of all config items." +msgstr " Utan argument, skrivs namn och värden för alla alternativ." + +msgid "" " With one argument of the form section.name, print just the value\n" -" of that config item.\n" -"\n" +" of that config item." +msgstr "" +" Med ett argument i formen sektion.namn, visas bara värdet för det\n" +" konfigurationsalternativet." + +msgid "" " With multiple arguments, print names and values of all config\n" -" items with matching section names.\n" -"\n" +" items with matching section names." +msgstr "" +" Med flera argument, visas namn och värden för alla alternativ med\n" +" överrensstämmande sektionsnamn." + +msgid "" " With --debug, the source (filename and line number) is printed\n" " for each config item.\n" " " msgstr "" -"visa kombinerade konfigurationsalternativ från alla hgrc-filer\n" -"\n" -" Utan argument, skrivs namn och värden för alla alternativ.\n" -"\n" -" Med ett argument i formen sektion.namn, visas bara värdet för det\n" -" konfigurationsalternativet.\n" -"\n" -" Med flera argument, visas namn och värden för alla alternativ med\n" -" överrensstämmande sektionsnamn.\n" -"\n" " Med --debug, visas källan (filnamn och radnummer) för varje\n" " alternativ.\n" " " @@ -5386,9 +6709,10 @@ msgid "only one config item permitted" msgstr "bara ett konfigurationsalternativ tillåts" -msgid "" -"manually set the parents of the current working directory\n" -"\n" +msgid "manually set the parents of the current working directory" +msgstr "" + +msgid "" " This is useful for writing repository conversion tools, but should\n" " be used with care.\n" " " @@ -5454,14 +6778,10 @@ msgid " patch test failed!\n" msgstr "" -msgid "" -" (Current patch tool may be incompatible with patch, or misconfigured. " -"Please check your .hgrc file)\n" -msgstr "" - -msgid "" -" Internal patcher failure, please report this error to http://mercurial." -"selenic.com/bts/\n" +msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" +msgstr "" + +msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5504,76 +6824,81 @@ msgid "show how files match on given patterns" msgstr "" -msgid "" -"diff repository (or selected files)\n" -"\n" -" Show differences between revisions for the specified files.\n" -"\n" -" Differences between files are shown using the unified diff format.\n" -"\n" +msgid "diff repository (or selected files)" +msgstr "visa skillnader i arkivet (eller på valda filer)" + +msgid " Show differences between revisions for the specified files." +msgstr " Visa skillnader mellan revisioner för specificerade filer." + +msgid " Differences between files are shown using the unified diff format." +msgstr " Skillnaderna mellan filerna visas i unified diff-format." + +msgid "" " NOTE: diff may generate unexpected results for merges, as it will\n" " default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified.\n" -"\n" -" When two revision arguments are given, then changes are shown\n" -" between those revisions. If only one revision is specified then\n" -" that revision is compared to the working directory, and, when no\n" -" revisions are specified, the working directory files are compared\n" -" to its parent.\n" -"\n" +" changeset if no revisions are specified." +msgstr "" +" NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n" +" eftersom den som standard kommer att jämföra mot arbetskatalogens\n" +" tidigare ändring om ingen revision anges." + +msgid "" " Alternatively you can specify -c/--change with a revision to see\n" -" the changes in that changeset relative to its first parent.\n" -"\n" +" the changes in that changeset relative to its first parent." +msgstr "" +" Alternativt så kan du ange -c/--change med en revision för att se\n" +" modifikationerna i den ändringen relativt till dess första förälder." + +msgid "" " Without the -a/--text option, diff will avoid generating diffs of\n" " files it detects as binary. With -a, diff will generate a diff\n" -" anyway, probably with undesirable results.\n" -"\n" +" anyway, probably with undesirable results." +msgstr "" +" Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n" +" skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n" +" troligtvis med oönskade resultat." + +msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" " format. For more information, read 'hg help diffs'.\n" " " msgstr "" -"visa skillnader i arkivet (eller på valda filer)\n" -"\n" -" Visa skillnader mellan revisioner för specificerade filer.\n" -"\n" -" Skillnaderna mellan filerna visas i unified diff-format.\n" -"\n" -" NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n" -" eftersom den som standard kommer att jämföra mot arbetskatalogens\n" -" tidigare ändring om ingen revision anges.\n" -"\n" -" När två revisioner anges, visas ändringarna mellan dessa två\n" -" revisioner. Om bara en revision anges kommer den att jämföras med\n" -" arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n" -" filer med dess förälder.\n" -"\n" -" Alternativt så kan du ange -c/--change med en revision för att se\n" -" modifikationerna i den ändringen relativt till dess första förälder.\n" -"\n" -" Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n" -" skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n" -" troligtvis med oönskade resultat.\n" -"\n" " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" " mer information, läs 'hg help diffs'.\n" " " -msgid "" -"dump the header and diffs for one or more changesets\n" -"\n" -" Print the changeset header and diffs for one or more revisions.\n" -"\n" +msgid "dump the header and diffs for one or more changesets" +msgstr "dumpa rubrik och diff för en eller fler ändringar" + +msgid " Print the changeset header and diffs for one or more revisions." +msgstr " Skriv ändringsrubriken och diffen för en eller fler revisioner." + +msgid "" " The information shown in the changeset header is: author, date,\n" " branch name (if non-default), changeset hash, parent(s) and commit\n" -" comment.\n" -"\n" +" comment." +msgstr "" +" Informationen som visas i ändringsheadern är: författare, datum,\n" +" grenens namn (om inte default), ändringens hash, föräldrar och\n" +" arkiveringskommentar." + +msgid "" " NOTE: export may generate unexpected diff output for merge\n" " changesets, as it will compare the merge changeset against its\n" -" first parent only.\n" -"\n" +" first parent only." +msgstr "" +" NOTERA: export kan generera oväntade resultat för sammanfogningar,\n" +" eftersom den som standard bara kommer att jämföra mot den första\n" +" föräldern." + +msgid "" " 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" +" given using a format string. The formatting rules are as follows:" +msgstr "" +" Utmatning kan vara till en fil, och då anges namnet på filen med en\n" +" formatsträng. Formateringsreglerna är som följer::" + +msgid "" " :``%%``: literal \"%\" character\n" " :``%H``: changeset hash (40 bytes of hexadecimal)\n" " :``%N``: number of patches being generated\n" @@ -5581,34 +6906,8 @@ " :``%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" -" diff anyway, probably with undesirable results.\n" -"\n" -" Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " -msgstr "" -"dumpa rubrik och diff för en eller fler ändringar\n" -"\n" -" Skriv ändringsrubriken och diffen för en eller fler revisioner.\n" -"\n" -" Informationen som visas i ändringsheadern är: författare, datum,\n" -" grenens namn (om inte default), ändringens hash, föräldrar och\n" -" arkiveringskommentar.\n" -"\n" -" NOTERA: export kan generera oväntade resultat för sammanfogningar,\n" -" eftersom den som standard bara kommer att jämföra mot den första\n" -" föräldern.\n" -"\n" -" Utmatning kan vara till en fil, och då anges namnet på filen med en\n" -" formatsträng. Formateringsreglerna är som följer::\n" -"\n" +" :``%r``: zero-padded changeset revision number" +msgstr "" " :``%%``: ett \"%\"-tecken\n" " :``%H``: ändringshash (40 hexadecimala bytes)\n" " :``%N``: antal genererade patchar\n" @@ -5616,15 +6915,29 @@ " :``%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" +" :``%r``: nollpaddat ändringsrevisionsnummer" + +msgid "" +" Without the -a/--text option, export will avoid generating diffs\n" +" of files it detects as binary. With -a, export will generate a\n" +" diff anyway, probably with undesirable results." +msgstr "" " 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" -" ändå, även om resultatet antagligen inte kommer att vara användbart.\n" -"\n" +" ändå, även om resultatet antagligen inte kommer att vara användbart." + +msgid "" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information." +msgstr "" " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n" -" Se 'hg help diffs' för mer information.\n" -"\n" +" Se 'hg help diffs' för mer information." + +msgid "" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" +" " +msgstr "" " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" " föräldern. Det kan vara användbart för att granska en sammanfogning.\n" " " @@ -5638,27 +6951,28 @@ msgid "exporting patch:\n" msgstr "" -msgid "" -"forget the specified files on the next commit\n" -"\n" +msgid "forget the specified files on the next commit" +msgstr "glöm de specificerade filerna vid nästa arkivering" + +msgid "" " Mark the specified files so they will no longer be tracked\n" -" after the next commit.\n" -"\n" +" after the next commit." +msgstr "" +" Märk de specificerade filerna så att de inte längre kommer att spåras\n" +" efter nästa arkivering." + +msgid "" " This only removes files from the current branch, not from the\n" " entire project history, and it does not delete them from the\n" -" working directory.\n" -"\n" +" working directory." +msgstr "" +" Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" +" projekthistoriken, och det raderar dem inte från arbetskatalogen." + +msgid "" " To undo a forget before the next commit, see hg add.\n" " " msgstr "" -"glöm de specificerade filerna vid nästa arkivering\n" -"\n" -" Märk de specificerade filerna så att de inte längre kommer att spåras\n" -" efter nästa arkivering.\n" -"\n" -" Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" -" projekthistoriken, och det raderar dem inte från arbetskatalogen.\n" -"\n" " För att ångra en forget innan nästa arkivering, se hg add.\n" " " @@ -5669,16 +6983,23 @@ msgid "not removing %s: file is already untracked\n" msgstr "" -msgid "" -"search for a pattern in specified files and revisions\n" -"\n" -" Search revisions of files for a regular expression.\n" -"\n" +msgid "search for a pattern in specified files and revisions" +msgstr "sök efter ett mänster i specificerade filer och revisioner" + +msgid " Search revisions of files for a regular expression." +msgstr " Söker igenom revisioner och filer med reguljära uttryck." + +msgid "" " This command behaves differently than Unix grep. It only accepts\n" " Python/Perl regexps. It searches repository history, not the\n" " working directory. It always prints the revision number in which a\n" -" match appears.\n" -"\n" +" match appears." +msgstr "" +" Det här kommandot beter sig annorlunda jämfört med grep i Unix. Det\n" +" accepterar bara Python/Perl-regexps. Det söker arkivhistorik, inte\n" +" arbetskatalogen. Det visar också revisionsnumret där en träff finns." + +msgid "" " By default, grep only prints output for the first revision of a\n" " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" @@ -5686,14 +7007,6 @@ " use the --all flag.\n" " " msgstr "" -"sök efter ett mänster i specificerade filer och revisioner\n" -"\n" -" Söker igenom revisioner och filer med reguljära uttryck.\n" -"\n" -" Det här kommandot beter sig annorlunda jämfört med grep i Unix. Det\n" -" accepterar bara Python/Perl-regexps. Det söker arkivhistorik, inte\n" -" arbetskatalogen. Det visar också revisionsnumret där en träff finns.\n" -"\n" " Som standard visar grep bara utmatningen från den första revisionen\n" " av en matchande fil. För att visa varje revision som innehåller en\n" " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n" @@ -5705,48 +7018,49 @@ msgid "grep: invalid match pattern: %s\n" msgstr "grep: ogiltigt träffmönster: %s\n" -msgid "" -"show current repository heads or show branch heads\n" -"\n" -" With no arguments, show all repository branch heads.\n" -"\n" +msgid "show current repository heads or show branch heads" +msgstr "visa aktuella arkivhuvuden och visar grenhuvuden" + +msgid " With no arguments, show all repository branch heads." +msgstr " Utan några argument visas alla ändringar som är grenhuvuden." + +msgid "" " 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. Branch heads are changesets that have\n" -" no child changeset on the same branch.\n" -"\n" -" If one or more REVs are given, only branch heads on the branches\n" -" associated with the specified changesets are shown.\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" -"\n" -" If -t/--topo is specified, named branch mechanics will be ignored and " -"only\n" -" changesets without children will be shown.\n" -" " -msgstr "" -"visa aktuella arkivhuvuden och visar grenhuvuden\n" -"\n" -" Utan några argument visas alla ändringar som är grenhuvuden.\n" -"\n" +" no child changeset on the same branch." +msgstr "" " Arkiv-\"huvuden\" är ändringar utan barnändringar. Det är vanligtvis\n" " där som utveckling sker och är de vanligaste målen för update- och\n" " merge-operationer. Grenhuvuden är ändringar som inte har några\n" -" barnändringar på samma gren.\n" -"\n" +" barnändringar på samma gren." + +msgid "" +" If one or more REVs are given, only branch heads on the branches\n" +" associated with the specified changesets are shown." +msgstr "" " Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n" -" som är associerade med de angivna ändringarna att visas.\n" -"\n" +" som är associerade med de angivna ändringarna att visas." + +msgid "" +" If -c/--closed is specified, also show branch heads marked closed\n" +" (see hg commit --close-branch)." +msgstr "" " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n" -" stängda (se hg commit --close-branch).\n" -"\n" +" stängda (se hg commit --close-branch)." + +msgid "" +" If STARTREV is specified, only those heads that are descendants of\n" +" STARTREV will be displayed." +msgstr "" " Om STARTREV anges, visas bara de huvuden som har STARTREV som\n" -" anfader.\n" -"\n" +" anfader." + +msgid "" +" If -t/--topo is specified, named branch mechanics will be ignored and only\n" +" changesets without children will be shown.\n" +" " +msgstr "" " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n" " ändringar utan barn kommer att visas.\n" " " @@ -5759,18 +7073,16 @@ msgid " (started at %s)" msgstr " (började som %s)" -msgid "" -"show help for a given topic or a help overview\n" -"\n" -" With no arguments, print a list of commands with short help messages.\n" -"\n" +msgid "show help for a given topic or a help overview" +msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" + +msgid " With no arguments, print a list of commands with short help messages." +msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden." + +msgid "" " Given a topic, extension, or command name, print help for that\n" " topic." msgstr "" -"visa hjälp för ett givet ämne eller en hjälpöversikt\n" -"\n" -" Utan argument visas en kommandolista med korta hjälpmeddelanden.\n" -"\n" " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" " " @@ -5781,8 +7093,7 @@ msgstr "använd \"hg help\" för den fulla kommandolistan" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "" -"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" +msgstr "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -5792,12 +7103,8 @@ msgid "use \"hg -v help %s\" to show global options" msgstr "använd \"hg -v help %s\" för att visa globala flaggor" -msgid "" -"list of commands:\n" -"\n" -msgstr "" -"kommandolista:\n" -"\n" +msgid "list of commands:" +msgstr "kommandolista:" #, python-format msgid "" @@ -5811,14 +7118,12 @@ msgstr "(ingen hjälptext tillgänglig)" #, python-format -msgid "" -"alias for: hg %s\n" -"\n" -"%s" -msgstr "" -"alias för: hg %s\n" -"\n" -"%s" +msgid "alias for: hg %s" +msgstr "alias för: hg %s" + +#, python-format +msgid "%s" +msgstr "%s" #, python-format msgid "" @@ -5838,16 +7143,11 @@ msgstr "ingen hjälptext tillgänglig" #, python-format -msgid "" -"%s extension - %s\n" -"\n" -msgstr "" -"%s-utökning - %s\n" -"\n" +msgid "%s extension - %s" +msgstr "%s-utökning - %s" msgid "use \"hg help extensions\" for information on enabling extensions\n" -msgstr "" -"använd \"hg help extensions\" för information om aktivering av utökningar\n" +msgstr "använd \"hg help extensions\" för information om aktivering av utökningar\n" #, python-format msgid "'%s' is provided by the following extension:" @@ -5856,12 +7156,8 @@ msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Distribuerad SCM\n" -msgid "" -"basic commands:\n" -"\n" -msgstr "" -"grundläggande kommandon:\n" -"\n" +msgid "basic commands:" +msgstr "grundläggande kommandon:" msgid "enabled extensions:" msgstr "aktiverade utökningar:" @@ -5871,72 +7167,84 @@ msgid "" "\n" -"additional help topics:\n" -"\n" -msgstr "" -"\n" -"ytterligare hjälpämnen:\n" -"\n" - -msgid "" -"identify the working copy or specified revision\n" -"\n" +"additional help topics:" +msgstr "" +"\n" +"ytterligare hjälpämnen:" + +msgid "identify the working copy or specified revision" +msgstr "identifiera arbetskopian eller angivna revisioner" + +msgid "" " With no revision, print a summary of the current state of the\n" -" repository.\n" -"\n" +" repository." +msgstr "" +" Utan någon revision, visas en sammanfattning av den aktuella\n" +" statusen för arkivet." + +msgid "" " Specifying a path to a repository root or Mercurial bundle will\n" -" cause lookup to operate on that repository/bundle.\n" -"\n" +" cause lookup to operate on that repository/bundle." +msgstr "" +" Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n" +" gör att kommandot jobbar mot arkivet/bunten som är angiven." + +msgid "" " This summary identifies the repository state using one or two\n" " parent hash identifiers, followed by a \"+\" if there are\n" " uncommitted changes in the working directory, a list of tags for\n" " this revision and a branch name for non-default branches.\n" " " msgstr "" -"identifiera arbetskopian eller angivna revisioner\n" -"\n" -" Utan någon revision, visas en sammanfattning av den aktuella\n" -" statusen för arkivet.\n" -"\n" -" Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n" -" gör att kommandot jobbar mot arkivet/bunten som är angiven.\n" -"\n" " Sammanfattningen identifierar arkivstatusen med en eller två\n" " föräldrars hash-identifierare, följt av ett \"+\" om det finns\n" " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n" " här revisionen och ett grennamn för grenar som inte är default.\n" " " -msgid "" -"import an ordered set of patches\n" -"\n" +msgid "import an ordered set of patches" +msgstr "" + +msgid "" " Import a list of patches and commit them individually (unless\n" -" --no-commit is specified).\n" -"\n" +" --no-commit is specified)." +msgstr "" + +msgid "" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f/--force flag.\n" -"\n" +" will abort unless given the -f/--force flag." +msgstr "" + +msgid "" " You can import a patch straight from a mail message. Even patches\n" " as attachments work (to use the body part, it must have type\n" " text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" " text/plain body parts before first diff are added to commit\n" -" message.\n" -"\n" +" message." +msgstr "" + +msgid "" " If the imported patch was generated by hg export, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" -" override these.\n" -"\n" +" override these." +msgstr "" + +msgid "" " If --exact is specified, import will set the working directory to\n" " the parent of each patch before applying it, and will abort if the\n" " resulting changeset has a different ID than the one recorded in\n" " the patch. This may happen due to character set problems or other\n" -" deficiencies in the text patch format.\n" -"\n" +" deficiencies in the text patch format." +msgstr "" + +msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" -" copies in the patch in the same way as 'addremove'.\n" -"\n" +" copies in the patch in the same way as 'addremove'." +msgstr "" + +msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -5962,196 +7270,198 @@ msgid "no diffs found" msgstr "" -msgid "" -"show new changesets found in source\n" -"\n" +msgid "show new changesets found in source" +msgstr "visa nya ändringar som hittas i källan" + +msgid "" " Show new changesets found in the specified path/URL or the default\n" " pull location. These are the changesets that would have been pulled\n" -" if a pull at the time you issued this command.\n" -"\n" -" For remote repository, using --bundle avoids downloading the\n" -" changesets twice if the incoming is followed by a pull.\n" -"\n" -" See pull for valid source format details.\n" -" " -msgstr "" -"visa nya ändringar som hittas i källan\n" -"\n" +" if a pull at the time you issued this command." +msgstr "" " Visa nya ändringar som hittas i den specificerade sökvägen/URL:en\n" " eller den vanliga pull-platsen. Dessa ändringar skulle ha dragits om\n" -" du använt pull-kommandot.\n" -"\n" +" du använt pull-kommandot." + +msgid "" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull." +msgstr "" " För fjärrarkiv, använd --bundle för att slippa ladda ner\n" -" ändringarna två gånger om incoming följs av pull.\n" -"\n" +" ändringarna två gånger om incoming följs av pull." + +msgid "" +" See pull for valid source format details.\n" +" " +msgstr "" " Se pull för detaljer om giltiga källformat.\n" " " -msgid "" -"create a new repository in the given directory\n" -"\n" +msgid "create a new repository in the given directory" +msgstr "skapa ett nytt arkiv i den angivna katalogen" + +msgid "" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it will be created.\n" -"\n" -" If no directory is given, the current directory is used.\n" -"\n" +" directory does not exist, it will be created." +msgstr "" +" Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n" +" katalogen inte existerar, kommer den att skapas." + +msgid " If no directory is given, the current directory is used." +msgstr " Om ingen katalog anges, används den nuvarande katalogen." + +msgid "" " It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" -"skapa ett nytt arkiv i den angivna katalogen\n" -"\n" -" Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n" -" katalogen inte existerar, kommer den att skapas.\n" -"\n" -" Om ingen katalog anges, används den nuvarande katalogen.\n" -"\n" " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n" " Se 'hg help urls' för mer information.\n" " " -msgid "" -"locate files matching specific patterns\n" -"\n" +msgid "locate files matching specific patterns" +msgstr "hitta filer som matchar givna mönster" + +msgid "" " Print files under Mercurial control in the working directory whose\n" -" names match the given patterns.\n" -"\n" +" names match the given patterns." +msgstr "" +" Visa filer som är under Mercurials kontroll i arbetskatalogen vars\n" +" namn matchar givna mönster." + +msgid "" " By default, this command searches all directories in the working\n" " directory. To search just the current directory and its\n" -" subdirectories, use \"--include .\".\n" -"\n" +" subdirectories, use \"--include .\"." +msgstr "" +" Som standard söker det här kommandot i alla kataloger inuti\n" +" arbetskatalogen. För att bara söka den aktuella katalogen och dess\n" +" underkataloger, använd \"--include .\"." + +msgid "" " If no patterns are given to match, this command prints the names\n" -" of all files under Mercurial control in the working directory.\n" -"\n" +" of all files under Mercurial control in the working directory." +msgstr "" +" Om inga mönster anges för matching, visar det här kommantod namnen på\n" +" alla filer under Mercurials kontroll i arbetskatalogen." + +msgid "" " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" " contain whitespace as multiple filenames.\n" " " msgstr "" -"hitta filer som matchar givna mönster\n" -"\n" -" Visa filer som är under Mercurials kontroll i arbetskatalogen vars\n" -" namn matchar givna mönster.\n" -"\n" -" Som standard söker det här kommandot i alla kataloger inuti\n" -" arbetskatalogen. För att bara söka den aktuella katalogen och dess\n" -" underkataloger, använd \"--include .\".\n" -"\n" -" Om inga mönster anges för matching, visar det här kommantod namnen på\n" -" alla filer under Mercurials kontroll i arbetskatalogen.\n" -"\n" " Om du vill skicka utmatningen från detta kommando till kommandot\n" " \"xargs\", använd flaggan -O till både detta kommando och \"xargs\".\n" " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" " innehåller blanktecken som multipla filnamn.\n" " " -msgid "" -"show revision history of entire repository or files\n" -"\n" +msgid "show revision history of entire repository or files" +msgstr "visa revisionshistorik för hela arkivet eller filer" + +msgid "" " Print the revision history of the specified files or the entire\n" -" project.\n" -"\n" +" project." +msgstr "" +" Skriv ut revisionshistoriken för de specificerade filerna eller hela\n" +" projektet." + +msgid "" " File history is shown without following rename or copy history of\n" " files. Use -f/--follow with a filename to follow history across\n" " renames and copies. --follow without a filename will only show\n" " ancestors or descendants of the starting revision. --follow-first\n" -" only follows the first parent of merge revisions.\n" -"\n" +" only follows the first parent of merge revisions." +msgstr "" +" Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n" +" filer. Använd -f/--follow med ett filnamn för att följa historiken även\n" +" vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n" +" visa föräldrar eller ättlingar från startrevisionen. --follow-first\n" +" följer bara den första föräldern i revisoner med sammanfogningar." + +msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" used as the starting revision." +msgstr "" +" Om ingen revisionsserie specificeras, används tip:0 som standard om\n" +" inte --follow är satt, då arbetskatalogens förälder används som första\n" +" revision." + +msgid "" " By default this command prints revision number and changeset id,\n" " tags, non-trivial parents, user, date and time, and a summary for\n" " each commit. When the -v/--verbose switch is used, the list of\n" -" changed files and full commit message are shown.\n" -"\n" +" changed files and full commit message are shown." +msgstr "" +" Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n" +" märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n" +" sammandrag för varje arkivering. När flaggan -v/--verbose används,\n" +" visas listan med ändrade filer och fullständigt arkiveringsmeddelande." + +msgid "" " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" " will appear in files:.\n" " " msgstr "" -"visa revisionshistorik för hela arkivet eller filer\n" -"\n" -" Skriv ut revisionshistoriken för de specificerade filerna eller hela\n" -" projektet.\n" -"\n" -" Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n" -" filer. Använd -f/--follow med ett filnamn för att följa historiken även\n" -" vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n" -" visa föräldrar eller ättlingar från startrevisionen. --follow-first\n" -" följer bara den första föräldern i revisoner med sammanfogningar.\n" -"\n" -" Om ingen revisionsserie specificeras, används tip:0 som standard om\n" -" inte --follow är satt, då arbetskatalogens förälder används som första\n" -" revision.\n" -"\n" -" Se 'hg help dates' för giltiga format till -d/--date.\n" -"\n" -" Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n" -" märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n" -" sammandrag för varje arkivering. När flaggan -v/--verbose används,\n" -" visas listan med ändrade filer och fullständigt arkiveringsmeddelande.\n" -"\n" " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" " föräldrarna att visas i filer:.\n" " " -msgid "" -"output the current or given revision of the project manifest\n" -"\n" +msgid "output the current or given revision of the project manifest" +msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" + +msgid "" " Print a list of version controlled files for the given revision.\n" " If no revision is given, the first parent of the working directory\n" -" is used, or the null revision if no revision is checked out.\n" -"\n" +" is used, or the null revision if no revision is checked out." +msgstr "" +" Visa en lista med versionshanterade filer för den angivna revisionen.\n" +" Om ingen revision anges, används arbetskatalogens första föräldern,\n" +" eller null-revisionen om ingen revision är uthämtad." + +msgid "" " With -v, print file permissions, symlink and executable bits.\n" " With --debug, print file revision hashes.\n" " " msgstr "" -"visa den nuvarande eller angivna revisionen av projektmanifestet\n" -"\n" -" Visa en lista med versionshanterade filer för den angivna revisionen.\n" -" Om ingen revision anges, används arbetskatalogens första föräldern,\n" -" eller null-revisionen om ingen revision är uthämtad.\n" -"\n" " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n" " Med --debug visas filrevisionhashar.\n" " " -msgid "" -"merge working directory with another revision\n" -"\n" +msgid "merge working directory with another revision" +msgstr "sammanfoga arbetskatalogen med en annan revision" + +msgid "" " The current working directory is updated with all changes made in\n" -" the requested revision since the last common predecessor revision.\n" -"\n" +" the requested revision since the last common predecessor revision." +msgstr "" +" Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n" +" den efterfrågade revisionen sedan den senaste gemensamma revisionen." + +msgid "" " Files that changed between either parent are marked as changed for\n" " the next commit and a commit must be performed before any further\n" " updates to the repository are allowed. The next commit will have\n" -" two parents.\n" -"\n" +" two parents." +msgstr "" +" Filerna som ändrats mellan föräldrarna markeras som förändrade till\n" +" nästa arkivering och en arkivering måste utföras innan några andra\n" +" arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n" +" föräldrar." + +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" " explicit revision with which to merge with must be provided.\n" " " msgstr "" -"sammanfoga arbetskatalogen med en annan revision\n" -"\n" -" Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n" -" den efterfrågade revisionen sedan den senaste gemensamma revisionen.\n" -"\n" -" Filerna som ändrats mellan föräldrarna markeras som förändrade till\n" -" nästa arkivering och en arkivering måste utföras innan några andra\n" -" arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n" -" föräldrar.\n" -"\n" " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" " det andra huvudet som standard. Om inte, måste en explicit revision\n" @@ -6160,8 +7470,7 @@ #, python-format msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "" -"avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" +msgstr "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" msgid "(run 'hg heads .' to see heads)\n" msgstr "(kör 'hg heads .' för att se huvuden)\n" @@ -6180,35 +7489,32 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - använd \"hg update\" istället" -msgid "" -"working dir not at a head rev - use \"hg update\" or merge with an explicit " -"rev" -msgstr "" -"arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller " -"sammanfoga med en speficik rev" - -msgid "" -"show changesets not found in the destination\n" -"\n" +msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" +msgstr "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller sammanfoga med en speficik rev" + +msgid "show changesets not found in the destination" +msgstr "visa ändringar som inte hittas i destinationen" + +msgid "" " Show changesets not found in the specified destination repository\n" " or the default push location. These are the changesets that would\n" -" be pushed if a push was requested.\n" -"\n" -" See pull for details of valid destination formats.\n" -" " -msgstr "" -"visa ändringar som inte hittas i destinationen\n" -"\n" +" be pushed if a push was requested." +msgstr "" " Visa ändringar som inte hittas i det angivna destionationsarkivet\n" " eller den vanliga push-platsen. Detta är de ändringar som skulle\n" -" tryckas om push genomfördes.\n" -"\n" +" tryckas om push genomfördes." + +msgid "" +" See pull for details of valid destination formats.\n" +" " +msgstr "" " Se pull för information om giltiga destinationsformat.\n" " " -msgid "" -"show the parents of the working directory or revision\n" -"\n" +msgid "show the parents of the working directory or revision" +msgstr "visa föräldrar till arbetskatalogen eller revision" + +msgid "" " Print the working directory's parent revisions. If a revision is\n" " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" @@ -6216,8 +7522,6 @@ " argument to --rev if given) is printed.\n" " " msgstr "" -"visa föräldrar till arbetskatalogen eller revision\n" -"\n" " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n" " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n" " anges, kommer revisionen då den filen sist ändrades (innan\n" @@ -6231,35 +7535,37 @@ msgid "'%s' not found in manifest!" msgstr "'%s' hittades inte i manifestet!" -msgid "" -"show aliases for remote repositories\n" -"\n" +msgid "show aliases for remote repositories" +msgstr "visa aliases för fjärrarkiv" + +msgid "" " Show definition of symbolic path name NAME. If no name is given,\n" -" show definition of all available names.\n" -"\n" +" show definition of all available names." +msgstr "" +" Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n" +" definitionen för alla tillgängliga namn." + +msgid "" " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" -" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" -"\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." +msgstr "" +" Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" +" $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också." + +msgid "" " The names 'default' and 'default-push' have a special meaning.\n" " They are the locations used when pulling and pushing respectively\n" " unless a location is specified. When cloning a repository, the\n" -" clone source is written as 'default' in .hg/hgrc.\n" -"\n" -" See 'hg help urls' for more information.\n" -" " -msgstr "" -"visa aliases för fjärrarkiv\n" -"\n" -" Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n" -" definitionen för alla tillgängliga namn.\n" -"\n" -" Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" -" $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också.\n" -"\n" +" clone source is written as 'default' in .hg/hgrc." +msgstr "" " Namnen 'default' och 'default-push' har en särskild innebörd. De är\n" " platserna som används vid push eller pull om ingen plats anges. När\n" -" ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc.\n" -"\n" +" ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc." + +msgid "" +" See 'hg help urls' for more information.\n" +" " +msgstr "" " Se 'hg help urls' för mer information.\n" " " @@ -6270,85 +7576,85 @@ msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" -msgstr "" -"(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" +msgstr "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" msgid "(run 'hg update' to get a working copy)\n" msgstr "(kör 'hg update' för att få en arbetskopia)\n" -msgid "" -"pull changes from the specified source\n" -"\n" -" Pull changes from a remote repository to a local one.\n" -"\n" +msgid "pull changes from the specified source" +msgstr "dra ändringar från den specificerade källan" + +msgid " Pull changes from a remote repository to a local one." +msgstr " Drar ändringar från ett annat arkiv till ett lokalt." + +msgid "" " This finds all changes from the repository at the specified path\n" " or URL and adds them to a local repository (the current one unless\n" " -R is specified). By default, this does not update the copy of the\n" -" project in the working directory.\n" -"\n" +" project in the working directory." +msgstr "" +" Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n" +" URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n" +" -R är angivet). Som standard uppdaterar detta inte projektkopian i\n" +" arbetskatalogen." + +msgid "" " Use hg incoming if you want to see what would have been added by a\n" " pull at the time you issued this command. If you then decide to\n" " added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming.\n" -"\n" -" If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " -msgstr "" -"dra ändringar från den specificerade källan\n" -"\n" -" Drar ändringar från ett annat arkiv till ett lokalt.\n" -"\n" -" Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n" -" URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n" -" -R är angivet). Som standard uppdaterar detta inte projektkopian i\n" -" arbetskatalogen.\n" -"\n" +" where X is the last changeset listed by hg incoming." +msgstr "" " Använd hg incoming om du vill se vad som skulle ha lagts till av en\n" " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n" " att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n" -" sista ändringen listad av hg incoming.\n" -"\n" +" sista ändringen listad av hg incoming." + +msgid "" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n" " Se 'hg help urls' för mer information.\n" " " -msgid "" -"push changes to the specified destination\n" -"\n" -" Push changes from the local repository to the specified destination.\n" -"\n" +msgid "push changes to the specified destination" +msgstr "tryck ändringar till den specificerade destinationen" + +msgid " Push changes from the local repository to the specified destination." +msgstr " Trycker ändringar från det lokala arkivet till angiven destination." + +msgid "" " This is the symmetrical operation for pull. It moves changes from\n" " the current repository to a different one. If the destination is\n" " local this is identical to a pull in that directory from the\n" -" current one.\n" -"\n" +" current one." +msgstr "" +" Detta är en symmetriska operationen för pull. Den flyttar ändringar\n" +" från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n" +" är detta identiskt med en dragning i den katalogen från den nuvarande." + +msgid "" " By default, push will refuse to run if it detects the result would\n" " increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing.\n" -"\n" +" user forgot to pull and merge before pushing." +msgstr "" +" Som standard vägrar push att utföra något om det upptäcks att antalet\n" +" huvuden i destinationen ökar. Det brukar generellt sett indikera att\n" +" användaren glömt att dra och sammanfoga innan tryckning." + +msgid "" " If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository.\n" -"\n" +" be pushed to the remote repository." +msgstr "" +" Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" +" tryckas till det andra arkivet." + +msgid "" " Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" -"tryck ändringar till den specificerade destinationen\n" -"\n" -" Trycker ändringar från det lokala arkivet till angiven destination.\n" -"\n" -" Detta är en symmetriska operationen för pull. Den flyttar ändringar\n" -" från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n" -" är detta identiskt med en dragning i den katalogen från den nuvarande.\n" -"\n" -" Som standard vägrar push att utföra något om det upptäcks att antalet\n" -" huvuden i destinationen ökar. Det brukar generellt sett indikera att\n" -" användaren glömt att dra och sammanfoga innan tryckning.\n" -"\n" -" Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" -" tryckas till det andra arkivet.\n" -"\n" " Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n" " DESTINATION inte är angivet, används standardsökvägen." @@ -6356,74 +7662,71 @@ msgid "pushing to %s\n" msgstr "trycker till %s\n" -msgid "" -"roll back an interrupted transaction\n" -"\n" -" Recover from an interrupted commit or pull.\n" -"\n" +msgid "roll back an interrupted transaction" +msgstr "ångra en avbruten transaktion" + +msgid " Recover from an interrupted commit or pull." +msgstr " Återställ från en avbruten commit eller pull." + +msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" " suggests it.\n" " " msgstr "" -"ångra en avbruten transaktion\n" -"\n" -" Återställ från en avbruten commit eller pull.\n" -"\n" " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n" " Det bör bara användas när Mercurial föreslår det.\n" " " -msgid "" -"remove the specified files on the next commit\n" -"\n" -" Schedule the indicated files for removal from the repository.\n" -"\n" +msgid "remove the specified files on the next commit" +msgstr "ta bort de specificerade filerna vid nästa arkivering" + +msgid " Schedule the indicated files for removal from the repository." +msgstr " Markera de indikerade filerna för borttagning från arkivet." + +msgid "" " This only removes files from the current branch, not from the\n" " entire project history. -A/--after can be used to remove only\n" " files that have already been deleted, -f/--force can be used to\n" " force deletion, and -Af can be used to remove files from the next\n" -" revision without deleting them from the working directory.\n" -"\n" +" revision without deleting them from the working directory." +msgstr "" +" Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" +" projektets historik. -A/--after kan användas för att bara ta bort filer\n" +" som redan raderats, -f/--force kan användas för att tvinga radering, och\n" +" -Af kan ta bort filer från nästa revision utan att radera dem från\n" +" arbetskopian." + +msgid "" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" " reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::\n" -"\n" +" and Delete (from disk)::" +msgstr "" +" Följande tabell visar hur remove uppför sig för olika filstatus\n" +" (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" +" Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n" +" är Varna, Radera (från gren) och Ta bort (från disk)::" + +msgid "" " A C M !\n" " none W RD W R\n" " -f R RD RD R\n" " -A W W W R\n" -" -Af R R R R\n" -"\n" -" This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " -msgstr "" -"ta bort de specificerade filerna vid nästa arkivering\n" -"\n" -" Markera de indikerade filerna för borttagning från arkivet.\n" -"\n" -" Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" -" projektets historik. -A/--after kan användas för att bara ta bort filer\n" -" som redan raderats, -f/--force kan användas för att tvinga radering, " -"och\n" -" -Af kan ta bort filer från nästa revision utan att radera dem från\n" -" arbetskopian.\n" -"\n" -" Följande tabell visar hur remove uppför sig för olika filstatus\n" -" (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" -" Modifierad [M] och Saknad [!] (som rapporteras av hg status). " -"Aktionerna\n" -" är Varna, Radera (från gren) och Ta bort (från disk)::\n" -"\n" +" -Af R R R R" +msgstr "" " A C M !\n" " ingen V RT V R\n" " -f R RT RT R\n" " -A V V V R\n" -" -Af R R R R\n" -"\n" +" -Af R R R R" + +msgid "" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" " att ångra en remove innan dess, se hg revert.\n" " " @@ -6445,47 +7748,49 @@ msgid "has been marked for add" msgstr "har markerats för addering" -msgid "" -"rename files; equivalent of copy + remove\n" -"\n" +msgid "rename files; equivalent of copy + remove" +msgstr "döp om filer; likvärdig med kopiering + radering" + +msgid "" " Mark dest as copies of sources; mark sources for deletion. If dest\n" " is a directory, copies are put in that directory. If dest is a\n" -" file, there can only be one source.\n" -"\n" -" By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" file, there can only be one source." +msgstr "" +" Markera dest som kopior av källorna; markera källorna för radering.\n" +" Om dest är en katalog, placeras kopiorna i den katalogen. Om dest är\n" +" en fil, kan det bara finnas en källa." + +msgid "" " This command takes effect at the next commit. To undo a rename\n" " before that, see hg revert.\n" " " msgstr "" -"döp om filer; likvärdig med kopiering + radering\n" -"\n" -" Markera dest som kopior av källorna; markera källorna för radering.\n" -" Om dest är en katalog, placeras kopiorna i den katalogen. Om dest är\n" -" en fil, kan det bara finnas en källa.\n" -"\n" -" Som standard kopierar detta kommando innehållet i filerna som de ser\n" -" ut i arbetskopian. Om det utförs med -A/--after, så sparas\n" -" operationen, men ingen kopiering utförs.\n" -"\n" " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" " namnbyte innan det, se hg revert.\n" " " -msgid "" -"various operations to help finish a merge\n" -"\n" +msgid "various operations to help finish a merge" +msgstr "diverse operationer för att slutföra sammanfogningar" + +msgid "" " This command includes several actions that are often useful while\n" " performing a merge, after running ``merge`` but before running\n" " ``commit``. (It is only meaningful if your working directory has\n" " two parents.) It is most relevant for merges with unresolved\n" " conflicts, which are typically a result of non-interactive merging with\n" -" ``internal:merge`` or a command-line merge tool like ``diff3``.\n" -"\n" -" The available actions are:\n" -"\n" +" ``internal:merge`` or a command-line merge tool like ``diff3``." +msgstr "" +" Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" +" en sammanfogning utförs, efter att ``merge`` körts men innan\n" +" ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" +" föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" +" konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" +" med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``." + +msgid " The available actions are:" +msgstr " Tillgängliga handlingar är:" + +msgid "" " 1) list files that were merged with conflicts (U, for unresolved)\n" " and without conflicts (R, for resolved): ``hg resolve -l``\n" " (this is like ``status`` for merges)\n" @@ -6495,24 +7800,8 @@ " ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" " 4) discard your current attempt(s) at resolving conflicts and\n" " restart the merge from scratch: ``hg resolve file...``\n" -" (or ``-a`` for all unresolved files)\n" -"\n" -" Note that Mercurial will not let you commit files with unresolved merge\n" -" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" -" after a conflicting merge.\n" -" " -msgstr "" -"diverse operationer för att slutföra sammanfogningar\n" -"\n" -" Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" -" en sammanfogning utförs, efter att ``merge`` körts men innan\n" -" ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" -" föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" -" konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" -" med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``.\n" -"\n" -" Tillgängliga handlingar är:\n" -"\n" +" (or ``-a`` for all unresolved files)" +msgstr "" " 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n" " utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n" " ``status`` för sammanfogningar)\n" @@ -6522,8 +7811,14 @@ " ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n" " 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n" " sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n" -" för alla olösta filer)\n" -"\n" +" för alla olösta filer)" + +msgid "" +" Note that Mercurial will not let you commit files with unresolved merge\n" +" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" +" after a conflicting merge.\n" +" " +msgstr "" " Notera att Mercurial inte låter dig arkivera filer med olösta\n" " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" " innan du kan arkivera efter en sammanfogning med konflikter.\n" @@ -6536,71 +7831,74 @@ msgstr "kan inte specificera --all och mönster" msgid "no files or directories specified; use --all to remerge all files" -msgstr "" -"inga filer eller kataloger specificerade; använd --all för att " -"återsammanfoga alla filer" - -msgid "" -"restore individual files or directories to an earlier state\n" -"\n" +msgstr "inga filer eller kataloger specificerade; använd --all för att återsammanfoga alla filer" + +msgid "restore individual files or directories to an earlier state" +msgstr "återställ filer eller kataloger till ett tidigare tillstånd" + +msgid "" " (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)\n" -"\n" +" change the working directory parents.)" +msgstr "" +" (Använd update -r för att hämta ut tidigare revisioner, revert ändrar\n" +" inte arbetskatalogens föräldrar.)" + +msgid "" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" " This restores the contents of the affected files to an unmodified\n" " state and unschedules adds, removes, copies, and renames. If the\n" " working directory has two parents, you must explicitly specify a\n" -" revision.\n" -"\n" +" revision." +msgstr "" +" Om ingen revision anges, så återställs de givna filerna eller\n" +" katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n" +" sätter filer i ett omodifierad läge och avbeställer adderingar,\n" +" raderingar, kopior och namnbyten. Om arbetskatalogen har två\n" +" föräldrar, så måste du ange en revision." + +msgid "" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" " to \"roll back\" some or all of an earlier change. See 'hg help\n" -" dates' for a list of formats valid for -d/--date.\n" -"\n" +" dates' for a list of formats valid for -d/--date." +msgstr "" +" Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n" +" till innehållet i den specifika revisionen. Detta kan användas för\n" +" att ångra delar av eller hela tidigare ändringar. Se 'hg help dates'\n" +" för en lista med giltiga format för -d/--date." + +msgid "" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" " revert to a revision other than the parent of the working\n" " directory, the reverted files will thus appear modified\n" -" afterwards.\n" -"\n" -" If a file has been deleted, it is restored. If the executable mode\n" -" of a file was changed, it is reset.\n" -"\n" -" If names are given, all files matching the names are reverted.\n" -" If no arguments are given, no files are reverted.\n" -"\n" -" Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " -msgstr "" -"återställ filer eller kataloger till ett tidigare tillstånd\n" -"\n" -" (Använd update -r för att hämta ut tidigare revisioner, revert ändrar\n" -" inte arbetskatalogens föräldrar.)\n" -"\n" -" Om ingen revision anges, så återställs de givna filerna eller\n" -" katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n" -" sätter filer i ett omodifierad läge och avbeställer adderingar,\n" -" raderingar, kopior och namnbyten. Om arbetskatalogen har två\n" -" föräldrar, så måste du ange en revision.\n" -"\n" -" Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n" -" till innehållet i den specifika revisionen. Detta kan användas för\n" -" att ångra delar av eller hela tidigare ändringar. Se 'hg help dates'\n" -" för en lista med giltiga format för -d/--date.\n" -"\n" +" afterwards." +msgstr "" " Revert modifierar arbetskatalogen. Det arkiverar inga ändringar, och\n" " ändrar inte arbetskatalogens förälder. Om du återgår till en revision\n" " som inte är arbetskatalogens förälder, kommer den återställda filen\n" -" att visas som modifierad.\n" -"\n" +" att visas som modifierad." + +msgid "" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset." +msgstr "" " Om en fil har raderas, så återställs den. Om läget för exekverbarhet\n" -" har ändrats för en fil, så återställs det.\n" -"\n" +" har ändrats för en fil, så återställs det." + +msgid "" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted." +msgstr "" " Om namn anges, så återställs alla filer med överrensstämmande namn.\n" -" Om inga argument ges, återställs inga filer.\n" -"\n" +" Om inga argument ges, återställs inga filer." + +msgid "" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" " Modifierade filer sparas med suffixet .orig innan återställning.\n" " För att deaktivera dessa säkerhetskopior, använd --no-backup.\n" " " @@ -6609,9 +7907,7 @@ msgstr "du kan inte specificera en revision och ett datum" msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "" -"inga filer eller kataloger angivna; använd --all för att återställa hela " -"arkivet" +msgstr "inga filer eller kataloger angivna; använd --all för att återställa hela arkivet" #, python-format msgid "forgetting %s\n" @@ -6637,26 +7933,47 @@ msgid "no changes needed to %s\n" msgstr "inga ändringar behövs för %s\n" -msgid "" -"roll back the last transaction (dangerous)\n" -"\n" +msgid "roll back the last transaction (dangerous)" +msgstr "återgång från den senaste transaktionen (farligt)" + +msgid "" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" " any dirstate changes since that time. This command does not alter\n" -" the working directory.\n" -"\n" +" the working directory." +msgstr "" +" Detta kommando bör användas med försiktighet. Det finns bara en nivå\n" +" av återgång, och det finns inget sätt att ångra en återgång.\n" +" Det återställer också katalogstatusen till tillståndet vid den\n" +" senaste transaktionen, så dessa förloras. Kommandot ändrar inte\n" +" arbetskatalogen." + +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" +" and their effects can be rolled back:" +msgstr "" +" Transaktioner används för att kapsla in alla kommandon som skapar nya\n" +" ändringar eller sprider existerade ändringar till ett arkiv.\n" +" Exempelvis skapar de följande kommandona transaktioner, och deras\n" +" ändringar kan återkallas:" + +msgid "" " - commit\n" " - import\n" " - pull\n" " - push (with this repository as the destination)\n" -" - unbundle\n" -"\n" +" - unbundle" +msgstr "" +" - commit\n" +" - import\n" +" - pull\n" +" - push (med det här arkivet som destination)\n" +" - unbundle" + +msgid "" " This command is not intended for use on public repositories. Once\n" " changes are visible for pull by other users, rolling a transaction\n" " back locally is ineffective (someone else may already have pulled\n" @@ -6665,25 +7982,6 @@ " may fail if a rollback is performed.\n" " " msgstr "" -"återgång från den senaste transaktionen (farligt)\n" -"\n" -" Detta kommando bör användas med försiktighet. Det finns bara en nivå\n" -" av återgång, och det finns inget sätt att ångra en återgång.\n" -" Det återställer också katalogstatusen till tillståndet vid den\n" -" senaste transaktionen, så dessa förloras. Kommandot ändrar inte\n" -" arbetskatalogen.\n" -"\n" -" Transaktioner används för att kapsla in alla kommandon som skapar nya\n" -" ändringar eller sprider existerade ändringar till ett arkiv.\n" -" Exempelvis skapar de följande kommandona transaktioner, och deras\n" -" ändringar kan återkallas:\n" -"\n" -" - commit\n" -" - import\n" -" - pull\n" -" - push (med det här arkivet som destination)\n" -" - unbundle\n" -"\n" " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n" " ändringar är tillgängliga att dras av andra användare, så är en\n" " lokal återgång ineffektivt (någon annan kan redan ha dragit\n" @@ -6692,39 +7990,37 @@ " utförs.\n" " " -msgid "" -"print the root (top) of the current working directory\n" -"\n" +msgid "print the root (top) of the current working directory" +msgstr "visa roten för den aktuella arbetskatalogen" + +msgid "" " Print the root directory of the current repository.\n" " " msgstr "" -"visa roten för den aktuella arbetskatalogen\n" -"\n" " Visa rotkatalogen för det aktuella arkivet.\n" " " -msgid "" -"start stand-alone webserver\n" -"\n" -" Start a local HTTP repository browser and pull server.\n" -"\n" +msgid "start stand-alone webserver" +msgstr "starta fristående webbserver" + +msgid " Start a local HTTP repository browser and pull server." +msgstr " Startar en lokal HTTP-arkivbläddrare och pull-server." + +msgid "" " By default, the server logs accesses to stdout and errors to\n" " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" -" files.\n" -"\n" +" files." +msgstr "" +" Som standard loggar servern anslutningar till stdout och fel till\n" +" stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n" +" till filer." + +msgid "" " To have the server choose a free port number to listen on, specify\n" " a port number of 0; in this case, the server will print the port\n" " number it uses.\n" " " msgstr "" -"starta fristående webbserver\n" -"\n" -" Startar en lokal HTTP-arkivbläddrare och pull-server.\n" -"\n" -" Som standard loggar servern anslutningar till stdout och fel till\n" -" stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n" -" till filer.\n" -"\n" " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" " som portnummer; då visar servern det portnummer som används.\n" " " @@ -6733,31 +8029,56 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" -msgid "" -"show changed files in the working directory\n" -"\n" +msgid "show changed files in the working directory" +msgstr "visa ändrade filer i arbetskatalogen" + +msgid "" " Show status of files in the repository. If names are given, only\n" " files that match are shown. Files that are clean or ignored or\n" " the source of a copy/move operation, are not listed unless\n" " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" " Unless options described with \"show only ...\" are given, the\n" -" options -mardu are used.\n" -"\n" +" options -mardu are used." +msgstr "" +" Visa status för filer i arkivet. Om namn anges, visas bara filer som\n" +" matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n" +" eller kopieringsoperation, visas inte om förrän -c/--clean,\n" +" -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n" +" beskrivningen \"visa bara ...\" anges, så används flaggorna -mardu." + +msgid "" " Option -q/--quiet hides untracked (unknown and ignored) files\n" -" unless explicitly requested with -u/--unknown or -i/--ignored.\n" -"\n" +" unless explicitly requested with -u/--unknown or -i/--ignored." +msgstr "" +" Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n" +" inte bes om explicit med -u/--unknown eller -i/--ignored." + +msgid "" " NOTE: status may appear to disagree with diff if permissions have\n" " changed or a merge has occurred. The standard diff format does not\n" " report permission changes and diff only reports changes relative\n" -" to one merge parent.\n" -"\n" +" to one merge parent." +msgstr "" +" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n" +" en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" +" inte förändringar av tillstånd och diff rapporterar bara ändringar\n" +" relativt till en förälder vid sammanfogningar." + +msgid "" " If one revision is given, it is used as the base revision.\n" " If two revisions are given, the differences between them are\n" " shown. The --change option can also be used as a shortcut to list\n" -" the changed files of a revision from its first parent.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" +" the changed files of a revision from its first parent." +msgstr "" +" Om en revision anges, används den som basrevision. Om två revisioner\n" +" anges, visas skillnaderna mellan dem. Flaggan --change kan också\n" +" användas som en genväg för att visa de ändrade filerna i en revision\n" +" från dess första förälder." + +msgid " The codes used to show the status of files are::" +msgstr " Koderna som används för att visa filstatus är::" + +msgid "" " M = modified\n" " A = added\n" " R = removed\n" @@ -6768,29 +8089,6 @@ " = origin of the previous file listed as A (added)\n" " " msgstr "" -"visa ändrade filer i arbetskatalogen\n" -"\n" -" Visa status för filer i arkivet. Om namn anges, visas bara filer som\n" -" matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n" -" eller kopieringsoperation, visas inte om förrän -c/--clean,\n" -" -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n" -" beskrivningen \"visa bara ...\" anges, så används flaggorna -mardu.\n" -"\n" -" Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n" -" inte bes om explicit med -u/--unknown eller -i/--ignored.\n" -"\n" -" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n" -" en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" -" inte förändringar av tillstånd och diff rapporterar bara ändringar\n" -" relativt till en förälder vid sammanfogningar.\n" -"\n" -" Om en revision anges, används den som basrevision. Om två revisioner\n" -" anges, visas skillnaderna mellan dem. Flaggan --change kan också\n" -" användas som en genväg för att visa de ändrade filerna i en revision\n" -" från dess första förälder.\n" -"\n" -" Koderna som används för att visa filstatus är::\n" -"\n" " M = modifierad\n" " A = adderad\n" " R = raderad\n" @@ -6801,21 +8099,21 @@ " = källa för den tidigare filen listad som A (adderad)\n" " " -msgid "" -"summarize working directory state\n" -"\n" +msgid "summarize working directory state" +msgstr "sammanfatta arbetskatalogens tillstånd" + +msgid "" " This generates a brief summary of the working directory state,\n" -" including parents, branch, commit status, and available updates.\n" -"\n" +" including parents, branch, commit status, and available updates." +msgstr "" +" Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n" +" inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar." + +msgid "" " With the --remote option, this will check the default paths for\n" " incoming and outgoing changes. This can be time-consuming.\n" " " msgstr "" -"sammanfatta arbetskatalogens tillstånd\n" -"\n" -" Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n" -" inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar.\n" -"\n" " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" " för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n" " " @@ -6903,46 +8201,40 @@ msgid "remote: (synced)\n" msgstr "fjärran: (synkad)\n" -msgid "" -"add one or more tags for the current or given revision\n" -"\n" -" Name a particular revision using <name>.\n" -"\n" +msgid "add one or more tags for the current or given revision" +msgstr "lägg till en eller fler märken för en revision" + +msgid " Name a particular revision using <name>." +msgstr " Namnge en specifik revision med <namn>." + +msgid "" " Tags are used to name particular revisions of the repository and are\n" " very useful to compare different revisions, to go back to significant\n" -" earlier versions or to mark branch points as releases, etc.\n" -"\n" +" earlier versions or to mark branch points as releases, etc." +msgstr "" +" Märken används för att namnge specifika revisioner i arkivet och är\n" +" väldigt användbara för at jämföra olika revisioner, för att gå\n" +" tillbaka till tidigare versioner eller för att markera förgreningar\n" +" som releaser, osv." + +msgid "" " If no revision is given, the parent of the working directory is\n" -" used, or tip if no revision is checked out.\n" -"\n" +" used, or tip if no revision is checked out." +msgstr "" +" Om ingen revision anges, används föräldern för arbetskatalogen, eller\n" +" toppen om ingen revision är uthämtad." + +msgid "" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" " similarly to other project files and can be hand-edited if\n" " necessary. The file '.hg/localtags' is used for local tags (not\n" -" shared among repositories).\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"lägg till en eller fler märken för en revision\n" -"\n" -" Namnge en specifik revision med <namn>.\n" -"\n" -" Märken används för att namnge specifika revisioner i arkivet och är\n" -" väldigt användbara för at jämföra olika revisioner, för att gå\n" -" tillbaka till tidigare versioner eller för att markera förgreningar\n" -" som releaser, osv.\n" -"\n" -" Om ingen revision anges, används föräldern för arbetskatalogen, eller\n" -" toppen om ingen revision är uthämtad.\n" -"\n" +" shared among repositories)." +msgstr "" " För att underlätta versionshantering, distribution, och sammanfogning\n" " av märken, lagras de som en fil vid namn \".hgtags\" som hanteras på\n" " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" -" Filen '.hg/localtags' används för lokala märken (ej delad i arkiv).\n" -"\n" -" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" -" " +" Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)." msgid "tag names must be unique" msgstr "märkesnamn måste vara unika" @@ -6966,69 +8258,79 @@ msgid "tag '%s' already exists (use -f to force)" msgstr "märket '%s' existerar redan (använd -f för att tvinga)" -msgid "" -"list repository tags\n" -"\n" +msgid "list repository tags" +msgstr "lista arkivmärken" + +msgid "" " This lists both regular and local tags. When the -v/--verbose\n" " switch is used, a third column \"local\" is printed for local tags.\n" " " msgstr "" -"lista arkivmärken\n" -"\n" " Listar både vanliga och lokala märken. När flaggan -v/--verbose\n" " används, visas en tredje kolumn med namnet \"local\" för lokala märken.\n" " " -msgid "" -"show the tip revision\n" -"\n" +msgid "show the tip revision" +msgstr "visa topprevisionen" + +msgid "" " The tip revision (usually just called the tip) is the changeset\n" " most recently added to the repository (and therefore the most\n" -" recently changed head).\n" -"\n" +" recently changed head)." +msgstr "" +" Topprevisionen (kallas tip av Mercurial) är den senast tillagda\n" +" ändringen i arkivet (och därför det senast tillagda huvudet)." + +msgid "" " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" " and cannot be renamed or assigned to a different changeset.\n" " " msgstr "" -"visa topprevisionen\n" -"\n" -" Topprevisionen (kallas tip av Mercurial) är den senast tillagda\n" -" ändringen i arkivet (och därför det senast tillagda huvudet).\n" -"\n" " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n" " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n" " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n" " döpas om eller tilldelas en annan ändring.\n" " " -msgid "" -"apply one or more changegroup files\n" -"\n" +msgid "apply one or more changegroup files" +msgstr "applicera en eller flera filer med ändringar" + +msgid "" " Apply one or more compressed changegroup files generated by the\n" " 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 (or switch revisions)\n" -"\n" +msgid "update working directory (or switch revisions)" +msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)" + +msgid "" " Update the repository's working directory to the specified\n" -" changeset.\n" -"\n" +" changeset." +msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen." + +msgid "" " If no changeset is specified, attempt to update to the head of the\n" " current branch. If this head is a descendant of the working\n" -" directory's parent, update to it, otherwise abort.\n" -"\n" +" directory's parent, update to it, otherwise abort." +msgstr "" +" Om ingen ändring specificeras, kommer ett försök att göras för att\n" +" hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" +" den nuvarande grenen, uppdatera till det, annars avbryt." + +msgid "" " The following rules apply when the working directory contains\n" -" uncommitted changes:\n" -"\n" +" uncommitted changes:" +msgstr "" +" Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" +" ändringar:" + +msgid "" " 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" @@ -7036,56 +8338,41 @@ " 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" -" uncommitted changes are preserved.\n" -"\n" -" 3. With the -C/--clean option, uncommitted changes are discarded and\n" -" the working directory is updated to the requested changeset.\n" -"\n" -" Use null as the changeset to remove the working directory (like 'hg\n" -" clone -U').\n" -"\n" -" If you want to update just one file to an older changeset, use 'hg " -"revert'.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"uppdatera arbetskatalogen (eller växla mellan revisioner)\n" -"\n" -" Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n" -"\n" -" Om ingen ändring specificeras, kommer ett försök att göras för att\n" -" hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" -" den nuvarande grenen, uppdatera till det, annars avbryt.\n" -"\n" -" Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" -" ändringar:\n" -"\n" +" are preserved." +msgstr "" " 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" +" bevaras." + +msgid "" +" 2. With the -c/--check option, the update is aborted and the\n" +" uncommitted changes are preserved." +msgstr "" " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" -" ändringarna lämnas.\n" -"\n" +" ändringarna lämnas." + +msgid "" +" 3. With the -C/--clean option, uncommitted changes are discarded and\n" +" the working directory is updated to the requested changeset." +msgstr "" " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" -" arbetskatalogen uppdateras till den begärda ändringen.\n" -"\n" +" arbetskatalogen uppdateras till den begärda ändringen." + +msgid "" +" Use null as the changeset to remove the working directory (like 'hg\n" +" clone -U')." +msgstr "" " Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" -" -U').\n" -"\n" +" -U')." + +msgid " If you want to update just one file to an older changeset, use 'hg revert'." +msgstr "" " Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" -" revert'.\n" -"\n" -" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" -" " +" revert'." msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -7093,21 +8380,19 @@ msgid "uncommitted local changes" msgstr "" -msgid "" -"verify the integrity of the repository\n" -"\n" -" Verify the integrity of the current repository.\n" -"\n" +msgid "verify the integrity of the repository" +msgstr "verifiera arkivets integritet" + +msgid " Verify the integrity of the current repository." +msgstr " Verifiera det aktuella arkivets integritet." + +msgid "" " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" " 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" @@ -7474,8 +8759,7 @@ msgstr "visa alla revisioner som matchar" msgid "follow changeset history, or file history across copies and renames" -msgstr "" -"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" +msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" msgid "ignore case when matching" msgstr "ignorera versaler/gemener vid matchning" @@ -7528,9 +8812,7 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [KÄLLA]" -msgid "" -"directory strip option for patch. This has the same meaning as the " -"corresponding patch option" +msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" msgstr "" msgid "base path" @@ -7996,9 +9278,7 @@ msgid "Option --cwd may not be abbreviated!" msgstr "" -msgid "" -"Option -R has to be separated from other options (e.g. not -qR) and --" -"repository may only be abbreviated as --repo!" +msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" msgstr "" #, python-format @@ -8016,9 +9296,7 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" -msgid "" -"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" -"misc/lsprof/" +msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" msgstr "" #, python-format @@ -8124,10 +9402,15 @@ msgid "" "Mercurial reads configuration data from several files, if they exist.\n" -"Below we list the most specific file first.\n" -"\n" -"On Windows, these configuration files are read:\n" -"\n" +"Below we list the most specific file first." +msgstr "" +"Mercurial läser konfigurationsdata från flera filer, om de existerar.\n" +"Nedan listar vi den mest specifika filen först." + +msgid "On Windows, these configuration files are read:" +msgstr "Under Windows läses dessa konfigurationsfiler:" + +msgid "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" "- ``%USERPROFILE%\\Mercurial.ini``\n" @@ -8135,37 +9418,8 @@ "- ``%HOME%\\Mercurial.ini``\n" "- ``C:\\Mercurial\\Mercurial.ini``\n" "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<install-dir>\\Mercurial.ini``\n" -"\n" -"On Unix, these files are read:\n" -"\n" -"- ``<repo>/.hg/hgrc``\n" -"- ``$HOME/.hgrc``\n" -"- ``/etc/mercurial/hgrc``\n" -"- ``/etc/mercurial/hgrc.d/*.rc``\n" -"- ``<install-root>/etc/mercurial/hgrc``\n" -"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``\n" -"\n" -"The configuration files for Mercurial use a simple ini-file format. A\n" -"configuration file consists of sections, led by a ``[section]`` header\n" -"and followed by ``name = value`` entries::\n" -"\n" -" [ui]\n" -" username = Firstname Lastname <firstname.lastname@example.net>\n" -" verbose = True\n" -"\n" -"This above entries will be referred to as ``ui.username`` and\n" -"``ui.verbose``, respectively. Please see the hgrc man page for a full\n" -"description of the possible configuration values:\n" -"\n" -"- 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" +"- ``<install-dir>\\Mercurial.ini``" +msgstr "" "- ``<arkiv>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" "- ``%USERPROFILE%\\Mercurial.ini``\n" @@ -8173,40 +9427,74 @@ "- ``%HOME%\\Mercurial.ini``\n" "- ``C:\\Mercurial\\Mercurial.ini``\n" "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<installationskatalog>\\Mercurial.ini``\n" -"\n" -"Under Unix läses dessa filer:\n" -"\n" +"- ``<installationskatalog>\\Mercurial.ini``" + +msgid "On Unix, these files are read:" +msgstr "Under Unix läses dessa filer:" + +msgid "" +"- ``<repo>/.hg/hgrc``\n" +"- ``$HOME/.hgrc``\n" +"- ``/etc/mercurial/hgrc``\n" +"- ``/etc/mercurial/hgrc.d/*.rc``\n" +"- ``<install-root>/etc/mercurial/hgrc``\n" +"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``" +msgstr "" "- ``<arkiv>/.hg/hgrc``\n" "- ``$HOME/.hgrc``\n" "- ``/etc/mercurial/hgrc``\n" "- ``/etc/mercurial/hgrc.d/*.rc``\n" "- ``<installationsrot>/etc/mercurial/hgrc``\n" -"- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``\n" -"\n" +"- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``" + +msgid "" +"The configuration files for Mercurial use a simple ini-file format. A\n" +"configuration file consists of sections, led by a ``[section]`` header\n" +"and followed by ``name = value`` entries::" +msgstr "" "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" +"följs av rader med ``namn = värde``::" + +msgid "" +" [ui]\n" +" username = Firstname Lastname <firstname.lastname@example.net>\n" +" verbose = True" +msgstr "" " [ui]\n" " username = Förnamn Efternamn <fornamn.efternamn@example.net>\n" -" verbose = True\n" -"\n" +" verbose = True" + +msgid "" +"This above entries will be referred to as ``ui.username`` and\n" +"``ui.verbose``, respectively. Please see the hgrc man page for a full\n" +"description of the possible configuration values:" +msgstr "" "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" +"möjliga konfigurationsvärden:" + +msgid "" +"- on Unix-like systems: ``man hgrc``\n" +"- online: http://www.selenic.com/mercurial/hgrc.5.html\n" +msgstr "" "- 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" -"\n" +msgid "Some commands allow the user to specify a date, e.g.:" +msgstr "Vissa kommandon tillåter att användare anger ett datum, bland dom:" + +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" +"- log, revert, update: Select revision(s) by date." +msgstr "" +"- backout, commit, import, tag: Ange arkiveringsdatum.\n" +"- log, revert, update: Välj revision(er) med hjälp av datum." + +msgid "Many date formats are valid. Here are some examples:" +msgstr "Många datumformat är giltiga. Här är några exempel:" + +msgid "" "- ``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" @@ -8219,31 +9507,8 @@ "- ``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" -msgstr "" -"Vissa kommandon tillåter att användare anger ett datum, bland dom:\n" -"\n" -"- backout, commit, import, tag: Ange arkiveringsdatum.\n" -"- log, revert, update: Välj revision(er) med hjälp av datum.\n" -"\n" -"Många datumformat är giltiga. Här är några exempel:\n" -"\n" +"- ``12/6/6`` (Dec 6 2006)" +msgstr "" "- ``Wed Dec 6 13:18:29 2006`` (lokal tidszon antas)\n" "- ``Dec 6 13:18 -0600`` (året antas, tidsoffset anges)\n" "- ``Dec 6 13:18 UTC`` (UTC och GMT är alias för +0000)\n" @@ -8256,19 +9521,34 @@ "- ``2006-12-6``\n" "- ``12-6``\n" "- ``12/6``\n" -"- ``12/6/6`` (Dec 6 2006)\n" -"\n" -"Till sist, så finns även Mercurial's interna format:\n" -"\n" -"- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" +"- ``12/6/6`` (Dec 6 2006)" + +msgid "Lastly, there is Mercurial's internal format:" +msgstr "Till sist, så finns även Mercurial's interna format:" + +msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)" +msgstr "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)" + +msgid "" +"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)." +msgstr "" "Detta är det interna representationsformatet för datum. unixtime är antalet\n" "sekunder sedan epoken(1970-01-01 00:00 UTC). offset är offseten till den\n" "lokala tidszonen, i sekunder väst om UTC (negativ om tidszonen är öst om\n" -"UTC).\n" -"\n" -"Kommandot log accepterar också datumintervall:\n" -"\n" +"UTC)." + +msgid "The log command also accepts date ranges:" +msgstr "Kommandot log accepterar också datumintervall:" + +msgid "" +"- ``<{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 "" "- ``<{datumtid}`` - på eller innan datum/tid\n" "- ``>{datumtid}`` - på eller efter datum/tid\n" "- ``{datumtid} to {datumtid}`` - ett datumintervall, inklusivt\n" @@ -8277,29 +9557,39 @@ msgid "" "Mercurial's default format for showing changes between two versions of\n" "a file is compatible with the unified format of GNU diff, which can be\n" -"used by GNU patch and many other standard tools.\n" -"\n" +"used by GNU patch and many other standard tools." +msgstr "" + +msgid "" "While this standard format is often enough, it does not encode the\n" -"following information:\n" -"\n" +"following information:" +msgstr "" + +msgid "" "- executable status and other permission bits\n" "- copy or rename information\n" "- changes in binary files\n" -"- creation or deletion of empty files\n" -"\n" +"- creation or deletion of empty files" +msgstr "" + +msgid "" "Mercurial also supports the extended diff format from the git VCS\n" "which addresses these limitations. The git diff format is not produced\n" "by default because a few widespread tools still do not understand this\n" -"format.\n" -"\n" +"format." +msgstr "" + +msgid "" "This means that when generating diffs from a Mercurial repository\n" "(e.g. with \"hg export\"), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" "pull) are not affected by this, because they use an internal binary\n" -"format for communicating changes.\n" -"\n" +"format for communicating changes." +msgstr "" + +msgid "" "To make Mercurial produce the git extended diff format, use the --git\n" "option available for many commands, or set 'git = True' in the [diff]\n" "section of your hgrc. You do not need to set this option when\n" @@ -8312,84 +9602,112 @@ " hooks, extensions or external tools. If unset or empty, this is\n" " the hg executable's name if it's frozen, or an executable named\n" " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" +" Windows) is searched." +msgstr "" + +msgid "" "HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" This is the name of the editor to run when committing. See EDITOR." +msgstr "" + +msgid " (deprecated, use .hgrc)" +msgstr "" + +msgid "" "HGENCODING\n" " This overrides the default locale setting detected by Mercurial.\n" " This setting is used to convert data including usernames,\n" " changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" +" be overridden with the --encoding command-line option." +msgstr "" + +msgid "" "HGENCODINGMODE\n" " This sets Mercurial's behavior for handling unknown characters\n" " while transcoding user input. The default is \"strict\", which\n" " causes Mercurial to abort if it can't map a character. Other\n" " settings include \"replace\", which replaces unknown characters, and\n" " \"ignore\", which drops them. This setting can be overridden with\n" -" the --encodingmode command-line option.\n" -"\n" +" the --encodingmode command-line option." +msgstr "" + +msgid "" "HGMERGE\n" " An executable to use for resolving merge conflicts. The program\n" " will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" ancestor file." +msgstr "" + +msgid "" "HGRCPATH\n" " A list of files or directories to search for hgrc files. Item\n" " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" " platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" +" from the current repository is read." +msgstr "" + +msgid " For each element in HGRCPATH:" +msgstr "" + +msgid "" " - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" +" - otherwise, the file itself will be added" +msgstr "" + +msgid "" "HGPLAIN\n" " When set, this disables any options in .hgrc that might change\n" " Mercurial's default output. This includes encoding, defaults,\n" " verbose mode, debug mode, quiet mode, tracebacks, and\n" " localization. This can be useful when scripting against Mercurial\n" -" in the face of existing user configuration.\n" -"\n" +" in the face of existing user configuration." +msgstr "" + +msgid "" " Equivalent options set via command line flags or environment\n" -" variables are not overridden.\n" -"\n" +" variables are not overridden." +msgstr "" + +msgid "" "HGUSER\n" " This is the string used as the author of a commit. If not set,\n" -" available values will be considered in this order:\n" -"\n" +" available values will be considered in this order:" +msgstr "" + +msgid "" " - HGUSER (deprecated)\n" " - hgrc files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" -" - LOGNAME (with ``@hostname`` appended)\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" - LOGNAME (with ``@hostname`` appended)" +msgstr "" + +msgid "" "EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" +" This is the name of the editor to use when committing. See EDITOR." +msgstr "" + +msgid "" "EDITOR\n" " Sometimes Mercurial needs to open a text file in an editor for a\n" " user to modify, for example when writing commit messages. The\n" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" +" defaults to 'vi'." +msgstr "" + +msgid "" "PYTHONPATH\n" " This is used by Python to find imported modules and may need to be\n" " set appropriately if this Mercurial is not installed system-wide.\n" @@ -8399,31 +9717,44 @@ "Mercurial has the ability to add new features through the use of\n" "extensions. Extensions may add new commands, add options to\n" "existing commands, change the default behavior of commands, or\n" -"implement hooks.\n" -"\n" +"implement hooks." +msgstr "" + +msgid "" "Extensions are not loaded by default for a variety of reasons:\n" "they can increase startup overhead; they may be meant for advanced\n" "usage only; they may provide potentially dangerous abilities (such\n" "as letting you destroy or modify history); they might not be ready\n" "for prime time; or they may alter some usual behaviors of stock\n" "Mercurial. It is thus up to the user to activate extensions as\n" -"needed.\n" -"\n" +"needed." +msgstr "" + +msgid "" "To enable the \"foo\" extension, either shipped with Mercurial or in\n" "the Python search path, create an entry for it in your hgrc, like\n" -"this::\n" -"\n" +"this::" +msgstr "" + +msgid "" " [extensions]\n" -" foo =\n" -"\n" -"You may also specify the full path to an extension::\n" -"\n" +" foo =" +msgstr "" + +msgid "You may also specify the full path to an extension::" +msgstr "" + +msgid "" " [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" +" myfeature = ~/.hgext/myfeature.py" +msgstr "" + +msgid "" "To explicitly disable an extension enabled in an hgrc of broader\n" -"scope, prepend its path with !::\n" -"\n" +"scope, prepend its path with !::" +msgstr "" + +msgid "" " [extensions]\n" " # disabling extension bar residing in /path/to/extension/bar.py\n" " bar = !/path/to/extension/bar.py\n" @@ -8434,159 +9765,171 @@ msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" -"separated by the \":\" character.\n" -"\n" +"separated by the \":\" character." +msgstr "" + +msgid "" "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" "specified, it defaults to revision number 0. If END is not specified,\n" -"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" -"\n" -"If BEGIN is greater than END, revisions are treated in reverse order.\n" -"\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\"." +msgstr "" + +msgid "If BEGIN is greater than END, revisions are treated in reverse order." +msgstr "" + +msgid "" "A range acts as a closed interval. This means that a range of 3:5\n" "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" msgstr "" msgid "" "Mercurial accepts several notations for identifying one or more files\n" -"at a time.\n" -"\n" +"at a time." +msgstr "" +"Mercurial acceptera flera notationer för att identifiera en eller flera\n" +"filer samma gång." + +msgid "" "By default, Mercurial treats filenames as shell-style extended glob\n" -"patterns.\n" -"\n" -"Alternate pattern notations must be specified explicitly.\n" -"\n" +"patterns." +msgstr "" +"Som standard behandlar Mercurial filnamn som ett utökat glob-mönster i\n" +"skalstil." + +msgid "Alternate pattern notations must be specified explicitly." +msgstr "Alternativa mönsternotationer måste anges explicit." + +msgid "" "To use a plain path name without any pattern matching, start it with\n" "``path:``. These path names must completely match starting at the\n" -"current repository root.\n" -"\n" +"current repository root." +msgstr "" +"För att använda en enkel sökväg utan någon mönstermatching, börja den med\n" +"``path:``. Dessa sökvägar måste överrensstämma helt från det nuvarande\n" +"arkivroten." + +msgid "" "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" "at the current directory; a glob such as ``*.c`` will only match files\n" -"in the current directory ending with ``.c``.\n" -"\n" +"in the current directory ending with ``.c``." +msgstr "" +"För att använda utökad glob, börja ett namn med ``glob:``. Globs har sin\n" +"rot i den aktuella katalogen; en glob som ``*.c`` kommer bara att matcha\n" +"filer i den aktuella katalogen som slutar med ``.c``." + +msgid "" "The supported glob syntax extensions are ``**`` to match any string\n" -"across path separators and ``{a,b}`` to mean \"a or b\".\n" -"\n" +"across path separators and ``{a,b}`` to mean \"a or b\"." +msgstr "" +"Den utökade glob-syntaxen är ``**`` för att matcha alla strängar i sökvägen\n" +"och ``{a,b}`` som innebär \"a eller b\"." + +msgid "" "To use a Perl/Python regular expression, start a name with ``re:``.\n" -"Regexp pattern matching is anchored at the root of the repository.\n" -"\n" -"Plain examples::\n" -"\n" +"Regexp pattern matching is anchored at the root of the repository." +msgstr "" +"För att använda reguljära uttryck från Perl/Python, börja ett namn med\n" +"``re:``. Regexp-mönstermatchning har sin början i arkivroten." + +msgid "Plain examples::" +msgstr "Råa exempel::" + +msgid "" " path:foo/bar a name bar in a directory named foo in the root\n" " of the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -"Glob examples::\n" -"\n" +" path:path:name a file or directory named \"path:name\"" +msgstr "" +" path:foo/bar namnet bar i en katalog med namnet foo i arkivroten\n" +" path:path:name en fil eller katalog med namnet \"path:name\"" + +msgid "Glob examples::" +msgstr "Glob-exempel::" + +msgid "" " glob:*.c any name ending in \".c\" in the current directory\n" " *.c any name ending in \".c\" in the current directory\n" " **.c any name ending in \".c\" in any subdirectory of the\n" " current directory including itself.\n" " foo/*.c any name ending in \".c\" in the directory foo\n" " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" -" including itself.\n" -"\n" -"Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -msgstr "" -"Mercurial acceptera flera notationer för att identifiera en eller flera\n" -"filer samma gång.\n" -"\n" -"Som standard behandlar Mercurial filnamn som ett utökat glob-mönster i\n" -"skalstil.\n" -"\n" -"Alternativa mönsternotationer måste anges explicit.\n" -"\n" -"För att använda en enkel sökväg utan någon mönstermatching, börja den med\n" -"``path:``. Dessa sökvägar måste överrensstämma helt från det nuvarande\n" -"arkivroten.\n" -"\n" -"För att använda utökad glob, börja ett namn med ``glob:``. Globs har sin\n" -"rot i den aktuella katalogen; en glob som ``*.c`` kommer bara att matcha\n" -"filer i den aktuella katalogen som slutar med ``.c``.\n" -"\n" -"Den utökade glob-syntaxen är ``**`` för att matcha alla strängar i sökvägen\n" -"och ``{a,b}`` som innebär \"a eller b\".\n" -"\n" -"För att använda reguljära uttryck från Perl/Python, börja ett namn med\n" -"``re:``. Regexp-mönstermatchning har sin början i arkivroten.\n" -"\n" -"Råa exempel::\n" -"\n" -" path:foo/bar namnet bar i en katalog med namnet foo i arkivroten\n" -" path:path:name en fil eller katalog med namnet \"path:name\"\n" -"\n" -"Glob-exempel::\n" -"\n" +" including itself." +msgstr "" " glob:*.c alla namn som slutar på \".c\" i den nuvarande katalogen\n" " *.c alla namn som slutar på \".c\" i den nuvarande katalogen\n" " **.c alla namn som slutar på \".c\" i alla underkataloger från\n" " den nuvarande katalogen inklusive sig själv.\n" " foo/*.c alla namn som slutar på \".c\" i katalogen foo\n" " foo/**.c alla namn som slutar på \".c\" i alla underkataloger från\n" -" foo inklusive sig själv.\n" -"\n" -"Regexp-exempel::\n" -"\n" -" re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" - -msgid "" -"Mercurial supports several ways to specify individual revisions.\n" -"\n" +" foo inklusive sig själv." + +msgid "Regexp examples::" +msgstr "Regexp-exempel::" + +msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" + +msgid "Mercurial supports several ways to specify individual revisions." +msgstr "Mercurial stöder flera sött att ange individuella revisioner." + +msgid "" "A plain integer is treated as a revision number. Negative integers are\n" "treated as sequential offsets from the tip, with -1 denoting the tip,\n" -"-2 denoting the revision prior to the tip, and so forth.\n" -"\n" +"-2 denoting the revision prior to the tip, and so forth." +msgstr "" +"Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n" +"sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n" +"toppen, och så vidare." + +msgid "" "A 40-digit hexadecimal string is treated as a unique revision\n" -"identifier.\n" -"\n" +"identifier." +msgstr "" +"En 40-siffrig hexadecimal sträng behandlas som en unik\n" +"revisionsidentifierare." + +msgid "" "A hexadecimal string less than 40 characters long is treated as a\n" "unique revision identifier and is referred to as a short-form\n" "identifier. A short-form identifier is only valid if it is the prefix\n" -"of exactly one full-length identifier.\n" -"\n" +"of exactly one full-length identifier." +msgstr "" +"En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n" +"revisionsidentifierare och refereras till som en kort identifierare. En\n" +"kort identifierare är bara giltig om det är prefixet för exakt en\n" +"fullängdsidentifierare." + +msgid "" "Any other string is treated as a tag or branch name. A tag name is a\n" "symbolic name associated with a revision identifier. A branch name\n" "denotes the tipmost revision of that branch. Tag and branch names must\n" -"not contain the \":\" character.\n" -"\n" +"not contain the \":\" character." +msgstr "" +"Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n" +"ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n" +"anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n" +"innehålla tecknet \":\"." + +msgid "" "The reserved name \"tip\" is a special tag that always identifies the\n" -"most recent revision.\n" -"\n" +"most recent revision." +msgstr "" +"Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n" +"identifierar den senaste revisionen." + +msgid "" "The reserved name \"null\" indicates the null revision. This is the\n" -"revision of an empty repository, and the parent of revision 0.\n" -"\n" +"revision of an empty repository, and the parent of revision 0." +msgstr "" +"Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n" +"revisionen i ett tomt arkiv, och är förälder till revision 0." + +msgid "" "The reserved name \".\" indicates the working directory parent. If no\n" "working directory is checked out, it is equivalent to null. If an\n" "uncommitted merge is in progress, \".\" is the revision of the first\n" "parent.\n" msgstr "" -"Mercurial stöder flera sött att ange individuella revisioner.\n" -"\n" -"Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n" -"sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n" -"toppen, och så vidare.\n" -"\n" -"En 40-siffrig hexadecimal sträng behandlas som en unik\n" -"revisionsidentifierare.\n" -"\n" -"En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n" -"revisionsidentifierare och refereras till som en kort identifierare. En\n" -"kort identifierare är bara giltig om det är prefixet för exakt en\n" -"fullängdsidentifierare.\n" -"\n" -"Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n" -"ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n" -"anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n" -"innehålla tecknet \":\".\n" -"\n" -"Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n" -"identifierar den senaste revisionen.\n" -"\n" -"Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n" -"revisionen i ett tomt arkiv, och är förälder till revision 0.\n" -"\n" "Det reserverade namnet \".\" indikerar arbetskatalogens förälder. Om ingen\n" "arbetskatalog är uthämtad, är den ekvivalent med null. Om en oarkiverad\n" "sammanfogning pågår, så är \".\" den första förälderns revision.\n" @@ -8595,216 +9938,328 @@ "Mercurial allows you to customize output of commands through\n" "templates. You can either pass in a template from the command\n" "line, via the --template option, or select an existing\n" -"template-style (--style).\n" -"\n" +"template-style (--style)." +msgstr "" + +msgid "" "You can customize output for any \"log-like\" command: log,\n" -"outgoing, incoming, tip, parents, heads and glog.\n" -"\n" +"outgoing, incoming, tip, parents, heads and glog." +msgstr "" + +msgid "" "Three styles are packaged with Mercurial: default (the style used\n" "when no explicit preference is passed), compact and changelog.\n" -"Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" +"Usage::" +msgstr "" + +msgid " $ hg log -r1 --style changelog" +msgstr "" + +msgid "" "A template is a piece of text, with markup to invoke variable\n" -"expansion::\n" -"\n" +"expansion::" +msgstr "" + +msgid "" " $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746" +msgstr "" + +msgid "" "Strings in curly braces are called keywords. The availability of\n" "keywords depends on the exact context of the templater. These\n" -"keywords are usually available for templating a log-like command:\n" -"\n" -":author: String. The unmodified author of the changeset.\n" -"\n" +"keywords are usually available for templating a log-like command:" +msgstr "" + +msgid ":author: String. The unmodified author of the changeset." +msgstr "" + +msgid "" ":branches: String. The name of the branch on which the changeset was\n" -" committed. Will be empty if the branch name was default.\n" -"\n" -":date: Date information. The date when the changeset was committed.\n" -"\n" -":desc: String. The text of the changeset description.\n" -"\n" +" committed. Will be empty if the branch name was default." +msgstr "" + +msgid ":date: Date information. The date when the changeset was committed." +msgstr "" + +msgid ":desc: String. The text of the changeset description." +msgstr "" + +msgid "" ":diffstat: String. Statistics of changes with the following format:\n" -" \"modified files: +added/-removed lines\"\n" -"\n" +" \"modified files: +added/-removed lines\"" +msgstr "" + +msgid "" ":files: List of strings. All files modified, added, or removed by this\n" -" changeset.\n" -"\n" -":file_adds: List of strings. Files added by this changeset.\n" -"\n" +" changeset." +msgstr "" + +msgid ":file_adds: List of strings. Files added by this changeset." +msgstr "" + +msgid "" ":file_copies: List of strings. Files copied in this changeset with\n" -" their sources.\n" -"\n" +" their sources." +msgstr "" + +msgid "" ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" -" only if the --copied switch is set.\n" -"\n" -":file_mods: List of strings. Files modified by this changeset.\n" -"\n" -":file_dels: List of strings. Files removed by this changeset.\n" -"\n" +" only if the --copied switch is set." +msgstr "" + +msgid ":file_mods: List of strings. Files modified by this changeset." +msgstr "" + +msgid ":file_dels: List of strings. Files removed by this changeset." +msgstr "" + +msgid "" ":node: String. The changeset identification hash, as a 40-character\n" -" hexadecimal string.\n" -"\n" -":parents: List of strings. The parents of the changeset.\n" -"\n" -":rev: Integer. The repository-local changeset revision number.\n" -"\n" -":tags: List of strings. Any tags associated with the changeset.\n" -"\n" +" hexadecimal string." +msgstr "" + +msgid ":parents: List of strings. The parents of the changeset." +msgstr "" + +msgid ":rev: Integer. The repository-local changeset revision number." +msgstr "" + +msgid ":tags: List of strings. Any tags associated with the changeset." +msgstr "" + +msgid "" ":latesttag: String. Most recent global tag in the ancestors of this\n" -" changeset.\n" -"\n" -":latesttagdistance: Integer. Longest path to the latest tag.\n" -"\n" +" changeset." +msgstr "" + +msgid ":latesttagdistance: Integer. Longest path to the latest tag." +msgstr "" + +msgid "" "The \"date\" keyword does not produce human-readable output. If you\n" "want to use a date in your output, you can use a filter to process\n" "it. Filters are functions which return a string based on the input\n" "variable. Be sure to use the stringify filter first when you're\n" "applying a string-input filter to a list-like input variable.\n" -"You can also use a chain of filters to get the desired output::\n" -"\n" +"You can also use a chain of filters to get the desired output::" +msgstr "" + +msgid "" " $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -"List of filters:\n" -"\n" +" 2008-08-21 18:22 +0000" +msgstr "" + +msgid "List of filters:" +msgstr "" + +msgid "" ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" -" every line except the last.\n" -"\n" +" every line except the last." +msgstr "" + +msgid "" ":age: Date. Returns a human-readable date/time difference between the\n" -" given date/time and the current date/time.\n" -"\n" +" given date/time and the current date/time." +msgstr "" + +msgid "" ":basename: Any text. Treats the text as a path, and returns the last\n" " component of the path after splitting by the path separator\n" " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n" -" \"baz\" and \"foo/bar//\" becomes \"bar\".\n" -"\n" +" \"baz\" and \"foo/bar//\" becomes \"bar\"." +msgstr "" + +msgid "" ":stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n" -"\n" +" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"." +msgstr "" + +msgid "" ":date: Date. Returns a date in a Unix date format, including the\n" -" timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" -"\n" +" timezone: \"Mon Sep 04 15:13:13 2006 0700\"." +msgstr "" + +msgid "" ":domain: Any text. Finds the first string that looks like an email\n" " address, and extracts just the domain component. Example: ``User\n" -" <user@example.com>`` becomes ``example.com``.\n" -"\n" +" <user@example.com>`` becomes ``example.com``." +msgstr "" + +msgid "" ":email: Any text. Extracts the first string that looks like an email\n" " address. Example: ``User <user@example.com>`` becomes\n" -" ``user@example.com``.\n" -"\n" +" ``user@example.com``." +msgstr "" + +msgid "" ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" -" and \">\" with XML entities.\n" -"\n" -":fill68: Any text. Wraps the text to fit in 68 columns.\n" -"\n" -":fill76: Any text. Wraps the text to fit in 76 columns.\n" -"\n" -":firstline: Any text. Returns the first line of text.\n" -"\n" -":nonempty: Any text. Returns '(none)' if the string is empty.\n" -"\n" +" and \">\" with XML entities." +msgstr "" + +msgid ":fill68: Any text. Wraps the text to fit in 68 columns." +msgstr "" + +msgid ":fill76: Any text. Wraps the text to fit in 76 columns." +msgstr "" + +msgid ":firstline: Any text. Returns the first line of text." +msgstr "" + +msgid ":nonempty: Any text. Returns '(none)' if the string is empty." +msgstr "" + +msgid "" ":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n" -" 25200\" (Unix timestamp, timezone offset).\n" -"\n" +" 25200\" (Unix timestamp, timezone offset)." +msgstr "" + +msgid "" ":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n" -" +0200\".\n" -"\n" +" +0200\"." +msgstr "" + +msgid "" ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" " seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n" -" filter.\n" -"\n" -":localdate: Date. Converts a date to local date.\n" -"\n" +" filter." +msgstr "" + +msgid ":localdate: Date. Converts a date to local date." +msgstr "" + +msgid "" ":obfuscate: Any text. Returns the input text rendered as a sequence of\n" -" XML entities.\n" -"\n" -":person: Any text. Returns the text before an email address.\n" -"\n" +" XML entities." +msgstr "" + +msgid ":person: Any text. Returns the text before an email address." +msgstr "" + +msgid "" ":rfc822date: Date. Returns a date using the same format used in email\n" -" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" -"\n" +" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"." +msgstr "" + +msgid "" ":rfc3339date: Date. Returns a date using the Internet date format\n" -" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" -"\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." +msgstr "" + +msgid "" ":short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12-byte hexadecimal string.\n" -"\n" -":shortdate: Date. Returns a date like \"2006-09-18\".\n" -"\n" -":strip: Any text. Strips all leading and trailing whitespace.\n" -"\n" +" i.e. a 12-byte hexadecimal string." +msgstr "" + +msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." +msgstr "" + +msgid ":strip: Any text. Strips all leading and trailing whitespace." +msgstr "" + +msgid "" ":tabindent: Any text. Returns the text, with every line except the\n" -" first starting with a tab character.\n" -"\n" +" first starting with a tab character." +msgstr "" + +msgid "" ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\".\n" -"\n" -":user: Any text. Returns the user portion of an email address.\n" -msgstr "" - -msgid "" -"Valid URLs are of the form::\n" -"\n" +" \"foo bar\" becomes \"foo%20bar\"." +msgstr "" + +msgid ":user: Any text. Returns the user portion of an email address.\n" +msgstr "" + +msgid "Valid URLs are of the form::" +msgstr "" + +msgid "" " 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" +" ssh://[user[:pass]@]host[:port]/[path][#revision]" +msgstr "" + +msgid "" "Paths in the local filesystem can either point to Mercurial\n" "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle').\n" -"\n" +"incoming --bundle')." +msgstr "" + +msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" "changeset to use from the remote repository. See also 'hg help\n" -"revisions'.\n" -"\n" +"revisions'." +msgstr "" + +msgid "" "Some features, such as pushing to http:// and https:// URLs are only\n" "possible if the feature is explicitly enabled on the remote Mercurial\n" -"server.\n" -"\n" -"Some notes about using SSH with Mercurial:\n" -"\n" +"server." +msgstr "" + +msgid "Some notes about using SSH with Mercurial:" +msgstr "" + +msgid "" "- SSH requires an accessible shell account on the destination machine\n" " and a copy of hg in the remote path or specified with as remotecmd.\n" "- path is relative to the remote user's home directory by default. Use\n" -" an extra slash at the start of a path to specify an absolute path::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" +" an extra slash at the start of a path to specify an absolute path::" +msgstr "" + +msgid " ssh://example.com//tmp/repository" +msgstr "" + +msgid "" "- Mercurial doesn't use its own compression via SSH; the right thing\n" -" to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" +" to do is to configure it in your ~/.ssh/config, e.g.::" +msgstr "" + +msgid "" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" -" Compression yes\n" -"\n" +" Compression yes" +msgstr "" + +msgid "" " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" +" with the --ssh command line option." +msgstr "" + +msgid "" "These URLs can all be stored in your hgrc with path aliases under the\n" -"[paths] section like so::\n" -"\n" +"[paths] section like so::" +msgstr "" + +msgid "" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" -" ...\n" -"\n" +" ..." +msgstr "" + +msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' will be treated as 'hg pull URL1').\n" -"\n" +"example 'hg pull alias1' will be treated as 'hg pull URL1')." +msgstr "" + +msgid "" "Two path aliases are special because they are used as defaults when\n" -"you do not provide the URL to a command:\n" -"\n" +"you do not provide the URL to a command:" +msgstr "" + +msgid "" "default:\n" " When you create a repository with hg clone, the clone command saves\n" " the location of the source repository as the new repository's\n" " 'default' path. This is then used when you omit path from push- and\n" -" pull-like commands (including incoming and outgoing).\n" -"\n" +" pull-like commands (including incoming and outgoing)." +msgstr "" + +msgid "" "default-push:\n" " The push command will look for a path named 'default-push', and\n" " prefer it over 'default' if both are defined.\n" @@ -8834,12 +10289,8 @@ msgid "destination '%s' is not empty" msgstr "destinationen '%s är inte tom" -msgid "" -"src repository does not support revision lookup and so doesn't support clone " -"by revision" -msgstr "" -"källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning " -"av angivna revisioner" +msgid "src repository does not support revision lookup and so doesn't support clone by revision" +msgstr "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning av angivna revisioner" msgid "clone from remote to remote not supported" msgstr "kloning från fjärr till fjärr stödjs inte" @@ -8849,18 +10300,13 @@ msgstr "uppdaterar till grenen %s\n" #, python-format -msgid "" -"%d files updated, %d files merged, %d files removed, %d files unresolved\n" -msgstr "" -"%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer " -"olösta\n" +msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer olösta\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " -"abandon\n" +msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" @@ -9162,12 +10608,8 @@ msgid "requesting all changes\n" msgstr "efterfrågar alla ändringar\n" -msgid "" -"Partial pull cannot be done because other repository doesn't support " -"changegroupsubset." -msgstr "" -"Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " -"changegroupsubset." +msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." +msgstr "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer changegroupsubset." #, python-format msgid "abort: push creates new remote heads on branch '%s'!\n" @@ -9320,9 +10762,7 @@ msgstr "" #, python-format -msgid "" -"untracked file in working directory differs from file in requested revision: " -"'%s'" +msgid "untracked file in working directory differs from file in requested revision: '%s'" msgstr "" #, python-format @@ -9397,9 +10837,7 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -msgid "" -"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " -"changes)" +msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" msgstr "" msgid "crosses branches (use 'hg merge' or use 'hg update -c')"