# HG changeset patch # User Martin Geisler # Date 2010-06-19 15:19:15 # Node ID 0ebc8be6f52a641419c0a46619d7810f2e8e032d # Parent 805bf1c944d372d524966becba33912d9224b65b i18n-sv: split messages into paragraphs diff --git a/i18n/sv.po b/i18n/sv.po --- a/i18n/sv.po +++ b/i18n/sv.po @@ -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 @@ msgstr "Flaggor" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgid "" " 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 @@ msgstr "" 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 @@ msgstr "" 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" -" \n" -"\n" +" by providing a file using the following format::" +msgstr "" + +msgid " " +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 @@ msgstr "" 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 @@ msgid "" " 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 @@ msgstr "" " 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 @@ msgstr "när färgläggning ska ske (always, auto eller never)" 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 @@ msgid "" " - 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 isn't given, it will be put in a default location\n" " (/.hg/shamap by default). The is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so::\n" -"\n" -" \n" -"\n" +" revision, like so::" +msgstr "" + +msgid " " +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 @@ msgid "" " 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 @@ msgid "" " \"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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgstr "" 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 @@ msgid "CVS pserver authentication failed 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 @@ msgid "analyzing tree version %s...\n" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgid "hg extdiff [OPT]... [FILE]..." 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "Signerar %d:%s\n" 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 @@ msgstr "" 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 @@ msgstr "" 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 @@ msgstr "visa den specifika revisionen el 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 @@ msgid "" " # 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 @@ msgstr "" 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 @@ msgstr "" 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 =