|
|
# 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"
|
|
|
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
|
|
|
"POT-Creation-Date: 2010-11-01 13:33+0100\n"
|
|
|
"PO-Revision-Date: 2010-11-01 13:42+0100\n"
|
|
|
"Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
|
|
|
"Language-Team: Swedish\n"
|
|
|
"Language: Swedish\n"
|
|
|
"MIME-Version: 1.0\n"
|
|
|
"Content-Type: text/plain; charset=utf-8\n"
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid " (default: %s)"
|
|
|
msgstr " (standard: %s)"
|
|
|
|
|
|
msgid "Options"
|
|
|
msgstr "Flaggor"
|
|
|
|
|
|
msgid "Commands"
|
|
|
msgstr "Kommandon"
|
|
|
|
|
|
msgid "Extensions"
|
|
|
msgstr "Utökningar"
|
|
|
|
|
|
msgid ""
|
|
|
"This section contains help for extensions that are distributed together with "
|
|
|
"Mercurial. Help for other extensions is available in the help system."
|
|
|
msgstr ""
|
|
|
"Den här sektioner innehåller hjälp för utökningar som levereras med "
|
|
|
"Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet."
|
|
|
|
|
|
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 given\n"
|
|
|
"branches and paths of a repository when receiving incoming changesets\n"
|
|
|
"via pretxnchangegroup and pretxncommit."
|
|
|
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)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The acl hook is best used along with a restricted shell like hgsh,\n"
|
|
|
"preventing authenticating users from doing anything other than pushing\n"
|
|
|
"or pulling. The hook is not safe to use if users have interactive\n"
|
|
|
"shell access, as they can then disable the hook. Nor is it safe if\n"
|
|
|
"remote users share an account, because then there is no way to\n"
|
|
|
"distinguish them."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "The order in which access checks are performed is:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"1) Deny list for branches (section ``acl.deny.branches``)\n"
|
|
|
"2) Allow list for branches (section ``acl.allow.branches``)\n"
|
|
|
"3) Deny list for paths (section ``acl.deny``)\n"
|
|
|
"4) Allow list for paths (section ``acl.allow``)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "The allow and deny sections take key-value pairs."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch-based Access Control\n"
|
|
|
"..........................."
|
|
|
msgstr ""
|
|
|
"Grenbaserad Åtkomstkontroll\n"
|
|
|
"..........................."
|
|
|
|
|
|
msgid ""
|
|
|
"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
|
|
|
"have branch-based access control. Keys in these sections can be\n"
|
|
|
"either:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- a branch name, or\n"
|
|
|
"- an asterisk, to match any branch;"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "The corresponding values can be either:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- a comma-separated list containing users and groups, or\n"
|
|
|
"- an asterisk, to match anyone;"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Path-based Access Control\n"
|
|
|
"........................."
|
|
|
msgstr ""
|
|
|
"Sökvägsbaserad Åtkomstkontroll\n"
|
|
|
".............................."
|
|
|
|
|
|
msgid ""
|
|
|
"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
|
|
|
"access control. Keys in these sections accept a subtree pattern (with\n"
|
|
|
"a glob syntax by default). The corresponding values follow the same\n"
|
|
|
"syntax as the other sections above."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Groups\n"
|
|
|
"......"
|
|
|
msgstr ""
|
|
|
"Grupper\n"
|
|
|
"......."
|
|
|
|
|
|
msgid ""
|
|
|
"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
|
|
|
"name has the same effect as specifying all the users in that group."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You can define group members in the ``acl.groups`` section.\n"
|
|
|
"If a group name is not defined there, and Mercurial is running under\n"
|
|
|
"a Unix-like system, the list of users will be taken from the OS.\n"
|
|
|
"Otherwise, an exception will be raised."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Example Configuration\n"
|
|
|
"....................."
|
|
|
msgstr ""
|
|
|
"Exempelkonfiguration\n"
|
|
|
"...................."
|
|
|
|
|
|
msgid "::"
|
|
|
msgstr "::"
|
|
|
|
|
|
msgid " [hooks]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Use this if you want to check access restrictions at commit time\n"
|
|
|
" pretxncommit.acl = python:hgext.acl.hook"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Use this if you want to check access restrictions for pull, push,\n"
|
|
|
" # bundle and serve.\n"
|
|
|
" pretxnchangegroup.acl = python:hgext.acl.hook"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [acl]\n"
|
|
|
" # Allow or deny access for incoming changes only if their source is\n"
|
|
|
" # listed here, let them pass otherwise. Source is \"serve\" for all\n"
|
|
|
" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n"
|
|
|
" # related commands are run locally.\n"
|
|
|
" # Default: serve\n"
|
|
|
" sources = serve"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " [acl.deny.branches]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Everyone is denied to the frozen branch:\n"
|
|
|
" frozen-branch = *"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # A bad user is denied on all branches:\n"
|
|
|
" * = bad-user"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " [acl.allow.branches]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # A few users are allowed on branch-a:\n"
|
|
|
" branch-a = user-1, user-2, user-3"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Only one user is allowed on branch-b:\n"
|
|
|
" branch-b = user-1"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # The super user is allowed on any branch:\n"
|
|
|
" * = super-user"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Everyone is allowed on branch-for-tests:\n"
|
|
|
" branch-for-tests = *"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [acl.deny]\n"
|
|
|
" # This list is checked first. If a match is found, acl.allow is not\n"
|
|
|
" # checked. All users are granted access if acl.deny is not present.\n"
|
|
|
" # Format for both lists: glob pattern = user, ..., @group, ..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # To match everyone, use an asterisk for the user:\n"
|
|
|
" # my/glob/pattern = *"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # user6 will not have write access to any file:\n"
|
|
|
" ** = user6"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Group \"hg-denied\" will not have write access to any file:\n"
|
|
|
" ** = @hg-denied"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n"
|
|
|
" # everyone being able to change all other files. See below.\n"
|
|
|
" src/main/resources/DONT-TOUCH-THIS.txt = *"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [acl.allow]\n"
|
|
|
" # if acl.allow is not present, all users are allowed by default\n"
|
|
|
" # empty acl.allow = no users allowed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # User \"doc_writer\" has write access to any file under the \"docs\"\n"
|
|
|
" # folder:\n"
|
|
|
" docs/** = doc_writer"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # User \"jack\" and group \"designers\" have write access to any file\n"
|
|
|
" # under the \"images\" folder:\n"
|
|
|
" images/** = jack, @designers"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
|
|
|
" # access to any file under the \"resources\" folder (except for 1\n"
|
|
|
" # file. See acl.deny):\n"
|
|
|
" src/main/resources/** = *"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " .hgtags = release_engineer"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "group '%s' is undefined"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"config error - hook type \"%s\" cannot stop incoming changesets nor commits"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "acl: access denied for changeset %s"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"It is possible to use bookmark names in every revision lookup (e.g.\n"
|
|
|
":hg:`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 configuration file::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [bookmarks]\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 ""
|
|
|
" 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."
|
|
|
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"
|
|
|
" the bookmark is assigned to that revision."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
|
|
|
" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
|
|
|
" enabled for both the local and remote repositories.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "a bookmark of this name does not exist"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "a bookmark of the same name already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "new bookmark name required"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "bookmark name required"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "bookmark name cannot contain newlines"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "bookmark names cannot consist entirely of whitespace"
|
|
|
msgstr "bokmärksnamn kan inte bestå enbart av blanktecken"
|
|
|
|
|
|
msgid "a bookmark cannot have the name of an existing branch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no bookmarks set\n"
|
|
|
msgstr "inga bokmärken satta\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "updating bookmark %s\n"
|
|
|
msgstr "uppdaterar bokmärket %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not updating divergent bookmark %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "updating bookmark %s failed!\n"
|
|
|
msgstr "uppdatering av bokmärket %s misslyckades!\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "remote bookmark %s not found!"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "importing bookmark %s\n"
|
|
|
msgstr "importerar bokmärket %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "exporting bookmark %s\n"
|
|
|
msgstr "exporterar bokmärket %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "deleting remote bookmark %s\n"
|
|
|
msgstr "raderar fjärrbokmärket %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bookmark %s does not exist on the local or remote repository!\n"
|
|
|
msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n"
|
|
|
|
|
|
msgid "searching for changed bookmarks\n"
|
|
|
msgstr "söker efter ändrade bokmärken\n"
|
|
|
|
|
|
msgid "no changed bookmarks found\n"
|
|
|
msgstr "inga ändrade bokmärken hittades\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "comparing with %s\n"
|
|
|
msgstr "jämför med %s\n"
|
|
|
|
|
|
msgid "bookmark to import"
|
|
|
msgstr "bokmärke att importera"
|
|
|
|
|
|
msgid "BOOKMARK"
|
|
|
msgstr "BOKMÄRKE"
|
|
|
|
|
|
msgid "bookmark to export"
|
|
|
msgstr "bokmärke att exportera"
|
|
|
|
|
|
msgid "compare bookmark"
|
|
|
msgstr "jämför bokmärke"
|
|
|
|
|
|
msgid ""
|
|
|
"``bookmark([name])``\n"
|
|
|
" The named bookmark or all bookmarks."
|
|
|
msgstr ""
|
|
|
"``bookmark([namn])``\n"
|
|
|
" Det angivna bokmärket eller alla bokmärken."
|
|
|
|
|
|
#. i18n: "bookmark" is a keyword
|
|
|
msgid "bookmark takes one or no arguments"
|
|
|
msgstr "bookmark tar ett eller inga argument"
|
|
|
|
|
|
#. i18n: "bookmark" is a keyword
|
|
|
msgid "the argument to bookmark must be a string"
|
|
|
msgstr "argumentet till bookmark måste vara en sträng"
|
|
|
|
|
|
msgid "force"
|
|
|
msgstr "tvinga"
|
|
|
|
|
|
msgid "REV"
|
|
|
msgstr "REV"
|
|
|
|
|
|
msgid "revision"
|
|
|
msgstr "revision"
|
|
|
|
|
|
msgid "delete a given bookmark"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "NAME"
|
|
|
msgstr "NAMN"
|
|
|
|
|
|
msgid "rename a given bookmark"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The hook updates the Bugzilla database directly. Only Bugzilla\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The extension is configured through three different configuration\n"
|
|
|
"sections. These keys are recognized in the [bugzilla] section:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"host\n"
|
|
|
" Hostname of the MySQL server holding the Bugzilla database."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"db\n"
|
|
|
" Name of the Bugzilla database in MySQL. Default 'bugs'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"user\n"
|
|
|
" Username to use to access MySQL server. Default 'bugs'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"password\n"
|
|
|
" Password to use to access MySQL server."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"timeout\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"bzuser\n"
|
|
|
" Fallback Bugzilla user name to record comments with, if changeset\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'."
|
|
|
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\"."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"style\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::"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Default 'changeset {node|short} in repo {root} refers '\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."
|
|
|
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."
|
|
|
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\""
|
|
|
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}."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Activating the extension::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\n"
|
|
|
" bugzilla ="
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [hooks]\n"
|
|
|
" # run bugzilla hook on every change pulled or pushed in here\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. ::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [bugzilla]\n"
|
|
|
" host=localhost\n"
|
|
|
" password=XYZZY\n"
|
|
|
" version=3.0\n"
|
|
|
" bzuser=unknown@domain.com\n"
|
|
|
" bzdir=/opt/bugzilla-3.2\n"
|
|
|
" template=Changeset {node|short} in {root|basename}.\n"
|
|
|
" {hgweb}/{webroot}/rev/{node|short}\\n\n"
|
|
|
" {desc}\\n\n"
|
|
|
" strip=5"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [web]\n"
|
|
|
" baseurl=http://dev.domain.com/hg"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [usermap]\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Changeset commit comment. Bug 1234.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "connecting to %s:%s as %s, password %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "query: %s %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "failed query: %s %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unknown database schema"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bug %d already knows about changeset %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "telling bugzilla to send mail:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid " bug %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "running notify command %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bugzilla notify command %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "done\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "looking up user %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot find bugzilla user id for %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot find bugzilla user id for %s or %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bugzilla version %s not supported"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"changeset {node|short} in repo {root} refers to bug {bug}.\n"
|
|
|
"details:\n"
|
|
|
"\t{desc|tabindent}"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "python mysql support not available: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hook type %s does not pass a changeset id"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "database error: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "command to display child changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
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"
|
|
|
" file was last changed (after the working directory revision or the\n"
|
|
|
" argument to --rev if given) is printed.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show children of the specified revision"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg children [-r REV] [FILE]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "command to display statistics about repository history"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Revision %d is a merge, ignoring...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "analyzing"
|
|
|
msgstr "analyserar"
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Examples::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # display count of changed lines for every committer\n"
|
|
|
" hg churn -t '{author|email}'"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # display daily activity graph\n"
|
|
|
" hg churn -f '%H' -s -c"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # display activity of developers by month\n"
|
|
|
" hg churn -f '%Y-%m' -s -c"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # display count of lines changed in every year\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::"
|
|
|
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"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping malformed alias: %s\n"
|
|
|
msgstr "hoppar över defekt alias: %s\n"
|
|
|
|
|
|
msgid "count rate for the specified revision or range"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "DATE"
|
|
|
msgstr "DATUM"
|
|
|
|
|
|
msgid "count rate for revisions matching date spec"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "TEMPLATE"
|
|
|
msgstr "MALL"
|
|
|
|
|
|
msgid "template to group changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "FORMAT"
|
|
|
msgstr "FORMAT"
|
|
|
|
|
|
msgid "strftime-compatible format for grouping by date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "count rate by number of changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "sort by key (default: sort by count)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "display added/removed lines separately"
|
|
|
msgstr "visa tillagda/raderade rader separat"
|
|
|
|
|
|
msgid "FILE"
|
|
|
msgstr "FIL"
|
|
|
|
|
|
msgid "file with email aliases"
|
|
|
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"
|
|
|
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."
|
|
|
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."
|
|
|
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 your configuration file::"
|
|
|
msgstr "Standardeffekter kan ersättas från din konfiturationsfil::"
|
|
|
|
|
|
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"
|
|
|
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"
|
|
|
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"
|
|
|
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"
|
|
|
" diff.file_b = green bold\n"
|
|
|
" diff.hunk = magenta\n"
|
|
|
" diff.deleted = red\n"
|
|
|
" diff.inserted = green\n"
|
|
|
" diff.changed = white\n"
|
|
|
" diff.trailingwhitespace = bold red_background"
|
|
|
msgstr ""
|
|
|
" diff.diffline = bold\n"
|
|
|
" diff.extended = cyan bold\n"
|
|
|
" diff.file_a = red bold\n"
|
|
|
" diff.file_b = green bold\n"
|
|
|
" diff.hunk = magenta\n"
|
|
|
" diff.deleted = red\n"
|
|
|
" diff.inserted = green\n"
|
|
|
" diff.changed = white\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"
|
|
|
|
|
|
msgid " bookmarks.current = green"
|
|
|
msgstr " bookmarks.current = green"
|
|
|
|
|
|
msgid ""
|
|
|
" branches.active = none\n"
|
|
|
" branches.closed = black bold\n"
|
|
|
" branches.current = green\n"
|
|
|
" branches.inactive = none"
|
|
|
msgstr ""
|
|
|
" branches.active = none\n"
|
|
|
" branches.closed = black bold\n"
|
|
|
" branches.current = green\n"
|
|
|
" branches.inactive = none"
|
|
|
|
|
|
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::"
|
|
|
|
|
|
msgid ""
|
|
|
" [color]\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"
|
|
|
msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n"
|
|
|
|
|
|
msgid "win32console not found, please install pywin32\n"
|
|
|
msgstr "win32console hittades inte, installera pywin32\n"
|
|
|
|
|
|
#. i18n: 'always', 'auto', and 'never' are keywords and should
|
|
|
#. not be translated
|
|
|
msgid "when to colorize (boolean, always, auto, or never)"
|
|
|
msgstr "när färgläggning ska ske (boolean, always, auto eller never)"
|
|
|
|
|
|
msgid "TYPE"
|
|
|
msgstr "TYP"
|
|
|
|
|
|
msgid "import revisions from foreign VCS repositories into Mercurial"
|
|
|
msgstr ""
|
|
|
|
|
|
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"
|
|
|
" - git [git]\n"
|
|
|
" - Subversion [svn]\n"
|
|
|
" - Monotone [mtn]\n"
|
|
|
" - GNU Arch [gnuarch]\n"
|
|
|
" - Bazaar [bzr]\n"
|
|
|
" - Perforce [p4]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Accepted destination formats [identifiers]:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - Mercurial [hg]\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)."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Om ingen destinationskatalog anges, kommer basnamnet för källan med\n"
|
|
|
" ``-hg`` tillagd. Om destinationsarkivet inte existerar, så kommer det\n"
|
|
|
" att skapas."
|
|
|
|
|
|
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:"
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" --sourcesort try to preserve source revisions order, only\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::"
|
|
|
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 :hg:`convert` can be interrupted\n"
|
|
|
" and can be run repeatedly to copy new commits."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The authormap is a simple text file that maps each source commit\n"
|
|
|
" author to a destination commit author. It is handy for source SCMs\n"
|
|
|
" that use unix logins to identify authors (eg: CVS). One line per\n"
|
|
|
" author mapping and the line format is::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " source author = destination author"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Empty lines and lines starting with a ``#`` are ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The filemap is a file that allows filtering and remapping of files\n"
|
|
|
" and directories. Each line can contain one of the following\n"
|
|
|
" directives::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " include path/to/file-or-dir"
|
|
|
msgstr " include sökväg/till/fil-eller-katalog"
|
|
|
|
|
|
msgid " exclude path/to/file-or-dir"
|
|
|
msgstr " exclude sökväg/till/fil-eller-katalog"
|
|
|
|
|
|
msgid " rename path/to/source path/to/destination"
|
|
|
msgstr " rename sökväg/till/källa sökväg/till/destination"
|
|
|
|
|
|
msgid ""
|
|
|
" Comment lines start with ``#``. A specified path matches if it\n"
|
|
|
" equals the full relative name of a file or one of its parent\n"
|
|
|
" directories. The ``include`` or ``exclude`` directive with the\n"
|
|
|
" longest matching path applies, so line order does not matter."
|
|
|
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 if\n"
|
|
|
" it is converted. To rename from a subdirectory into the root of\n"
|
|
|
" the repository, use ``.`` 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"
|
|
|
" graft two disconnected series of history together. Each entry\n"
|
|
|
" contains a key, followed by a space, followed by one or two\n"
|
|
|
" comma-separated values::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " key parent1, parent2"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The key is the revision ID in the source\n"
|
|
|
" revision control system whose parents should be modified (same\n"
|
|
|
" format as a key in .hg/shamap). The values are the revision IDs\n"
|
|
|
" (in either the source or destination revision control system) that\n"
|
|
|
" 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."
|
|
|
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"
|
|
|
" to help fix even the most badly mismanaged repositories and turn them\n"
|
|
|
" into nicely structured Mercurial repositories. The branchmap contains\n"
|
|
|
" lines of the form::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " original_branch_name new_branch_name"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" where \"original_branch_name\" is the name of the branch in the\n"
|
|
|
" source repository, and \"new_branch_name\" is the name of the branch\n"
|
|
|
" is the destination repository. No whitespace is allowed in the\n"
|
|
|
" branch names. This can be used to (for instance) move code in one\n"
|
|
|
" repository from \"default\" to a named branch."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Mercurial Source\n"
|
|
|
" ''''''''''''''''"
|
|
|
msgstr ""
|
|
|
" Mercurial-källa\n"
|
|
|
" '''''''''''''''"
|
|
|
|
|
|
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"
|
|
|
" Mercurial.\n"
|
|
|
" --config convert.hg.saverev=False (boolean)\n"
|
|
|
" 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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" CVS Source\n"
|
|
|
" ''''''''''"
|
|
|
msgstr ""
|
|
|
" CVS-källa\n"
|
|
|
" '''''''''"
|
|
|
|
|
|
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"
|
|
|
" repository is :local:. The conversion uses the top level directory\n"
|
|
|
" in the sandbox to find the CVS repository, and then uses CVS rlog\n"
|
|
|
" 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."
|
|
|
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"
|
|
|
" --config convert.cvsps.fuzz=60 (integer)\n"
|
|
|
" Specify the maximum time (in seconds) that is allowed between\n"
|
|
|
" commits with identical user and log message in a single\n"
|
|
|
" changeset. When very large files were checked in as part of a\n"
|
|
|
" changeset then the default may not be long enough.\n"
|
|
|
" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
|
|
|
" Specify a regular expression to which commit log messages are\n"
|
|
|
" matched. If a match occurs, then the conversion process will\n"
|
|
|
" insert a dummy revision merging the branch on which this log\n"
|
|
|
" message occurs to the branch indicated in the regex.\n"
|
|
|
" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
|
|
|
" Specify a regular expression to which commit log messages are\n"
|
|
|
" matched. If a match occurs, then the conversion process will\n"
|
|
|
" add the most recent revision on the branch indicated in the\n"
|
|
|
" regex as the second parent of the changeset.\n"
|
|
|
" --config hook.cvslog\n"
|
|
|
" Specify a Python function to be called at the end of gathering\n"
|
|
|
" the CVS log. The function is passed a list with the log entries,\n"
|
|
|
" and can modify the entries in-place, or add or delete them.\n"
|
|
|
" --config hook.cvschangesets\n"
|
|
|
" 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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Subversion Source\n"
|
|
|
" '''''''''''''''''"
|
|
|
msgstr ""
|
|
|
" Subversion-källa\n"
|
|
|
" ''''''''''''''''"
|
|
|
|
|
|
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"
|
|
|
" replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
|
|
|
" its subdirectories are listed as possible branches. If\n"
|
|
|
" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
|
|
|
" 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."
|
|
|
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"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" --config convert.svn.startrev=0 (svn revision number)\n"
|
|
|
" specify start Subversion revision."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Perforce Source\n"
|
|
|
" '''''''''''''''"
|
|
|
msgstr ""
|
|
|
" Perforce-källa\n"
|
|
|
" ''''''''''''''"
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" It is possible to limit the amount of source history to be\n"
|
|
|
" converted by specifying an initial Perforce revision."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" --config convert.p4.startrev=0 (perforce changelist number)\n"
|
|
|
" specify initial Perforce revision."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Mercurial Destination\n"
|
|
|
" '''''''''''''''''''''"
|
|
|
msgstr ""
|
|
|
" Mercurial-destination\n"
|
|
|
" '''''''''''''''''''''"
|
|
|
|
|
|
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"
|
|
|
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."
|
|
|
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"
|
|
|
" dates."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "username mapping filename (DEPRECATED, use --authormap instead)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source repository type"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "destination repository type"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "import up to target revision REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "remap usernames using this file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "remap file names using contents of file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "splice synthesized history into place"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "change branch names while converting"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "try to sort changesets by branches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "try to sort changesets by date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "preserve source changesets order"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "only return changes on specified branches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "prefix to remove from file names"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "only return changes after or between specified tags"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "update cvs log cache"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "create new cvs log cache"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "set commit time fuzz in seconds"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "specify cvsroot"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show parent changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show current changeset in ancestor branches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "ignored for compatibility"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debugcvsps [OPTION]... [PATH]..."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a Bazaar repository"
|
|
|
msgstr "%s verkar inte vara ett Bazaar-arkiv"
|
|
|
|
|
|
msgid "Bazaar modules could not be loaded"
|
|
|
msgstr "Bazaar-moduler kunde inte laddas"
|
|
|
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s is not a valid revision in current branch"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s is not available in %s anymore"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s.%s symlink has no target"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot find required \"%s\" tool"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s error:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "syntax error in %s(%d): key/value pair expected"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "could not open map file %r: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: invalid source repository type"
|
|
|
msgstr "%s: ogiltig typ för källarkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: missing or unsupported repository"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: invalid destination repository type"
|
|
|
msgstr "%s: ogiltig typ för destinationsarkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "convert: %s\n"
|
|
|
msgstr "convert: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: unknown repository type"
|
|
|
msgstr "%s: okänd arkivtyp"
|
|
|
|
|
|
msgid "getting files"
|
|
|
msgstr "hämtar filer"
|
|
|
|
|
|
msgid "revisions"
|
|
|
msgstr "revisioner"
|
|
|
|
|
|
msgid "scanning"
|
|
|
msgstr "skannar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown sort mode: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cycle detected between %s and %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "not all revisions were sorted"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Writing author map file %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Ignoring bad line in author map file %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "mapping author %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "overriding mapping for author %s, was %s, will be %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "spliced in %s as parents of %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "scanning source...\n"
|
|
|
msgstr "skannar källa...\n"
|
|
|
|
|
|
msgid "sorting...\n"
|
|
|
msgstr "sorterar...\n"
|
|
|
|
|
|
msgid "converting...\n"
|
|
|
msgstr "konverterar...\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "source: %s\n"
|
|
|
msgstr "källa: %s\n"
|
|
|
|
|
|
msgid "converting"
|
|
|
msgstr "konverterar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "assuming destination %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "more than one sort mode specified"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "--sourcesort is not supported by this data source"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a CVS checkout"
|
|
|
msgstr "%s verkar inte vara en CVS-uthämtning"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %s is not a patchset number"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "connecting to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "CVS pserver authentication failed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d bytes missing from remote file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "malformed response from CVS"
|
|
|
msgstr "förvrängt svar från CVS"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cvs server: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown CVS response: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "collecting CVS rlog\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "not a CVS sandbox"
|
|
|
msgstr "inte en CVS-sandlåda"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "reading cvs log cache %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cache has %d log entries\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error reading cache: %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "running %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "RCS file must be followed by working file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "must have at least some revisions"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "expected revision number"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "revision must be followed by date line"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "log cache overlaps with new log entries, re-run without cache."
|
|
|
msgstr "loggcache överlappar med nya loggningar, kör igen utan cache."
|
|
|
|
|
|
#, python-format
|
|
|
msgid "writing cvs log cache %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d log entries\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "creating changesets\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "synthetic changeset cannot have multiple parents"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"warning: CVS commit message references non-existent branch %r:\n"
|
|
|
"%s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d changeset entries\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a darcs repository"
|
|
|
msgstr "%s verkar inte vara ett darcs-arkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "darcs version 2.1 or newer needed (found %r)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Python ElementTree module is not available"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s repository format is unsupported, please upgrade"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "failed to detect repository format!"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "internal calling inconsistency"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "errors in filemap"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s:%d: path to %s is missing\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s:%d: %r already in %s list\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s:%d: superfluous / in %s %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s:%d: unknown directive %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source repository doesn't support --filemap"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a Git repository"
|
|
|
msgstr "%s verkar inte vara ett Git-arkiv"
|
|
|
|
|
|
msgid "cannot retrieve git heads"
|
|
|
msgstr "kan inte hämta git-huvuden"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot read %r object at %s"
|
|
|
msgstr "kan inte läsa %r-objekt som %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot read changes in %s"
|
|
|
msgstr "kan inte läsa ändringar i %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot read tags from %s"
|
|
|
msgstr "kan inte läsa märken från %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a GNU Arch repository"
|
|
|
msgstr "%s verkar inte vara ett GNU Arch-arkiv"
|
|
|
|
|
|
msgid "cannot find a GNU Arch tool"
|
|
|
msgstr "kan inte hitta ett GNU Arch-verktyg"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "analyzing tree version %s...\n"
|
|
|
msgstr "analyserar trädversion %s...\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"tree analysis stopped because it points to an unregistered archive %s...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "could not parse cat-log of %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s is not a local Mercurial repository"
|
|
|
msgstr "%s är inte ett lokalt Mercurial-arkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "initializing destination %s repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "could not create hg repository %s as sink"
|
|
|
msgstr "kunde inte skapa hg-arkiv %s för lagring"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "pulling from %s into %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "filtering out empty revision\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "updating tags\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s is not a valid start revision"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a monotone repository"
|
|
|
msgstr "%s verkar inte vara ett monotone-arkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copying file in renamed directory from '%s' to '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a P4 repository"
|
|
|
msgstr "%s verkar inte vara ett P4-arkiv"
|
|
|
|
|
|
msgid "reading p4 views\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "collecting p4 changelists\n"
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not look like a Subversion repository"
|
|
|
msgstr "%s verkar inte vara ett Subversion-arkiv"
|
|
|
|
|
|
msgid "Subversion python bindings could not be loaded"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Subversion python bindings %d.%d found, 1.4 or later required"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Subversion python bindings are too old, 1.4 or later required"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "svn: revision %s is not an integer"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "svn: start revision %s is not an integer"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no revision found in module %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "expected %s to be at %r, but not found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "found %s at %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring empty branch %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "found branch %s at %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "svn: start revision is not supported with more than one branch"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "svn: no revision found after start revision %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not found up to revision %d"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "scanning paths"
|
|
|
msgstr "skannar sökvägar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "found parent of branch %s at %d: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "fetching revision log for \"%s\" from %d to %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "svn: branch has no revision %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "initializing svn repository %r\n"
|
|
|
msgstr "initialiserar svn-arkivet %r\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "initializing svn working copy %r\n"
|
|
|
msgstr "initialiserar svn-arbetskopia %r\n"
|
|
|
|
|
|
msgid "unexpected svn output:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unable to cope with svn output"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "writing Subversion tags is not yet implemented\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "automatically manage newlines in repository files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"This extension allows you to manage the type of line endings (CRLF or\n"
|
|
|
"LF) that are used in the repository and in the local working\n"
|
|
|
"directory. That way you can get CRLF line endings on Windows and LF on\n"
|
|
|
"Unix/Mac, thereby letting everybody use their OS native line endings."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The extension reads its configuration from a versioned ``.hgeol``\n"
|
|
|
"configuration file every time you run an ``hg`` command. The\n"
|
|
|
"``.hgeol`` file use the same syntax as all other Mercurial\n"
|
|
|
"configuration files. It uses two sections, ``[patterns]`` and\n"
|
|
|
"``[repository]``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The ``[patterns]`` section specifies the line endings used in the\n"
|
|
|
"working directory. The format is specified by a file pattern. The\n"
|
|
|
"first match is used, so put more specific patterns first. The\n"
|
|
|
"available line endings are ``LF``, ``CRLF``, and ``BIN``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Files with the declared format of ``CRLF`` or ``LF`` are always\n"
|
|
|
"checked out in that format and files declared to be binary (``BIN``)\n"
|
|
|
"are left unchanged. Additionally, ``native`` is an alias for the\n"
|
|
|
"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n"
|
|
|
"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n"
|
|
|
"endings) is Mercurial's default behaviour; it is only needed if you\n"
|
|
|
"need to override a later, more general pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The optional ``[repository]`` section specifies the line endings to\n"
|
|
|
"use for files stored in the repository. It has a single setting,\n"
|
|
|
"``native``, which determines the storage line endings for files\n"
|
|
|
"declared as ``native`` in the ``[patterns]`` section. It can be set to\n"
|
|
|
"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n"
|
|
|
"that on Windows, files configured as ``native`` (``CRLF`` by default)\n"
|
|
|
"will be converted to ``LF`` when stored in the repository. Files\n"
|
|
|
"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n"
|
|
|
"are always stored as-is in the repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Example versioned ``.hgeol`` file::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [patterns]\n"
|
|
|
" **.py = native\n"
|
|
|
" **.vcproj = CRLF\n"
|
|
|
" **.txt = native\n"
|
|
|
" Makefile = LF\n"
|
|
|
" **.jpg = BIN"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [repository]\n"
|
|
|
" native = LF"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The extension uses an optional ``[eol]`` section in your hgrc file\n"
|
|
|
"(not the ``.hgeol`` file) for settings that control the overall\n"
|
|
|
"behavior. There are two settings:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
|
|
|
" ``CRLF`` to override the default interpretation of ``native`` for\n"
|
|
|
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
|
|
|
" generate an archive where files have line endings for Windows."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- ``eol.only-consistent`` (default True) can be set to False to make\n"
|
|
|
" the extension convert files with inconsistent EOLs. Inconsistent\n"
|
|
|
" means that there is both ``CRLF`` and ``LF`` present in the file.\n"
|
|
|
" Such files are normally not touched under the assumption that they\n"
|
|
|
" have mixed EOLs on purpose."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"See :hg:`help patterns` for more information about the glob patterns\n"
|
|
|
"used.\n"
|
|
|
msgstr ""
|
|
|
"Se :hg:`help patterns` för mer information om de använda glob-mönstren.\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s should not have CRLF line endings"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s should not have LF line endings"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "the eol extension is incompatible with the win32text extension"
|
|
|
msgstr "eol-utökningen är inkompativel med win32text-utökningen"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring unknown EOL style '%s' from %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inconsistent newline style in %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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. ::"
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # add new command called vdiff, runs kdiff3\n"
|
|
|
" vdiff = kdiff3"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" # add new command called meld, runs meld (no need to name twice)\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)'"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Tool arguments can include variables that are expanded at runtime::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" $parent1, $plabel1 - filename, descriptive label of first parent\n"
|
|
|
" $child, $clabel - filename, descriptive label of child revision\n"
|
|
|
" $parent2, $plabel2 - filename, descriptive label of second parent\n"
|
|
|
" $parent is an alias for $parent1."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The extdiff extension will look in your [diff-tools] and [merge-tools]\n"
|
|
|
"sections for diff tool arguments, when none are specified in [extdiff]."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [extdiff]\n"
|
|
|
" kdiff3 ="
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [diff-tools]\n"
|
|
|
" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You can use -I/-X and list of file or directory names like normal\n"
|
|
|
":hg:`diff` command. The extdiff extension makes snapshots of only\n"
|
|
|
"needed files, so running the external diff program will actually be\n"
|
|
|
"pretty fast (at least faster than having to compare the entire tree).\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "making snapshot of %d files from rev %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "making snapshot of %d files from working directory\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot specify --rev and --change at the same time"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cleaning up temp directory\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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\"."
|
|
|
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."
|
|
|
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"
|
|
|
" revisions are specified, the working directory files are compared\n"
|
|
|
" to its parent."
|
|
|
msgstr ""
|
|
|
" När två revisionsargument ges, kommer ändringar mellan revisionerna\n"
|
|
|
" att visas. Om bara en revision anges så jämförs den revisionen med\n"
|
|
|
" arbetskatalogen, och, när ingen revision anges, jämförs arbetskatalogen\n"
|
|
|
" med dess förälder."
|
|
|
|
|
|
msgid "CMD"
|
|
|
msgstr "KMD"
|
|
|
|
|
|
msgid "comparison program to run"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "OPT"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pass option to comparison program"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "change made by revision"
|
|
|
msgstr "ändring gjord av revision"
|
|
|
|
|
|
msgid "hg extdiff [OPT]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg %s [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pull, update and merge in one command"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
|
|
|
msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid ""
|
|
|
"working dir not at branch tip (use \"hg update\" to check out branch tip)"
|
|
|
msgstr ""
|
|
|
"arbetskatalogen är inte på grentoppen (använd \"hg update\" för att hämta ut "
|
|
|
"grentoppen)"
|
|
|
|
|
|
msgid "outstanding uncommitted merge"
|
|
|
msgstr "kvarvarande oarkiverad sammanfogning"
|
|
|
|
|
|
msgid "outstanding uncommitted changes"
|
|
|
msgstr "kvarvarande oarkiverade ändringar"
|
|
|
|
|
|
msgid "working directory is missing some files"
|
|
|
msgstr "arbetskatalogen saknar några filer"
|
|
|
|
|
|
msgid ""
|
|
|
"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
|
|
|
msgstr ""
|
|
|
"flera huvuden i denna gren (använd \"hg heads .\" och \"hg merge\" för att "
|
|
|
"sammanfoga)"
|
|
|
|
|
|
#, 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 ""
|
|
|
"Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
|
|
|
"anges."
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
|
|
|
"\" to merge them)\n"
|
|
|
msgstr ""
|
|
|
"sammanfogar inte med %d andra nya grenhuvuden (använd \"hg heads .\" och "
|
|
|
"\"hg merge\" för att sammanfoga dem)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "updating to %d:%s\n"
|
|
|
msgstr "uppdaterar till %d:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging with %d:%s\n"
|
|
|
msgstr "sammanfogar med %d:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "new changeset %d:%s merges remote changes with local\n"
|
|
|
msgstr "nya ändringen %d:%s sammanfogar fjärrändringar med lokala\n"
|
|
|
|
|
|
msgid "a specific revision you would like to pull"
|
|
|
msgstr "en specifik revision som du vill dra"
|
|
|
|
|
|
msgid "edit commit message"
|
|
|
msgstr "redigera arkiveringsmeddelande"
|
|
|
|
|
|
msgid "edit commit message (DEPRECATED)"
|
|
|
msgstr "redigera arkiveringsmeddelande (FÖRÅLDRAD)"
|
|
|
|
|
|
msgid "switch parents when merging"
|
|
|
msgstr "byt föräldrar vid sammanfogning"
|
|
|
|
|
|
msgid "hg fetch [SOURCE]"
|
|
|
msgstr "hg fetch [KÄLLA]"
|
|
|
|
|
|
msgid "commands to sign and verify changesets"
|
|
|
msgstr "kommandon för att signera och verifiera ändringar"
|
|
|
|
|
|
msgid "error while verifying signature"
|
|
|
msgstr "fel vid verifiering av signatur"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s Bad signature from \"%s\"\n"
|
|
|
msgstr "%s Dålig signatur från \"%s\"\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
|
|
|
msgstr "%s Notera: Signaturen har gått ut (signerad av: \"%s\")\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
|
|
|
msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n"
|
|
|
|
|
|
msgid "list signed changesets"
|
|
|
msgstr "visa signerade ändringar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s:%d node does not exist\n"
|
|
|
msgstr "%s:%d noden existerar inte\n"
|
|
|
|
|
|
msgid "verify all the signatures there may be for a particular revision"
|
|
|
msgstr "verifiera alla signaturerna som finns för en viss revision"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "No valid signature for %s\n"
|
|
|
msgstr "Ingen giltig signatur för %s\n"
|
|
|
|
|
|
msgid "add a signature for the current or given revision"
|
|
|
msgstr "lägg till en signatur för den aktuella eller angivna revisionen"
|
|
|
|
|
|
msgid ""
|
|
|
" If no revision is given, the parent of the working directory is used,\n"
|
|
|
" or tip if no revision is checked out."
|
|
|
msgstr ""
|
|
|
" Om ingen revision anges, så används arbetskatalogens föräldern, eller\n"
|
|
|
" toppen om ingen revision är uthämtad."
|
|
|
|
|
|
msgid ""
|
|
|
" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "uncommitted merge - please provide a specific revision"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Signing %d:%s\n"
|
|
|
msgstr "Signerar %d:%s\n"
|
|
|
|
|
|
msgid "error while signing"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
|
|
|
"force)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unknown signature version"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "make the signature local"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "sign even if the sigfile is modified"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "do not commit the sigfile after signing"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "ID"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "the key id to sign with"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "TEXT"
|
|
|
msgstr "TEXT"
|
|
|
|
|
|
msgid "commit message"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg sign [OPTION]... [REVISION]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg sigcheck REVISION"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg sigs"
|
|
|
msgstr ""
|
|
|
|
|
|
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 ""
|
|
|
"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"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "--graph option is incompatible with --%s"
|
|
|
msgstr "flaggan --graph är inkompatibel med --%s"
|
|
|
|
|
|
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."
|
|
|
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 ""
|
|
|
" Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "show the revision DAG"
|
|
|
msgstr "visa revisionsdiagram"
|
|
|
|
|
|
msgid "NUM"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "limit number of changes displayed"
|
|
|
msgstr "begränsa antalet visade ändringar"
|
|
|
|
|
|
msgid "show patch"
|
|
|
msgstr "visa patch"
|
|
|
|
|
|
msgid "show the specified revision or range"
|
|
|
msgstr "visa den specifika revisionen eller serien"
|
|
|
|
|
|
msgid "hg glog [OPTION]... [FILE]"
|
|
|
msgstr "hg glog [FLAGGA]... [FIL]"
|
|
|
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [cia]\n"
|
|
|
" # your registered CIA user name\n"
|
|
|
" user = foo\n"
|
|
|
" # the name of the project in CIA\n"
|
|
|
" project = foo\n"
|
|
|
" # the module (subproject) (optional)\n"
|
|
|
" #module = foo\n"
|
|
|
" # Append a diffstat to the log message (optional)\n"
|
|
|
" #diffstat = False\n"
|
|
|
" # Template to use for log messages (optional)\n"
|
|
|
" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
|
|
|
" # Style to use (optional)\n"
|
|
|
" #style = foo\n"
|
|
|
" # The URL of the CIA notification service (optional)\n"
|
|
|
" # You can use mailto: URLs to send by email, eg\n"
|
|
|
" # mailto:cia@cia.vc\n"
|
|
|
" # 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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [hooks]\n"
|
|
|
" # one of these:\n"
|
|
|
" changegroup.cia = python:hgcia.hook\n"
|
|
|
" #incoming.cia = python:hgcia.hook"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [web]\n"
|
|
|
" # If you want hyperlinks (optional)\n"
|
|
|
" baseurl = http://server/path/to/repo\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s returned an error: %s"
|
|
|
msgstr "%s returnerade ett fel: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hgcia: sending update to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email.from must be defined when sending by email"
|
|
|
msgstr ""
|
|
|
|
|
|
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.)"
|
|
|
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."
|
|
|
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 configuration file::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [hgk]\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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [hgk]\n"
|
|
|
" vdiff=vdiff"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Revisions context menu will now display additional entries to fire\n"
|
|
|
"vdiff on hovered and selected revisions.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "diff trees from two commits"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "output common ancestor information"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cat a specific revision"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cat-file: type or revision not supplied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "aborting hg cat-file only understands commits\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "parse given revisions"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print revisions"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print extension options"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "start interactive history viewer"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg view [-l LIMIT] [REVRANGE]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "generate patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "recursive"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pretty"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "stdin"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "detect copies"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "search"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debug-cat-file [OPTION]... TYPE FILE"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debug-config"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debug-merge-base REV REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "ignored"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debug-rev-parse REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "header"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "topo-order"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "parents"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "max-count"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg debug-rev-list [OPTION]... REV..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "syntax highlighting for hgweb (requires Pygments)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"It depends on the Pygments syntax highlighting library:\n"
|
|
|
"http://pygments.org/"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "There is a single configuration option::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [web]\n"
|
|
|
" pygments_style = <style>"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "The default is 'colorful'.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "accelerate status report using Linux's inotify service"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "start an inotify server for this repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "debugging information for inotify extension"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Prints the list of directories being watched by the inotify server.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "directories being watched:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "run server in background"
|
|
|
msgstr "kör servern i bakgrunden"
|
|
|
|
|
|
msgid "used internally by daemon mode"
|
|
|
msgstr "används internt av daemon-läget"
|
|
|
|
|
|
msgid "minutes to sit idle before exiting"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "name of file to write process ID to"
|
|
|
msgstr "filnamn att skriva process-ID till"
|
|
|
|
|
|
msgid "hg inserve [OPTION]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "inotify-client: found dead inotify server socket; removing it\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inotify-client: could not start inotify server: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inotify-client: could not talk to new inotify server: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inotify-client: failed to contact inotify server: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "inotify-client: received empty answer from inotify server"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(inotify: received response from incompatible server version %d)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(inotify: received '%s' response when expecting '%s')\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "this system does not seem to support inotify"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "*** the current per-user limit on the number of inotify watches is %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "*** this limit is too low to watch every directory in this repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "*** counting directories: "
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "found %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "*** to raise the limit from %d to %d (run as root):\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "*** echo %d > %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot watch %s until inotify watch limit is raised"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inotify service not available: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "watching %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "watching directories under %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s event: created %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s event: deleted %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s event: modified %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "filesystem containing %s was unmounted\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s readable: %d bytes\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s below threshold - unhooking\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s reading %d events\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hooking back up with %d bytes readable\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "finished setup\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "status: %r %s -> %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rescanning due to .hgignore change\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot start: socket is already bound"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
|
|
|
"inotify.sock already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "answering query for %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "received query from incompatible client version %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unrecognized query type: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"A few example patterns (link to bug tracking, etc.) that may be used\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"
|
|
|
" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "interhg: invalid pattern for %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "interhg: invalid regexp for %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Keywords expand to the changeset data pertaining to the latest change\n"
|
|
|
"relative to the working directory parent of each file."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
|
|
|
"sections of hgrc files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Example::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [keyword]\n"
|
|
|
" # expand keywords in every python file except those matching \"x*\"\n"
|
|
|
" **.py =\n"
|
|
|
" x* = ignore"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [keywordset]\n"
|
|
|
" # prefer svn- over cvs-like default keywordmaps\n"
|
|
|
" svn = True"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
".. note::\n"
|
|
|
" The more specific you are in your filename patterns the less you\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Three additional date template filters are provided::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" utcdate \"2006/09/18 15:13:13\"\n"
|
|
|
" svnutcdate \"2006-09-18 15:13:13Z\"\n"
|
|
|
" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
|
|
|
"replaced with customized keywords and templates. Again, run\n"
|
|
|
":hg:`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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To force expansion after enabling it, or a configuration change, run\n"
|
|
|
":hg:`kwexpand`."
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "overwriting %s expanding keywords\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "overwriting %s shrinking keywords\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[keyword] patterns cannot match"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no [keyword] patterns configured"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print [keywordmaps] configuration and an expansion example"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Show current, custom, or default keyword template maps and their\n"
|
|
|
" expansions."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Extend the current configuration by specifying maps as arguments\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 ""
|
|
|
" Se :hg:`help templates` för information om mallar och filter.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid "creating temporary repository at %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"\tconfiguration using custom keyword template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "\textending current template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "\toverriding default template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"\tconfiguration using default keyword template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "\tdisabling current template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"\tconfiguration using current keyword template maps\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"keywords written to %s:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg keyword configuration and expansion example"
|
|
|
msgstr "exempel på nyckelordskonfiguration och -expansion i hg"
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"\tkeywords expanded\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" List which files in the working directory are matched by the\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" See :hg:`help keyword` on how to construct patterns both for\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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" K = keyword expansion candidate\n"
|
|
|
" k = keyword expansion candidate (not tracked)\n"
|
|
|
" I = ignored\n"
|
|
|
" i = ignored (not tracked)\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
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`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" kwshrink refuses to run if given files contain local changes.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show default keyword template maps"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "read maps from rcfile"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg kwexpand [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show keyword status flags of all files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show files excluded from expansion"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "only show unknown (not tracked) files"
|
|
|
msgstr "visa bara okända (ospårade) filer"
|
|
|
|
|
|
msgid "hg kwfiles [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg kwshrink [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
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)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Known patches are represented as patch files in the .hg/patches\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" print patch series qseries\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"
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [mq]\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"
|
|
|
"regular patches, possibly losing data in the second case."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You will by default be managing a patch queue named \"patches\". You can\n"
|
|
|
"create other, independent patch queues with the :hg:`qqueue` command.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "mq.git option can be auto/keep/yes/no got %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s appears more than once in %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "guard cannot be an empty string"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "guard %r starts with invalid character: %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid character in guard %r: %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "guard %r too short"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "guard %r starts with invalid char"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "allowing %s - no guards in effect\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "allowing %s - no matching negative guards\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "allowing %s - guarded by %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping %s - guarded by %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping %s - no matching guards\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error removing undo: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "apply failed for patch %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch didn't work out, merging %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "update returned %d"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "repo commit failed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unable to read %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s does not exist\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s is not applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch failed, unable to continue (try -v)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "applying %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unable to read %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s is empty\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "repository commit failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch failed, rejects left in working dir\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "fuzz found when applying patch, stopping\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d is not managed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot delete revision %d above applied patches"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s finalized without changeset message\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "qdelete requires at least one revision or patch name"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot delete applied patch %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s not in series file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no patches applied"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "working directory revision is not qtip"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "local changes found, refresh first"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "local changes found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "\"%s\" cannot be used as the name of a patch"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "\"%s\" already exists as a directory"
|
|
|
msgstr "\"%s\" finns redan som katalog"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch \"%s\" already exists"
|
|
|
msgstr "patchen \"%s\" existerar redan"
|
|
|
|
|
|
msgid "cannot manage merge changesets"
|
|
|
msgstr "kan inte hantera sammanfogningar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot write patch \"%s\": %s"
|
|
|
msgstr "kan inte skriva patchen \"%s\": %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error unlinking %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch name \"%s\" is ambiguous:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s not in series"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "(working directory not at a head)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no patches in series\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot push to a previous patch: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "qpush: %s is already at the top\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "guarded by %r"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no matching guards"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot push '%s' - %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "all patches are currently applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch series already fully applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "please specify the patch to move"
|
|
|
msgstr "ange patchen som ska flyttas"
|
|
|
|
|
|
msgid "cleaning up working directory..."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "errors during apply, please fix and refresh %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "now at: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s is not applied"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no patches applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "qpop: %s is already at the top\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "qpop: forcing dirstate update\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "trying to pop unknown node %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "popping would remove a revision not managed by this patch queue"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "deletions found between repo revs"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "popping %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch queue now empty\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot refresh a revision with children"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"refresh interrupted while patch was popped! (revert --all, qpush to "
|
|
|
"recover)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch queue directory already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s is not in series file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "No saved patch data found\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "restoring status: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "save entry has children, leaving it alone\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "removing save entry %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "saved queue repository parents: %s %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "updating queue directory\n"
|
|
|
msgstr "uppdaterar kökatalog\n"
|
|
|
|
|
|
msgid "Unable to load queue repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "save: no patches applied, exiting\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "status is already saved\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg patches saved state"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "repo commit failed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s is already in the series file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "option \"-r\" not valid when importing files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "option \"-n\" not valid when importing multiple patches"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d is the root of more than one branch"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d is already managed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d is not the parent of the queue"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d has unmanaged children"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot import merge revision %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "revision %d is not the parent of %d"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "-e is incompatible with import from -"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch %s does not exist"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "renaming %s to %s\n"
|
|
|
msgstr "döper om %s till %s\n"
|
|
|
|
|
|
msgid "need --name to import a patch from -"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unable to read file %s"
|
|
|
msgstr "kan inte läsa filen %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "adding %s to series file\n"
|
|
|
msgstr "lägger till %s till seriefilen\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 :hg:`qfinish` command."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print the patches already applied"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Returns 0 on success."
|
|
|
msgstr " Returnerar 0 om kommandot lyckades."
|
|
|
|
|
|
msgid "only one patch applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print the patches not yet applied"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "all patches applied\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The patch will have the same name as its source file unless you\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With -f/--force, an existing patch of the same name will be\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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " To import an existing patch while renaming it::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " hg qimport -e existing-patch -n new-name"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if import succeeded.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om importeringen lyckades.\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."
|
|
|
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"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Source patch repository is looked for in <src>/.hg/patches by\n"
|
|
|
" default. Use -p <url> to change."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The patch directory must be a nested Mercurial repository, as\n"
|
|
|
" would be created by :hg:`init --mq`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Return 0 on success.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "versioned patch repository not found (see init --mq)"
|
|
|
msgstr "versionshanterat patcharkiv hittades inte (se init --mq)"
|
|
|
|
|
|
msgid "cloning main repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cloning patch repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "stripping applied patches from destination repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "updating destination repository\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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 ""
|
|
|
|
|
|
msgid "print the name of the current patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print the name of the next patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print the name of the previous patch"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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'."
|
|
|
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"
|
|
|
" information."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on successful creation of a new patch.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om en patch skapades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "update the current patch"
|
|
|
msgstr "uppdatera den nuvarande patchen"
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" If -e/--edit is specified, Mercurial will start your configured editor "
|
|
|
"for\n"
|
|
|
" you to enter a message. In case qrefresh fails, you will find a backup "
|
|
|
"of\n"
|
|
|
" your message in ``.hg/last-message.txt``."
|
|
|
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"
|
|
|
" git diff format."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
|
|
|
msgstr ""
|
|
|
|
|
|
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)."
|
|
|
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\n"
|
|
|
" made by the current patch without including changes made since the\n"
|
|
|
" qrefresh."
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The header for each folded patch will be concatenated with the\n"
|
|
|
" current patch header, separated by a line of ``* * *``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "qfold requires at least one patch name"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Skipping already folded patch %s\n"
|
|
|
msgstr "Hoppar över redan hopvikta patchen %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "qfold cannot fold already applied patch %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error folding patch %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "push or pop patches until named patch is at top of stack"
|
|
|
msgstr ""
|
|
|
|
|
|
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 :hg:`qselect` command has activated it. A patch with\n"
|
|
|
" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` "
|
|
|
"command\n"
|
|
|
" has activated it."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With no arguments, print the currently active guards.\n"
|
|
|
" With arguments, set guards for the named patch."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" .. note::\n"
|
|
|
" Specifying negative guards now requires '--'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " To set guards on another patch::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " hg qguard other.patch -- +2.6.17 -stable"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot mix -l/--list with options or arguments"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no patch to work with"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no patch named %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print the header of the topmost or specified patch"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Return 0 on succces.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "no saved queues found, please use -n\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging with queue at: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "using patch queue: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rename a patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With one argument, renames the current patch to PATCH1.\n"
|
|
|
" With two arguments, renames PATCH1 to PATCH2."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "A patch named %s already exists in the series file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "restore the queue state saved by a revision (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " This command is deprecated, use :hg:`rebase` instead."
|
|
|
msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället."
|
|
|
|
|
|
msgid "save current queue state (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "destination %s exists and is not a directory"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "destination %s exists, use -f to force"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copy %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "strip changesets and all their descendants from the repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The strip command removes the specified changesets and all their\n"
|
|
|
" descendants. If the working directory has uncommitted changes,\n"
|
|
|
" the operation is aborted unless the --force flag is supplied."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" If a parent of the working directory is stripped, then the working\n"
|
|
|
" directory will automatically be updated to the most recent\n"
|
|
|
" available ancestor of the stripped parent after the operation\n"
|
|
|
" completes."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
|
|
|
" bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
|
|
|
" be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n"
|
|
|
" where BUNDLE is the bundle file created by the strip. Note that\n"
|
|
|
" the local revision numbers will in general be different after the\n"
|
|
|
" restore."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Use the --no-backup option to discard the backup bundle once the\n"
|
|
|
" operation completes."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "empty revision set"
|
|
|
msgstr "tomt revisionsset"
|
|
|
|
|
|
msgid "set or print guarded patches to push"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Use the :hg:`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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" qguard foo.patch -stable (negative guard)\n"
|
|
|
" qguard bar.patch +stable (positive guard)\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)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With no arguments, prints the currently active guards.\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."
|
|
|
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."
|
|
|
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 ""
|
|
|
|
|
|
msgid "guards deactivated\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "number of guarded, applied patches has changed from %d to %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "guards in series file:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no guards in series file\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "active guards:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no active guards\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "popping guarded patches\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "reapplying unguarded patches\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no revisions specified"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "manage multiple patch queues"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Supports switching between different patch queues, as well as creating\n"
|
|
|
" new patch queues and deleting existing ones."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Omitting a queue name or specifying -l/--list will show you the "
|
|
|
"registered\n"
|
|
|
" queues - by default the \"normal\" patches queue is registered. The "
|
|
|
"currently\n"
|
|
|
" active queue will be marked with \"(active)\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" To create a new queue, use -c/--create. The queue is automatically made\n"
|
|
|
" active, except in the case where there are applied patches from the\n"
|
|
|
" currently active queue in the repository. Then the queue will only be\n"
|
|
|
" created and switching will fail."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" To delete an existing queue, use --delete. You cannot delete the "
|
|
|
"currently\n"
|
|
|
" active queue."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patches applied - cannot set new queue active"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot delete queue that does not exist"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot delete currently active queue"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (active)\n"
|
|
|
msgstr " (aktiv)\n"
|
|
|
|
|
|
msgid "invalid queue name, may not contain the characters \":\\/.\""
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "queue \"%s\" already exists"
|
|
|
msgstr "kön \"%s\" finns redan"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "can't rename \"%s\" to its current name"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "non-queue directory \"%s\" already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use --create to create a new queue"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot commit over an applied mq patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source has mq patches applied"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "mq status file refers to unknown node %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Tag %s overrides mq patch of the same name\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot import over an applied patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "only a local queue repository may be initialized"
|
|
|
msgstr "bara ett lokalt köarkiv kan initialiseras"
|
|
|
|
|
|
msgid "there is no Mercurial repository here (.hg not found)"
|
|
|
msgstr "det finns inget Mercurial-arkiv här (.hg hittades inte)"
|
|
|
|
|
|
msgid "no queue repository"
|
|
|
msgstr "inget köarkiv"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d applied"
|
|
|
msgstr "%d applicerade"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d unapplied"
|
|
|
msgstr "%d oapplicerade"
|
|
|
|
|
|
msgid "mq: (empty queue)\n"
|
|
|
msgstr "mq: (tom kö)\n"
|
|
|
|
|
|
msgid "operate on patch repository"
|
|
|
msgstr "arbeta med patcharkiv"
|
|
|
|
|
|
msgid "print first line of patch header"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show only the last patch"
|
|
|
msgstr "visa bara den sista patchen"
|
|
|
|
|
|
msgid "hg qapplied [-1] [-s] [PATCH]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use pull protocol to copy metadata"
|
|
|
msgstr "använd pull-protokollet för att kopiera metadata"
|
|
|
|
|
|
msgid "do not update the new working directories"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use uncompressed transfer (fast over LAN)"
|
|
|
msgstr "använd okomprimerad överföring (snabbt över LAN)"
|
|
|
|
|
|
msgid "REPO"
|
|
|
msgstr "ARKIV"
|
|
|
|
|
|
msgid "location of source patch repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qclone [OPTION]... SOURCE [DEST]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qcommit [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qdiff [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "keep patch file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "stop managing a revision (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qdelete [-k] [PATCH]..."
|
|
|
msgstr "hg qdelete [-k] [PATCH]..."
|
|
|
|
|
|
msgid "edit patch header"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "keep folded patch files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "overwrite any local changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qgoto [OPTION]... PATCH"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "list all patches and guards"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "drop all guards"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qheader [PATCH]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "import file in patch directory"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "name of patch file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "overwrite existing files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "place existing revisions under mq control"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use git extended diff format"
|
|
|
msgstr "använd gits utökade diff-format"
|
|
|
|
|
|
msgid "qpush after importing"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "create queue repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qinit [-c]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "import uncommitted changes (DEPRECATED)"
|
|
|
msgstr "importera icke arkiverade ändringar (FÖRLEGAD)"
|
|
|
|
|
|
msgid "add \"From: <current user>\" to patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "USER"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add \"From: <USER>\" to patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add \"Date: <current date>\" to patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add \"Date: <DATE>\" to patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
|
|
|
msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..."
|
|
|
|
|
|
msgid "hg qnext [-s]"
|
|
|
msgstr "hg qnext [-s]"
|
|
|
|
|
|
msgid "hg qprev [-s]"
|
|
|
msgstr "hg qprev [-s]"
|
|
|
|
|
|
msgid "pop all patches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "queue name to pop (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "forget any local changes to patched files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
|
|
|
msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
|
|
|
|
|
|
msgid "apply on top of local changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "list patch name in commit text"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "apply all patches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "merge from another queue (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "merge queue name (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "reorder patch series and apply only the patch"
|
|
|
msgstr "omordna patchserien och applicera bara patchen"
|
|
|
|
|
|
msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
|
|
|
msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
|
|
|
|
|
|
msgid "refresh only files already in the patch and specified files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add/update author field in patch with current user"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add/update author field in patch with given user"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add/update date field in patch with current date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add/update date field in patch with given date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qrename PATCH1 [PATCH2]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "delete save entry"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "update queue working directory"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qrestore [-d] [-u] REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "copy patch directory"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "copy directory name"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "clear queue status file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "force copy"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "disable all guards"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "list all guards in series file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pop to before first guarded applied patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pop, then reapply patches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qselect [OPTION]... [GUARD]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print patches not in series"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qseries [-ms]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"force removal of changesets even if the working directory has uncommitted "
|
|
|
"changes"
|
|
|
msgstr ""
|
|
|
"tvinga borttagning av ändringar även om arbetskatalogen har oarkiverade "
|
|
|
"ändringar"
|
|
|
|
|
|
msgid ""
|
|
|
"bundle only changesets with local revision number greater than REV which are "
|
|
|
"not descendants of REV (DEPRECATED)"
|
|
|
msgstr ""
|
|
|
"bunta bara ändringar med lokala revisionsnummer större än REV som inte är "
|
|
|
"ättling till REV (FÖRLEGAD)"
|
|
|
|
|
|
msgid "no backups"
|
|
|
msgstr "inga säkerhetskopior"
|
|
|
|
|
|
msgid "no backups (DEPRECATED)"
|
|
|
msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
|
|
|
|
|
|
msgid "do not modify working copy during strip"
|
|
|
msgstr "modifiera inte arbetskopian vid strippning"
|
|
|
|
|
|
msgid "hg strip [-k] [-f] [-n] REV..."
|
|
|
msgstr "hg strip [-k] [-f] [-n] REV..."
|
|
|
|
|
|
msgid "hg qtop [-s]"
|
|
|
msgstr "hg qtop [-s]"
|
|
|
|
|
|
msgid "show only the first patch"
|
|
|
msgstr "visa bara den första patchen"
|
|
|
|
|
|
msgid "hg qunapplied [-1] [-s] [PATCH]"
|
|
|
msgstr "hg qunapplied [-1] [-s] [PATCH]"
|
|
|
|
|
|
msgid "finish all applied changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qfinish [-a] [REV]..."
|
|
|
msgstr "hg qfinish [-a] [REV]..."
|
|
|
|
|
|
msgid "list all available queues"
|
|
|
msgstr "visa alla tillgängliga köer"
|
|
|
|
|
|
msgid "create new queue"
|
|
|
msgstr "skapa ny kö"
|
|
|
|
|
|
msgid "rename active queue"
|
|
|
msgstr "döp om aktiv kö"
|
|
|
|
|
|
msgid "delete reference to queue"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "delete queue, and remove patch dir"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[OPTION] [QUEUE]"
|
|
|
msgstr "[FLAGGA] [KÖ]"
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To use, configure the notify extension and enable it in hgrc like\n"
|
|
|
"this::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [notify]\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"
|
|
|
" style = ... # style file to use when formatting email\n"
|
|
|
" template = ... # template to use when formatting email\n"
|
|
|
" incoming = ... # template to use when run as incoming hook\n"
|
|
|
" changegroup = ... # template when run as changegroup hook\n"
|
|
|
" 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"
|
|
|
" # (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"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [usersubs]\n"
|
|
|
" # key is subscriber email, value is \",\"-separated list of glob patterns\n"
|
|
|
" user@host = pattern"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [reposubs]\n"
|
|
|
" # key is glob pattern, value is \",\"-separated list of subscriber emails\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 ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: %d new changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "notify: sending %d subscribers %d changes\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "To set the pager that should be used, set the application variable::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [pager]\n"
|
|
|
" pager = less -FRSX"
|
|
|
msgstr ""
|
|
|
" [pager]\n"
|
|
|
" pager = less -FRSX"
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
|
|
|
"setting::"
|
|
|
msgstr ""
|
|
|
"Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n"
|
|
|
"genom att sätta::"
|
|
|
|
|
|
msgid ""
|
|
|
" [pager]\n"
|
|
|
" quiet = True"
|
|
|
msgstr ""
|
|
|
" [pager]\n"
|
|
|
" quiet = True"
|
|
|
|
|
|
msgid ""
|
|
|
"You can disable the pager for certain commands by adding them to the\n"
|
|
|
"pager.ignore list::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [pager]\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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [pager]\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."
|
|
|
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\n"
|
|
|
"to specify them in your user configuration file."
|
|
|
msgstr ""
|
|
|
"För att ignorera globala kommandon som :hg:`version` eller :hg:`help`, så\n"
|
|
|
"måste du ange dem i din användarkonfigurationsfil."
|
|
|
|
|
|
msgid ""
|
|
|
"The --pager=... option can also be used to control when the pager is\n"
|
|
|
"used. Use a boolean value like yes, no, on, off, or use auto for\n"
|
|
|
"normal behavior.\n"
|
|
|
msgstr ""
|
|
|
"Flaggan --pager=... kan också användas för att kontrollera när pagineraren\n"
|
|
|
"används. Använd ett booleskt värde som yes, no, on off, eller använd auto\n"
|
|
|
"för normalt uppförande.\n"
|
|
|
|
|
|
msgid "when to paginate (boolean, always, auto, or never)"
|
|
|
msgstr "när paginering ska ske (boolean, always, auto eller never)"
|
|
|
|
|
|
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."
|
|
|
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"
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"The series is started off with a \"[PATCH 0 of N]\" introduction, which\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:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- The changeset description.\n"
|
|
|
"- [Optional] The result of running diffstat on the patch.\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To configure other defaults, add a section like this to your hgrc\n"
|
|
|
"file::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [email]\n"
|
|
|
" from = My Name <my@email>\n"
|
|
|
" to = recipient1, recipient2, ...\n"
|
|
|
" cc = cc1, cc2, ...\n"
|
|
|
" bcc = bcc1, bcc2, ...\n"
|
|
|
" reply-to = address1, address2, ..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Use ``[patchbomb]`` as configuration section name if you need to\n"
|
|
|
"override global ``[email]`` address settings."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Then you can use the :hg:`email` command to mail a series of\n"
|
|
|
"changesets as a patchbomb."
|
|
|
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"
|
|
|
"directly from the commandline. See the [email] and [smtp] sections in\n"
|
|
|
"hgrc(5) for details.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s Please enter a valid value"
|
|
|
msgstr "%s Ange ett giltigt värde"
|
|
|
|
|
|
msgid "Please enter a valid value.\n"
|
|
|
msgstr "Ange ett giltigt värde.\n"
|
|
|
|
|
|
msgid "send changesets by email"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" By default, diffs are sent in the format generated by\n"
|
|
|
" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
|
|
|
" of 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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With the -d/--diffstat option, if the diffstat program is\n"
|
|
|
" installed, the result of running diffstat on the patch is inserted."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Finally, the patch itself, as generated by :hg:`export`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
|
|
|
" with a final summary of all messages and asked for confirmation before\n"
|
|
|
" the messages are sent."
|
|
|
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."
|
|
|
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)"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With -m/--mbox, instead of previewing each patchbomb message in a\n"
|
|
|
" pager or sending the messages directly, it will create a UNIX\n"
|
|
|
" mailbox file with the patch emails. This mailbox file can be\n"
|
|
|
" previewed with any mail user agent which supports UNIX mbox\n"
|
|
|
" files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With -n/--test, all steps will run, but mail will not be sent.\n"
|
|
|
" You will be prompted for an email recipient address, a subject and\n"
|
|
|
" an introductory message describing the patches of your patchbomb.\n"
|
|
|
" Then when all is done, patchbomb messages are displayed. If the\n"
|
|
|
" PAGER environment variable is set, your pager will be fired up once\n"
|
|
|
" for each patchbomb message, so you can verify everything is alright."
|
|
|
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)"
|
|
|
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"
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" hg email -o -m mbox && # generate an mbox file...\n"
|
|
|
" mutt -R -f mbox # ... and view it with mutt\n"
|
|
|
" hg email -o -m mbox && # generate an mbox file ...\n"
|
|
|
" formail -s sendmail \\ # ... and use formail to send from the "
|
|
|
"mbox\n"
|
|
|
" -bm -t < mbox # ... using sendmail"
|
|
|
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"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no changes found\n"
|
|
|
msgstr "inga ändringar hittades\n"
|
|
|
|
|
|
msgid "specify at least one changeset with -r or -o"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "too many destinations"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use only one form to specify the revision"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"Write the introductory message for the patch series."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "This patch series consists of %d patches."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"Final summary:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "are you sure you want to send (yn)?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&No"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Yes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patchbomb canceled"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Displaying "
|
|
|
msgstr "Visar "
|
|
|
|
|
|
msgid "Writing "
|
|
|
msgstr "Skriver "
|
|
|
|
|
|
msgid "writing"
|
|
|
msgstr "skriver"
|
|
|
|
|
|
msgid "Sending "
|
|
|
msgstr "Sänder "
|
|
|
|
|
|
msgid "sending"
|
|
|
msgstr "sänder"
|
|
|
|
|
|
msgid "send patches as attachments"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "send patches as inline attachments"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email addresses of blind carbon copy recipients"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email addresses of copy recipients"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "ask for confirmation before sending"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add diffstat output to messages"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use the given date as the sending date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use the given file as the series description"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email address of sender"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print messages that would be sent"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "write messages to mbox file instead of sending them"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email addresses replies should be sent to"
|
|
|
msgstr "emailadresser som svar ska skickas till"
|
|
|
|
|
|
msgid "subject of first message (intro or single patch)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "message identifier to reply to"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "flags to add in subject prefixes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "email addresses of recipients"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "omit hg patch header"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "send changes not found in the target repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "send changes not in target as a binary bundle"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "name of the bundle attachment file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "a revision to send"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "run even when remote repository is unrelated (with -b/--bundle)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "send an introduction email for a single patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg email [OPTION]... [DEST]..."
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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"
|
|
|
" format = topic bar number # format of the progress bar\n"
|
|
|
" width = <none> # if set, the maximum width of the progress information\n"
|
|
|
" # (that is, min(width, term width) will be used)\n"
|
|
|
" 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"
|
|
|
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"
|
|
|
"num characters, or ``+<num>`` for the first num characters.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "command to delete untracked files from the working directory"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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"
|
|
|
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`)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" If directories are given on the command line, only files in these\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"
|
|
|
" option.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s cannot be removed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Removing file %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Removing directory %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "abort if an error occurs"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "purge ignored files too"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "print filenames instead of deleting them"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg purge [OPTION]... [DIR]..."
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"For more information:\n"
|
|
|
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" You should not rebase changesets that have already been shared\n"
|
|
|
" with others. Doing so will force everybody else to perform the\n"
|
|
|
" same rebase or they will end up with duplicated changesets after\n"
|
|
|
" pulling in your rebased changesets."
|
|
|
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.)"
|
|
|
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"
|
|
|
" branch\"). If you specify source (``-s/--source``), rebase will\n"
|
|
|
" rebase that changeset and all of its descendants onto dest. If you\n"
|
|
|
" specify base (``-b/--base``), rebase will select ancestors of base\n"
|
|
|
" back to but not including the common ancestor with dest. Thus,\n"
|
|
|
" ``-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."
|
|
|
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."
|
|
|
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)."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if nothing to rebase.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot use both abort and continue"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot use collapse with continue or abort"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot use detach with continue or abort"
|
|
|
msgstr "kan inte använda detach med continue eller abort"
|
|
|
|
|
|
msgid "abort and continue do not allow specifying revisions"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot specify both a revision and a base"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "detach requires a revision to be specified"
|
|
|
msgstr "detach kräver att en revision anges"
|
|
|
|
|
|
msgid "cannot specify a base with detach"
|
|
|
msgstr "kan inte ange en bas med detach"
|
|
|
|
|
|
msgid "nothing to rebase\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot use both keepbranches and extrafn"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rebasing"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "changesets"
|
|
|
msgstr "ändringar"
|
|
|
|
|
|
msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
|
|
|
msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no changes, revision %d skipped\n"
|
|
|
msgstr "inga ändringar, revision %d hoppas över\n"
|
|
|
|
|
|
msgid "rebase merging completed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "warning: new changesets detected on source branch, not stripping\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rebase completed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d revisions have been skipped\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unable to collapse, there is more than one external parent"
|
|
|
msgstr "kan inte kollapsa, det finns mer än en extern förälder"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot use revision %d as base, result would have 3 parents"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no rebase in progress"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "warning: new changesets detected on target branch, can't abort\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rebase aborted\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot rebase onto an applied mq patch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source is ancestor of destination"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source is descendant of destination"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rebase working directory to branch head"
|
|
|
msgstr ""
|
|
|
|
|
|
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)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rebase onto the specified changeset"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "collapse the rebased changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "keep original changesets"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "keep original branch names"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "force detaching of source from its original branch"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "continue an interrupted rebase"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "abort an interrupted rebase"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
|
|
|
"hg rebase {-a|-c}"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "commands to interactively select changes for commit/qrefresh"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "this modifies a binary file (all or nothing)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "this is a binary file\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d hunks, %d lines changed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[Ynsfdaq?]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Yes, record this change"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&No, skip this change"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Skip remaining changes to this file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Record remaining changes to this &file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Done, skip remaining changes and files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Record &all changes to all remaining files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Quit, recording no changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "user quit"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "examine changes to %s?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " and "
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "record this change to %r?"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "record change %d/%d to %r?"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Om filer inte anges, kommer alla ändringar som :hg:`status`\n"
|
|
|
" rapporterar att arkiveras."
|
|
|
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" y - record this change\n"
|
|
|
" n - skip this change"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" s - skip remaining changes to this file\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " ? - display help"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " This command is not available when committing a merge."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "'mq' extension not loaded"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "running non-interactively, use commit instead"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot partially commit a merge (use hg commit instead)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no changes to record\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg record [OPTION]... [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "recreates hardlinks between repository clones"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" This command lets you recreate those hardlinks and reclaim that\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]."
|
|
|
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"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hardlinks are not supported on this system"
|
|
|
msgstr "hårda länkar stöds inte av detta system"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "relinking %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tip has %d files, estimated total number of files: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "collecting"
|
|
|
msgstr "samlar in"
|
|
|
|
|
|
msgid "files"
|
|
|
msgstr "filer"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "collected %d candidate storage files\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "source and destination are on different devices"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not linkable: %s\n"
|
|
|
msgstr "inte länkbar: %s\n"
|
|
|
|
|
|
msgid "pruning"
|
|
|
msgstr "putsar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "pruned down to %d probably relinkable files\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "relinking"
|
|
|
msgstr "länkar om"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "relinked %d files (%d bytes reclaimed)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[ORIGIN]"
|
|
|
msgstr ""
|
|
|
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [schemes]\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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [schemes]\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."
|
|
|
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/"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You can override a predefined scheme by defining a new scheme with the\n"
|
|
|
"same name.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "share a common history between several working directories"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "create a new shared repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Initialize a new repository and working directory that shares its\n"
|
|
|
" history with another repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" .. note::\n"
|
|
|
" using rollback or extensions that destroy/modify history (mq,\n"
|
|
|
" rebase, etc.) can cause considerable confusion with shared\n"
|
|
|
" clones. In particular, if two shared clones are both updated to\n"
|
|
|
" the same changeset, and one of them destroys that changeset\n"
|
|
|
" with rollback, the other clone will suddenly stop working: all\n"
|
|
|
" operations will fail with \"abort: working directory has unknown\n"
|
|
|
" parent\". The only known workaround is to use debugsetparents on\n"
|
|
|
" the broken clone to reset it to a changeset that still exists\n"
|
|
|
" (e.g. tip).\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "do not create a working copy"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[-U] SOURCE [DEST]"
|
|
|
msgstr ""
|
|
|
|
|
|
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 ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping already applied revision %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping merge changeset %s:%s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s merged at %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s transplanted to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "filtering %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "filter failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "can only omit patchfile if merging"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: empty changeset"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "fix up the merge and run hg transplant --continue"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s transplanted as %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "transplant log file is corrupt"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "working dir not at transplant parent %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "commit failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"y: transplant this changeset\n"
|
|
|
"n: skip this changeset\n"
|
|
|
"m: merge at this changeset\n"
|
|
|
"p: show patch\n"
|
|
|
"c: commit selected changesets\n"
|
|
|
"q: cancel transplant\n"
|
|
|
"?: show this help\n"
|
|
|
msgstr ""
|
|
|
"y: transplantera denna ändring\n"
|
|
|
"n: hoppa över denna ändring\n"
|
|
|
"m: sammanfoga vid denna ändring\n"
|
|
|
"p: visa patch\n"
|
|
|
"c: arkivera valda ändringar\n"
|
|
|
"q: avbryt transplantation\n"
|
|
|
"?: visa denna hjälp\n"
|
|
|
|
|
|
msgid "apply changeset? [ynmpcq?]:"
|
|
|
msgstr "applicera ändring? [ynmpcq?]:"
|
|
|
|
|
|
msgid "no such option\n"
|
|
|
msgstr "inget sådant alternativ\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::"
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" :hg:`transplant --branch REVISION --all` will rebase the selected\n"
|
|
|
" branch (up to the named revision) onto your current working\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" If no merges or revisions are provided, :hg:`transplant` will\n"
|
|
|
" start 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"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "--continue is incompatible with branch, all or merge"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no source URL, branch tag or revision list provided"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "--all requires a branch revision"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "--all is incompatible with a revision list"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no revision checked out"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "outstanding uncommitted merges"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "outstanding local changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``transplanted(set)``\n"
|
|
|
" Transplanted changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pull patches from REPO"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "BRANCH"
|
|
|
msgstr "GREN"
|
|
|
|
|
|
msgid "pull patches from branch BRANCH"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "pull all changesets up to BRANCH"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "skip over REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "merge at REV"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "append transplant info to log message"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "continue last transplant session after repair"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "filter changesets through command"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "hg transplant [-s REPO] [-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."
|
|
|
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."
|
|
|
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."
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [win32mbcs]\n"
|
|
|
" encoding = sjis"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "It is useful for the users who want to commit with UTF-8 log message.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "[win32mbcs] filename conversion failed with %s encoding\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[win32mbcs] cannot activate on this platform.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "perform automatic newline conversion"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Deprecation: The win32text extension requires each user to configure\n"
|
|
|
" the extension again and again for each clone since the configuration\n"
|
|
|
" is not copied when cloning."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" We have therefore made the ``eol`` as an alternative. The ``eol``\n"
|
|
|
" uses a version controlled file for its configuration and each clone\n"
|
|
|
" will therefore use the right settings from the start."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "To perform automatic newline conversion, use::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\n"
|
|
|
" win32text =\n"
|
|
|
" [encode]\n"
|
|
|
" ** = cleverencode:\n"
|
|
|
" # or ** = macencode:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [decode]\n"
|
|
|
" ** = cleverdecode:\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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To do the same check on a server to prevent CRLF/CR from being\n"
|
|
|
"pushed or pulled::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [hooks]\n"
|
|
|
" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
|
|
|
" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"WARNING: %s already has %s line endings\n"
|
|
|
"and does not need EOL conversion by the win32text plugin.\n"
|
|
|
"Before your next commit, please reconsider your encode/decode settings in \n"
|
|
|
"Mercurial.ini or %s.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Attempt to commit or push text file(s) using %s line endings\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "in %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"To prevent this mistake in your local repository,\n"
|
|
|
"add to Mercurial.ini or .hg/hgrc:"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"[hooks]\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"
|
|
|
"** = %sencode:\n"
|
|
|
"[decode]\n"
|
|
|
"** = %sdecode:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"win32text is deprecated: http://mercurial.selenic.com/wiki/"
|
|
|
"Win32TextExtension\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To allow other people to discover your repository using run\n"
|
|
|
":hg:`serve` in your repository::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" $ cd test\n"
|
|
|
" $ hg serve"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You can discover Zeroconf-enabled repositories by running\n"
|
|
|
":hg:`paths`::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" $ hg paths\n"
|
|
|
" zc-test = http://example.com:8000/test\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "archive prefix contains illegal components"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot give prefix when archiving to files"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown archive type '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "invalid changegroup"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unknown parent"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "integrity check failed on %s:%d"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot create new bundle repository"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not a Mercurial bundle"
|
|
|
msgstr "%s: inte en Mercurial-buntfil"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: unknown bundle version %s"
|
|
|
msgstr "%s: okänd buntversion %s"
|
|
|
|
|
|
msgid "empty username"
|
|
|
msgstr "tomt användarnamn"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "username %s contains a newline"
|
|
|
msgstr "användarnamnet %s innehåller en radbrytning"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "the name '%s' is reserved"
|
|
|
msgstr "namnet '%s' är reserverat"
|
|
|
|
|
|
msgid "options --message and --logfile are mutually exclusive"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "can't read commit message '%s': %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "limit must be a positive integer"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "limit must be positive"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid format spec '%%%s' in output filename"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "adding %s\n"
|
|
|
msgstr "lägger till %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "removing %s\n"
|
|
|
msgstr "tar bort %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "recording removal of %s as rename to %s (%d%% similar)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
|
|
|
msgstr ""
|
|
|
"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not copying - file is not managed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not copying - file has been marked for remove\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not overwriting - %s collides with %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not overwriting - file exists\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not recording move - %s does not exist\n"
|
|
|
msgstr "%s: sparar inte flytt - %s existerar inte\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: not recording copy - %s does not exist\n"
|
|
|
msgstr "%s: sparar inte flytt - %s existerar inte\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: deleted in working copy\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: cannot copy - %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "moving %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copying %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no source or destination specified"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no destination specified"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "with multiple sources, destination must be an existing directory"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "destination %s is not a directory"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no files to copy"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "(consider using --after)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "child process failed to start"
|
|
|
msgstr "barnprocess kunde inte startas"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "changeset: %d:%s\n"
|
|
|
msgstr "ändring: %d:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "branch: %s\n"
|
|
|
msgstr "gren: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tag: %s\n"
|
|
|
msgstr "märke: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "parent: %d:%s\n"
|
|
|
msgstr "förälder: %d:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "manifest: %d:%s\n"
|
|
|
msgstr "manifest: %d:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "user: %s\n"
|
|
|
msgstr "användare: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "date: %s\n"
|
|
|
msgstr "datum: %s\n"
|
|
|
|
|
|
msgid "files+:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "files-:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "files:"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "files: %s\n"
|
|
|
msgstr "filer: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copies: %s\n"
|
|
|
msgstr "kopior: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "extra: %s=%s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "description:\n"
|
|
|
msgstr "beskrivning:\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "summary: %s\n"
|
|
|
msgstr "kortfattat: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: no key named '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Found revision %s from %s\n"
|
|
|
msgstr "Hittade revision %s från %s\n"
|
|
|
|
|
|
msgid "revision matching date not found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot follow nonexistent file: \"%s\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "can only follow copies/renames for explicit filenames"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping missing subrepository: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "HG: Leave message empty to abort commit."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: user: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "HG: branch merge"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: branch '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: subrepo %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: added %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: changed %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "HG: removed %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "HG: no files changed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "empty commit message"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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`."
|
|
|
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`::"
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
" ? foo.c\n"
|
|
|
" $ hg add\n"
|
|
|
" adding foo.c\n"
|
|
|
" $ hg status\n"
|
|
|
" A foo.c"
|
|
|
msgstr ""
|
|
|
" $ ls\n"
|
|
|
" foo.c\n"
|
|
|
" $ hg status\n"
|
|
|
" ? foo.c\n"
|
|
|
" $ hg add\n"
|
|
|
" lägger till foo.c\n"
|
|
|
" $ hg status\n"
|
|
|
" A foo.c"
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if all files are successfully added.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om alla filer kunde läggas till.\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."
|
|
|
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."
|
|
|
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"
|
|
|
" option takes a percentage between 0 (disabled) and 100 (files must\n"
|
|
|
" be identical) as its parameter. Detecting renamed files this way\n"
|
|
|
" can be expensive. After using this option, :hg:`status -C` can be\n"
|
|
|
" used to check which files were identified as moved or renamed."
|
|
|
msgstr ""
|
|
|
" Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n"
|
|
|
" parameter större än 0, kommer varje borttagen fil att jämföras med\n"
|
|
|
" varje tillagd fil och lagrar de som är tillräckligt lika som ett\n"
|
|
|
" namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n"
|
|
|
" (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n"
|
|
|
" på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n"
|
|
|
" kan :hg:`status -C` användas för att kontrollera vilka filer som\n"
|
|
|
" identifierades som flyttade eller omdöpta."
|
|
|
|
|
|
msgid "similarity must be a number"
|
|
|
msgstr "likhet måste vara ett nummer"
|
|
|
|
|
|
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"
|
|
|
msgstr "visa ändringsinformation för varje rad i filer"
|
|
|
|
|
|
msgid ""
|
|
|
" List changes in files, showing the revision id responsible for\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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid "at least one filename or pattern is required"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "at least one of -n/-c is required for -l"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s: binary file\n"
|
|
|
msgstr "%s: binär fil\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."
|
|
|
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)."
|
|
|
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"
|
|
|
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"
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
msgid "no working directory: please specify a revision"
|
|
|
msgstr "ingen arbetskatalog: specificera en revision"
|
|
|
|
|
|
msgid "repository root cannot be destination"
|
|
|
msgstr "arkivroten kan inte vara destinationen"
|
|
|
|
|
|
msgid "cannot archive plain files to stdout"
|
|
|
msgstr "kan inte arkivera rena filer till stdout"
|
|
|
|
|
|
msgid "reverse effect of earlier changeset"
|
|
|
msgstr "omvänd effekten från en tidigare ändring"
|
|
|
|
|
|
msgid ""
|
|
|
" The backout command merges the reverse effect of the reverted\n"
|
|
|
" changeset into the working directory."
|
|
|
msgstr ""
|
|
|
" Kommandot backout sammanfogar den omvända effekven av den återkallade\n"
|
|
|
" ändringen i arbetskatalogen."
|
|
|
|
|
|
msgid ""
|
|
|
" With the --merge option, it first commits the reverted changes\n"
|
|
|
" as a new changeset. This new changeset is a child of the reverted\n"
|
|
|
" changeset.\n"
|
|
|
" 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.\n"
|
|
|
" This will result in an explicit merge in the history."
|
|
|
msgstr ""
|
|
|
" Med flaggan --merge arkiveras först de återkallade ändringarna som en\n"
|
|
|
" ny ändring. Denna ny ändring är en ättling till den återkallade\n"
|
|
|
" ändringen.\n"
|
|
|
" Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n"
|
|
|
" återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n"
|
|
|
" ändringen efteråt.\n"
|
|
|
" Detta resulterar i en explicit sammanfogning i historiken"
|
|
|
|
|
|
msgid ""
|
|
|
" If you backout a changeset other than the original parent of the\n"
|
|
|
" working directory, the result of this merge is not committed,\n"
|
|
|
" as with a normal merge. Otherwise, no merge is needed and the\n"
|
|
|
" commit is automatic."
|
|
|
msgstr ""
|
|
|
" Om du tar tillbaka en annan ändring än originalföräldern till\n"
|
|
|
" arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n"
|
|
|
" vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n"
|
|
|
" arkiveringen är automatisk."
|
|
|
|
|
|
msgid ""
|
|
|
" Note that the default behavior (without --merge) has changed in\n"
|
|
|
" version 1.7. To restore the previous default behavior, use\n"
|
|
|
" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
|
|
|
" the ongoing merge."
|
|
|
msgstr ""
|
|
|
" Notera att standardförfarandet (utan --merge) har ändrats i version\n"
|
|
|
" 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n"
|
|
|
" backout --merge` och sedan :hg:`update --clean .` för att bli av med\n"
|
|
|
" den pågående sammanfogningen."
|
|
|
|
|
|
msgid "please specify just one revision"
|
|
|
msgstr "specificera bara en revision"
|
|
|
|
|
|
msgid "please specify a revision to backout"
|
|
|
msgstr "specificera en revision att återkalla"
|
|
|
|
|
|
msgid "cannot backout change on a different branch"
|
|
|
msgstr "kan inte återkalla en ändring på en annan gren"
|
|
|
|
|
|
msgid "cannot backout a change with no parents"
|
|
|
msgstr "kan inte återkalla en ändring utan föräldrar"
|
|
|
|
|
|
msgid "cannot backout a merge changeset without --parent"
|
|
|
msgstr "kan inte återkalla en sammanfogande ändring utan --parent"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s is not a parent of %s"
|
|
|
msgstr "%s är inte en förälder till %s"
|
|
|
|
|
|
msgid "cannot use --parent on non-merge changeset"
|
|
|
msgstr "kan inte använda --parent på icke-sammanfogande ändring"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "changeset %s backs out changeset %s\n"
|
|
|
msgstr "ändringen %s återkallar ändringen %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging with changeset %s\n"
|
|
|
msgstr "sammanfogar med ändring %s\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"
|
|
|
" as good. Bisect will update your working directory to a revision\n"
|
|
|
" 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."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
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"
|
|
|
" revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n"
|
|
|
" genomsökningen, och alla andra värden betyder att revisionen är dålig."
|
|
|
|
|
|
msgid "The first good revision is:\n"
|
|
|
msgstr "Den första bra revisionen är:\n"
|
|
|
|
|
|
msgid "The first bad revision is:\n"
|
|
|
msgstr "Den första dåliga revisionen är:\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"Not all ancestors of this changeset have been checked.\n"
|
|
|
"To check the other ancestors, start from the common ancestor, %s.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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"
|
|
|
|
|
|
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"
|
|
|
|
|
|
msgid "cannot bisect (no known good revisions)"
|
|
|
msgstr "kan inte genomsöka (inga kända bra revisioner)"
|
|
|
|
|
|
msgid "cannot bisect (no known bad revisions)"
|
|
|
msgstr "kan inte genomsöka (inga kända dåliga revisioner)"
|
|
|
|
|
|
msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
|
|
|
msgstr "(användning av 'hg bisect <kmd>' är föråldrat)\n"
|
|
|
|
|
|
msgid "incompatible arguments"
|
|
|
msgstr "inkompatibla argument"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "failed to execute %s"
|
|
|
msgstr "misslyckades med att köra %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s killed"
|
|
|
msgstr "%s dödad"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Changeset %d:%s: %s\n"
|
|
|
msgstr "Ändring %d:%s: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
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"
|
|
|
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."
|
|
|
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'."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" Use the command :hg:`update` to switch to an existing branch. Use\n"
|
|
|
" :hg:`commit --close-branch` to mark this branch as closed."
|
|
|
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."
|
|
|
|
|
|
#, python-format
|
|
|
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)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "marked working directory as branch %s\n"
|
|
|
msgstr "markerade arbetskatalogen som grenen %s\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`)."
|
|
|
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`)."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid " Use the command :hg:`update` to switch to an existing branch."
|
|
|
msgstr ""
|
|
|
" Använd kommandot :hg:`update` för att byta till en existerande gren."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0.\n"
|
|
|
" "
|
|
|
|
|
|
msgid " (closed)"
|
|
|
msgstr " (stängd)"
|
|
|
|
|
|
msgid " (inactive)"
|
|
|
msgstr " (inaktiv)"
|
|
|
|
|
|
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."
|
|
|
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)."
|
|
|
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)."
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" Applying bundles preserves all changeset contents including\n"
|
|
|
" permissions, copy/rename information, and revision history."
|
|
|
msgstr ""
|
|
|
" Applicering av buntar bevarar allt ändringsinnehåll inklusive\n"
|
|
|
" tillstånd, information om kopior/namnbyte, och revisionshistorik."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if no changes found.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "--base is incompatible with specifying a destination"
|
|
|
msgstr "--base är inkompatibel med specificering av destination"
|
|
|
|
|
|
msgid "unknown bundle type specified with --type"
|
|
|
msgstr "okänd bunttyp specificerad med --type"
|
|
|
|
|
|
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."
|
|
|
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:"
|
|
|
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"
|
|
|
msgstr ""
|
|
|
" :``%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"
|
|
|
|
|
|
msgid "make a copy of an existing repository"
|
|
|
msgstr "gör en kopia av ett existerande arkiv"
|
|
|
|
|
|
msgid " Create a copy of an existing repository in a new directory."
|
|
|
msgstr " Skapa en kopia av ett existerande arkiv i en ny katalog."
|
|
|
|
|
|
msgid ""
|
|
|
" If no destination directory name is specified, it defaults to the\n"
|
|
|
" basename of the source."
|
|
|
msgstr ""
|
|
|
" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
|
|
|
" källan att användas."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid " See :hg:`help urls` for valid source format details."
|
|
|
msgstr " Se :hg:`help urls` för detaljer om giltiga källformat."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
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"
|
|
|
" of the changesets of the source repository. Only the set of changesets\n"
|
|
|
" defined by all -r/--rev options (including all their ancestors)\n"
|
|
|
" will be pulled into the destination repository.\n"
|
|
|
" No subsequent changesets (including subsequent tags) will be present\n"
|
|
|
" in the destination."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid ""
|
|
|
" Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
|
|
|
" local source repositories."
|
|
|
msgstr ""
|
|
|
" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
|
|
|
" --pull, även för lokala arkiv."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid ""
|
|
|
" In some cases, you can clone repositories and the working directory\n"
|
|
|
" using full hardlinks with ::"
|
|
|
msgstr ""
|
|
|
" I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
|
|
|
" hårdlänkade, med ::"
|
|
|
|
|
|
msgid " $ cp -al REPO REPOCLONE"
|
|
|
msgstr " $ cp -al ARKIV ARKIVKLON"
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid ""
|
|
|
" Mercurial will update the working directory to the first applicable\n"
|
|
|
" revision from this list:"
|
|
|
msgstr ""
|
|
|
" Mercurial uppdaterar arbetskatalogen till den första passande\n"
|
|
|
" revisionen från den här listan:"
|
|
|
|
|
|
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"
|
|
|
" c) the changeset specified with -u (if a branch name, this means the\n"
|
|
|
" latest head of that branch)\n"
|
|
|
" d) the changeset specified with -r\n"
|
|
|
" e) the tipmost head specified with -b\n"
|
|
|
" f) the tipmost head specified with the url#branch source syntax\n"
|
|
|
" g) the tipmost head of the default branch\n"
|
|
|
" h) tip"
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
|
|
|
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"
|
|
|
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\n"
|
|
|
" :hg:`push` 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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" If no commit message is specified, Mercurial starts your\n"
|
|
|
" configured editor where you can enter a message. In case your\n"
|
|
|
" commit fails, you will find a backup of your message in\n"
|
|
|
" ``.hg/last-message.txt``."
|
|
|
msgstr ""
|
|
|
" Om inget arkiveringsmeddelande anges, startar Mercurial din\n"
|
|
|
" konfigurerade editor där du kan skriva ett meddelande. Om din\n"
|
|
|
" arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n"
|
|
|
" meddelande i ``.hg/last-message.txt``."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if nothing changed.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "can only close branch heads"
|
|
|
msgstr "kan bara stänga grenhuvuden"
|
|
|
|
|
|
msgid "nothing changed\n"
|
|
|
msgstr "inget ändrat\n"
|
|
|
|
|
|
msgid "created new head\n"
|
|
|
msgstr "skapade ett nytt huvud\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "reopening closed branch head %d\n"
|
|
|
msgstr "återöppnar det stängda grenhuvudet %d\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "committed changeset %d:%s\n"
|
|
|
msgstr "arkiverade ändringen %d:%s\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."
|
|
|
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."
|
|
|
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`."
|
|
|
msgstr ""
|
|
|
" Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n"
|
|
|
" namnbyte innan det, se :hg:`revert`."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if errors are encountered.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "find the ancestor revision of two revisions in a given index"
|
|
|
msgstr "hitta föregående revision av två revisioner i ett givet index"
|
|
|
|
|
|
msgid "either two or three arguments required"
|
|
|
msgstr "endera två eller tre argument krävs"
|
|
|
|
|
|
msgid "builds a repo with a given dag from scratch in the current empty repo"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Elements:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - \"+n\" is a linear run of n nodes based on the current default "
|
|
|
"parent\n"
|
|
|
" - \".\" is a single node based on the current default parent\n"
|
|
|
" - \"$\" resets the default parent to null (implied at the start);\n"
|
|
|
" otherwise the default parent is always the last node created\n"
|
|
|
" - \"<p\" sets the default parent to the backref p\n"
|
|
|
" - \"*p\" is a fork at parent p, which is a backref\n"
|
|
|
" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n"
|
|
|
" - \"/p2\" is a merge of the preceding node and p2\n"
|
|
|
" - \":tag\" defines a local tag for the preceding node\n"
|
|
|
" - \"@branch\" sets the named branch for subsequent nodes\n"
|
|
|
" - \"!command\" runs the command using your shell\n"
|
|
|
" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
|
|
|
" - \"#...\\n\" is a comment up to the end of the line"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Whitespace between the above elements is ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " A backref is either"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - a number n, which references the node curr-n, where curr is the "
|
|
|
"current\n"
|
|
|
" node, or\n"
|
|
|
" - the name of a local tag you placed earlier using \":tag\", or\n"
|
|
|
" - empty to denote the default parent."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" All string valued-elements are either strictly alphanumeric, or must\n"
|
|
|
" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Note that the --overwritten-file and --appended-file options imply the\n"
|
|
|
" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "need at least one of -m, -a, -o, -n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "repository is not empty"
|
|
|
msgstr "arkivet är inte tomt"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s command %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "list all available commands and options"
|
|
|
msgstr "visa alla tillgängliga kommandon och alternativ"
|
|
|
|
|
|
msgid "returns the completion list associated with the given command"
|
|
|
msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
|
|
|
|
|
|
msgid "show information detected about current filesystem"
|
|
|
msgstr "visa information om det aktuella filsystemet"
|
|
|
|
|
|
msgid "rebuild the dirstate as it would look like for the given revision"
|
|
|
msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen"
|
|
|
|
|
|
msgid "validate the correctness of the current dirstate"
|
|
|
msgstr "validera korrektheten för den nuvarande katalogstatusen"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s in state %s, but not in manifest1\n"
|
|
|
msgstr "%s har status %s, men inte i manifest1\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s in state %s, but also in manifest1\n"
|
|
|
msgstr "%s har status %s, men också i manifest1\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s in state %s, but not in either manifest\n"
|
|
|
msgstr "%s har status %s, men inte i något manifest\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s in manifest1, but listed as state %s"
|
|
|
msgstr "%s i manifest1, men listad med status %s"
|
|
|
|
|
|
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"
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Med --debug, visas källan (filnamn och radnummer) för varje\n"
|
|
|
" alternativ."
|
|
|
|
|
|
#, python-format
|
|
|
msgid "read config from: %s\n"
|
|
|
msgstr "läs konfiguration från: %s\n"
|
|
|
|
|
|
msgid "only one config item permitted"
|
|
|
msgstr "bara ett konfigurationsalternativ tillåts"
|
|
|
|
|
|
msgid "access the pushkey key/value protocol"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " With two args, list the keys in the given namespace."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With five args, set a key to new if it currently is set to old.\n"
|
|
|
" Reports success or failure.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "parse and apply a revision specification"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show the contents of the current dirstate"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copy: %s -> %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "format the changelog or an index DAG as a concise textual description"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
|
|
|
" revision numbers, they get labelled in the output as rN."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Otherwise, the changelog DAG of the current repo is emitted.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "need repo for changelog dag"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "dump the contents of a data file revision"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid revision identifier %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "parse and display a date"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "dump the contents of an index file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "dump an index DAG as a graphviz dot file"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "test Mercurial installation"
|
|
|
msgstr "testa Mercurial-installation"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Checking encoding (%s)...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (check that your locale is properly set)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Checking installed modules (%s)...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " One or more extensions could not be found"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (check that you compiled the extensions)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Checking templates...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (templates seem to have been installed incorrectly)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Checking patch...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " patch call failed:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " unexpected patch output!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " patch test failed!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Current patch tool may be incompatible with patch, or misconfigured. "
|
|
|
"Please check your configuration file)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Internal patcher failure, please report this error to http://mercurial."
|
|
|
"selenic.com/wiki/BugTracker\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Checking commit editor...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " No commit editor set and can't find vi in PATH\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (specify a commit editor in your configuration file)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid " Can't find editor '%s' in PATH\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Checking username...\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (specify a username in your configuration file)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "No problems detected\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s problems detected, please check your install!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "dump rename information"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s renamed from %s:%s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not renamed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "show how files match on given patterns"
|
|
|
msgstr ""
|
|
|
|
|
|
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::\n"
|
|
|
" diff may generate unexpected results for merges, as it will\n"
|
|
|
" default to comparing against the working directory's first\n"
|
|
|
" parent changeset if no revisions are specified."
|
|
|
msgstr ""
|
|
|
" .. note::\n"
|
|
|
" diff kan generera oväntade resultat för sammanfogningar eftersom\n"
|
|
|
" den som standard kommer att jämföra mot arbetskatalogens tidigare\n"
|
|
|
" ä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."
|
|
|
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."
|
|
|
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`."
|
|
|
msgstr ""
|
|
|
" 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`."
|
|
|
|
|
|
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."
|
|
|
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::\n"
|
|
|
" export may generate unexpected diff output for merge\n"
|
|
|
" changesets, as it will compare the merge changeset against its\n"
|
|
|
" first parent only."
|
|
|
msgstr ""
|
|
|
" .. note::\n"
|
|
|
" export kan generera oväntade resultat för sammanfogningar, eftersom\n"
|
|
|
" den som standard bara kommer att jämföra mot den första 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:"
|
|
|
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 hexadecimal digits)\n"
|
|
|
" :``%N``: number of patches being generated\n"
|
|
|
" :``%R``: changeset revision number\n"
|
|
|
" :``%b``: basename of the exporting repository\n"
|
|
|
" :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
|
|
|
" :``%n``: zero-padded sequence number, starting at 1\n"
|
|
|
" :``%r``: zero-padded changeset revision number"
|
|
|
msgstr ""
|
|
|
" :``%%``: ett \"%\"-tecken\n"
|
|
|
" :``%H``: ändringshash (40 hexadecimala siffror)\n"
|
|
|
" :``%N``: antal genererade patchar\n"
|
|
|
" :``%R``: ändringens revisionsnummer\n"
|
|
|
" :``%b``: basnamn för det exporterande arkivet\n"
|
|
|
" :``%h``: kort ändringshash (12 hexadecimala siffror)\n"
|
|
|
" :``%n``: nollpaddat sekvensnummer, börjar med 1\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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" With the --switch-parent option, the diff will be against the\n"
|
|
|
" second parent. It can be useful to review a merge."
|
|
|
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."
|
|
|
|
|
|
msgid "export requires at least one changeset"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "exporting patches:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "exporting patch:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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`."
|
|
|
msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`."
|
|
|
|
|
|
msgid "no files specified"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not removing %s: file is already untracked\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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"
|
|
|
" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
|
|
|
" use the --all flag."
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
" eller \"+\" för en icke-träff som blir en träff), använd flaggan\n"
|
|
|
" --all."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if a match is found, 1 otherwise.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om en träff hittas, 1 annars.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid "grep: invalid match pattern: %s\n"
|
|
|
msgstr "grep: ogiltigt träffmönster: %s\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."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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`)."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" If -t/--topo is specified, named branch mechanics will be ignored and "
|
|
|
"only\n"
|
|
|
" changesets without children will be shown."
|
|
|
msgstr ""
|
|
|
" Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n"
|
|
|
" ändringar utan barn kommer att visas."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if matching heads are found, 1 if not.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om matchande huvuden hittas, 1 annars.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no open branch heads found on branches %s"
|
|
|
msgstr "inga öppna grenhuvuden hittades på grenarna %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid " (started at %s)"
|
|
|
msgstr " (började som %s)"
|
|
|
|
|
|
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 ""
|
|
|
" Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
|
|
|
" "
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if successful.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "global options:"
|
|
|
msgstr "globala flaggor:"
|
|
|
|
|
|
msgid "use \"hg help\" for the full list of commands"
|
|
|
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"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "use \"hg -v help%s\" to show aliases and global options"
|
|
|
msgstr "använd \"hg -v help%s\" för att visa alias och globala flaggor"
|
|
|
|
|
|
#, python-format
|
|
|
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:"
|
|
|
msgstr "kommandolista:"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"aliases: %s\n"
|
|
|
msgstr ""
|
|
|
"\n"
|
|
|
"alias: %s\n"
|
|
|
|
|
|
msgid "(no help text available)"
|
|
|
msgstr "(ingen hjälptext tillgänglig)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "shell alias for::"
|
|
|
msgstr "skal-alias för::"
|
|
|
|
|
|
#, python-format
|
|
|
msgid " %s"
|
|
|
msgstr " %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "alias for: hg %s"
|
|
|
msgstr "alias för: hg %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s"
|
|
|
msgstr "%s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"use \"hg -v help %s\" to show verbose help\n"
|
|
|
msgstr ""
|
|
|
"\n"
|
|
|
"använd \"hg -v help %s\" för att visa utförlig hjälp\n"
|
|
|
|
|
|
msgid "options:\n"
|
|
|
msgstr "flaggor:\n"
|
|
|
|
|
|
msgid "no commands defined\n"
|
|
|
msgstr "inga kommandon definierade\n"
|
|
|
|
|
|
msgid "no help text available"
|
|
|
msgstr "ingen hjälptext tillgänglig"
|
|
|
|
|
|
#, python-format
|
|
|
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"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'%s' is provided by the following extension:"
|
|
|
msgstr "'%s' tillhandahålls av följande utökning:"
|
|
|
|
|
|
msgid "Mercurial Distributed SCM\n"
|
|
|
msgstr "Mercurial Distribuerad SCM\n"
|
|
|
|
|
|
msgid "basic commands:"
|
|
|
msgstr "grundläggande kommandon:"
|
|
|
|
|
|
msgid "enabled extensions:"
|
|
|
msgstr "aktiverade utökningar:"
|
|
|
|
|
|
msgid "VALUE"
|
|
|
msgstr "VÄRDE"
|
|
|
|
|
|
msgid "DEPRECATED"
|
|
|
msgstr "FÖRLEGAD"
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"[+] marked option can be specified multiple times"
|
|
|
msgstr ""
|
|
|
"\n"
|
|
|
"flaggor markerade med [+] kan anges flera gånger"
|
|
|
|
|
|
msgid ""
|
|
|
"\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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid "import an ordered set of patches"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Import a list of patches and commit them individually (unless\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."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" With -s/--similarity, hg will attempt to discover renames and\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "to working directory"
|
|
|
msgstr "till arbetskatalog"
|
|
|
|
|
|
msgid "not a Mercurial patch"
|
|
|
msgstr "inte en Mercurial-patch"
|
|
|
|
|
|
msgid "patch is damaged or loses information"
|
|
|
msgstr "patchen är skadad eller tappar information"
|
|
|
|
|
|
msgid "applying patch from stdin\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "applied %s\n"
|
|
|
msgstr "applicerade %s\n"
|
|
|
|
|
|
msgid "no diffs found"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid " See pull for valid source format details."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if there are incoming changes, 1 otherwise.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om det finns inkommande ändringar, 1 annars.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "cannot combine --bundle and --subrepos"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Det är möjligt att specificera en URL med ``ssh://`` som destination.\n"
|
|
|
" Se :hg:`help urls` för mer informatio"
|
|
|
|
|
|
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."
|
|
|
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 .\"."
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Om du vill skicka utmatningen från detta kommando till kommandot\n"
|
|
|
" \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n"
|
|
|
" Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
|
|
|
" innehåller blanktecken som multipla filnamn"
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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. You can specify a revision set for\n"
|
|
|
" log, see :hg:`help revsets` for more information."
|
|
|
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. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n"
|
|
|
" för mer information."
|
|
|
|
|
|
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."
|
|
|
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::\n"
|
|
|
" 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:."
|
|
|
msgstr ""
|
|
|
" .. note::\n"
|
|
|
" log -p/--patch kan generera oväntad diff-utmatning för\n"
|
|
|
" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot\n"
|
|
|
" den första förälder. Dessutom kommer bara filer som skiljer sig från\n"
|
|
|
" BÅDA föräldrarna att visas i filer:."
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n"
|
|
|
" Med --debug visas filrevisionhashar."
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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 ""
|
|
|
" ``--tool`` can be used to specify the merge tool used for file\n"
|
|
|
" merges. It overrides the HGMERGE environment variable and your\n"
|
|
|
" configuration files."
|
|
|
msgstr ""
|
|
|
" ``--tool`` kan användas för att ange sammanfogningsverktyg att\n"
|
|
|
" använda för filsammanfogningar. Det har högre prioritet än\n"
|
|
|
" miljövariabeln HGMERGE och dina konfigurationsfiler."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
" anges."
|
|
|
|
|
|
msgid " :hg:`resolve` must be used to resolve unresolved files."
|
|
|
msgstr " :hg:`resolve` måste användas för att lösa olästa filer."
|
|
|
|
|
|
msgid ""
|
|
|
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
|
|
|
" will check out a clean copy of the original merge parent, losing\n"
|
|
|
" all changes."
|
|
|
msgstr ""
|
|
|
" För att ångra en oarkiverad sammanfogning, använd\n"
|
|
|
" :hg:`update --clean .` som kommer att hämta ut en ren kopia av den\n"
|
|
|
" ursprungliga föräldern till sammanfogningen, och ta bort ändringarna."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if there are unresolved files.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"branch '%s' has %d heads - please merge with an explicit rev\n"
|
|
|
"(run 'hg heads .' to see heads)"
|
|
|
msgstr ""
|
|
|
"grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n"
|
|
|
"(kör 'hg heads .' för att se huvuden)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"branch '%s' has one head - please merge with an explicit rev\n"
|
|
|
"(run 'hg heads' to see all heads)"
|
|
|
msgstr ""
|
|
|
"grenen '%s' har ett huvud - sammanfoga med en specifik rev\n"
|
|
|
"(kör 'hg heads .' för att se alla huvuden)"
|
|
|
|
|
|
msgid "there is nothing to merge"
|
|
|
msgstr "det finns inget att sammanfoga"
|
|
|
|
|
|
#, python-format
|
|
|
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"
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
msgid " See pull for details of valid destination formats."
|
|
|
msgstr " Se pull för information om giltiga destinationsformat."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if there are outgoing changes, 1 otherwise.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om det finns utgående ändringar, 1 annars.\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"
|
|
|
" last changed (before the working directory revision or the\n"
|
|
|
" argument to --rev if given) is printed."
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
" arbetskatalogens revision eller innan --rev om angiven) att visas."
|
|
|
|
|
|
msgid "can only specify an explicit filename"
|
|
|
msgstr "kan bara specificera ett explicit filnamn"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'%s' not found in manifest!"
|
|
|
msgstr "'%s' hittades inte i manifestet!"
|
|
|
|
|
|
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."
|
|
|
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 your\n"
|
|
|
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
|
|
|
" repository, ``.hg/hgrc`` is used, too."
|
|
|
msgstr ""
|
|
|
" Sökvägar definieras i sektionen [paths] i din konfigurationsfil och i\n"
|
|
|
" ``/etc/mercurial/hgrc``. Om det körs i ett arkiv, så används\n"
|
|
|
" ``.hg/hgrc`` också."
|
|
|
|
|
|
msgid ""
|
|
|
" The path names ``default`` and ``default-push`` have a special\n"
|
|
|
" meaning. When performing a push or pull operation, they are used\n"
|
|
|
" as fallbacks if no location is specified on the command-line.\n"
|
|
|
" When ``default-push`` is set, it will be used for push and\n"
|
|
|
" ``default`` will be used for pull; otherwise ``default`` is used\n"
|
|
|
" as the fallback for both. When cloning a repository, the clone\n"
|
|
|
" source is written as ``default`` in ``.hg/hgrc``. Note that\n"
|
|
|
" ``default`` and ``default-push`` apply to all inbound (e.g.\n"
|
|
|
" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n"
|
|
|
" :hg:`bundle`) operations."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " See :hg:`help urls` for more information."
|
|
|
msgstr " Se :hg:`help urls` för mer information."
|
|
|
|
|
|
msgid "not found!\n"
|
|
|
msgstr "hittades inte!\n"
|
|
|
|
|
|
msgid "not updating, since new heads added\n"
|
|
|
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"
|
|
|
|
|
|
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"
|
|
|
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."
|
|
|
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\n"
|
|
|
" by a pull at the time you issued this command. If you then decide\n"
|
|
|
" to add those changes to the repository, you should use :hg:`pull\n"
|
|
|
" -r X` 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 :hg:`pull -r X` där\n"
|
|
|
" ``X`` är den sista ändringen visad av :hg:`incoming`."
|
|
|
|
|
|
msgid ""
|
|
|
" If SOURCE is omitted, the 'default' path will be used.\n"
|
|
|
" See :hg:`help urls` for more information."
|
|
|
msgstr ""
|
|
|
" Om KÄLLA inte är angivet, används 'default'-sökvägen.\n"
|
|
|
" Se :hg:`help urls` för mer information."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if an update had unresolved files.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n"
|
|
|
" filer.\n"
|
|
|
" "
|
|
|
|
|
|
msgid ""
|
|
|
"other repository doesn't support revision lookup, so a rev cannot be "
|
|
|
"specified."
|
|
|
msgstr ""
|
|
|
"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
|
|
|
"anges."
|
|
|
|
|
|
msgid "push changes to the specified destination"
|
|
|
msgstr "tryck ändringar till den specificerade destinationen"
|
|
|
|
|
|
msgid ""
|
|
|
" Push changesets from the local repository to the specified\n"
|
|
|
" destination."
|
|
|
msgstr ""
|
|
|
" Trycker ändringar från det lokala arkivet till angiven destination."
|
|
|
|
|
|
msgid ""
|
|
|
" This operation is symmetrical to pull: it is identical to a pull\n"
|
|
|
" in the destination repository from the current one."
|
|
|
msgstr ""
|
|
|
" Denna operation är symmetrisk med pull: den är identisk med en pull i\n"
|
|
|
" destinationsarkivet från det aktuella arkivet."
|
|
|
|
|
|
msgid ""
|
|
|
" By default, push will not allow creation of new heads at the\n"
|
|
|
" destination, since multiple heads would make it unclear which head\n"
|
|
|
" to use. In this situation, it is recommended to pull and merge\n"
|
|
|
" before pushing."
|
|
|
msgstr ""
|
|
|
" Som standard tillåter inte push att nya huvuden skapas i\n"
|
|
|
" destinationen, eftersom multipla huvuden skulle göra det oklart vilket\n"
|
|
|
" huvud som skulle användas. I dessa situationer är det rekommenderat\n"
|
|
|
" att dra och sammanfoga innan tryckning."
|
|
|
|
|
|
msgid ""
|
|
|
" Use --new-branch if you want to allow push to create a new named\n"
|
|
|
" branch that is not present at the destination. This allows you to\n"
|
|
|
" only create a new branch without forcing other changes."
|
|
|
msgstr ""
|
|
|
" Använd --new-branch om du vill tillåta push att skapa en ny namngiven\n"
|
|
|
" gren som inte finns i destinationen. Detta ger dig möjligheten att\n"
|
|
|
" bara skapa en ny gren utan att tvinga andra ändringar."
|
|
|
|
|
|
msgid ""
|
|
|
" Use -f/--force to override the default behavior and push all\n"
|
|
|
" changesets on all branches."
|
|
|
msgstr ""
|
|
|
" Använd -f/--force för att upphäva det vanliga beteendet och trycka\n"
|
|
|
" alla ändringar på alla grenar."
|
|
|
|
|
|
msgid ""
|
|
|
" If -r/--rev is used, the specified revision and all its ancestors\n"
|
|
|
" will 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."
|
|
|
msgstr ""
|
|
|
" Se :hg:`help urls` för viktiga detaljer om URL:er med ``ssh://``. Om\n"
|
|
|
" DESTINATION inte är angivet, används standardsökvägen."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 if push was successful, 1 if nothing to push.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om tryckning lyckates, 1 om inget fanns att trycka.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid "pushing to %s\n"
|
|
|
msgstr "trycker till %s\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."
|
|
|
msgstr ""
|
|
|
" 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 ""
|
|
|
" Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returns 0 om kommandot lyckades, 1 om inget fanns att återställa eller\n"
|
|
|
" verifiering misslyckades.\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."
|
|
|
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,\n"
|
|
|
" och -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\n"
|
|
|
" branch) 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`).\n"
|
|
|
" Aktionerna ä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"
|
|
|
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"
|
|
|
|
|
|
msgid ""
|
|
|
" This command schedules the files to be removed at the next commit.\n"
|
|
|
" To undo a remove before that, see :hg:`revert`."
|
|
|
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"
|
|
|
" "
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if any warnings encountered.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om varningar påträffades.\n"
|
|
|
" "
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not removing %s: file is untracked\n"
|
|
|
msgstr "raderar inte %s: filen är inte hanterad\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not removing %s: file still exists (use -f to force removal)\n"
|
|
|
msgstr "raderar inte %s: filen finns fortfarande (använd -f för att tvinga)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not removing %s: file is modified (use -f to force removal)\n"
|
|
|
msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"not removing %s: file has been marked for add (use -f to force removal)\n"
|
|
|
msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\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."
|
|
|
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`."
|
|
|
msgstr ""
|
|
|
" 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 "redo merges or set/view the merge status of files"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Merges with unresolved conflicts are often the result of\n"
|
|
|
" non-interactive merging using the ``internal:merge`` configuration\n"
|
|
|
" setting, or a command-line merge tool like ``diff3``. The resolve\n"
|
|
|
" command is used to manage the files involved in a merge, after\n"
|
|
|
" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
|
|
|
" working directory must have two parents)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " The resolve command can be used in the following ways:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
|
|
|
"specified\n"
|
|
|
" files, discarding any previous merge attempts. Re-merging is not\n"
|
|
|
" performed for files already marked as resolved. Use ``--all/-a``\n"
|
|
|
" to selects all unresolved files. ``--tool`` can be used to specify\n"
|
|
|
" the merge tool used for the given files. It overrides the HGMERGE\n"
|
|
|
" environment variable and your configuration files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
|
|
|
" (e.g. after having manually fixed-up the files). The default is\n"
|
|
|
" to mark all unresolved files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
|
|
|
" default is to mark all resolved files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - :hg:`resolve -l`: list files which had or still have conflicts.\n"
|
|
|
" In the printed list, ``U`` = unresolved and ``R`` = resolved."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Note that Mercurial will not let you commit files with unresolved\n"
|
|
|
" merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
|
|
|
" commit after a conflicting merge."
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if any files fail a resolve attempt.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckates, 1 om någon fil inte kunde lösas.\n"
|
|
|
" "
|
|
|
|
|
|
msgid "too many options specified"
|
|
|
msgstr "för många flaggor specificerade"
|
|
|
|
|
|
msgid "can't specify --all and patterns"
|
|
|
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"
|
|
|
msgstr "återställ filer eller kataloger till ett tidigare tillstånd"
|
|
|
|
|
|
msgid ""
|
|
|
" .. note::\n"
|
|
|
" This command is most likely not what you are looking for.\n"
|
|
|
" Revert will partially overwrite content in the working\n"
|
|
|
" directory without changing the working directory parents. Use\n"
|
|
|
" :hg:`update -r rev` to check out earlier revisions, or\n"
|
|
|
" :hg:`update --clean .` to undo a merge which has added another\n"
|
|
|
" parent."
|
|
|
msgstr ""
|
|
|
" .. note::\n"
|
|
|
" Det här kommandot är troligtvis inte det du letar efter. Revert\n"
|
|
|
" kommer att delvis skriva över innehåll i arbetskatalogen utan att\n"
|
|
|
" ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n"
|
|
|
" hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n"
|
|
|
" ångra en sammanfogning som har lagt till fler 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."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" Modified files are saved with a .orig suffix before reverting.\n"
|
|
|
" To disable these backups, use --no-backup."
|
|
|
msgstr ""
|
|
|
" Modifierade filer sparas med suffixet .orig innan återställning.\n"
|
|
|
" För att deaktivera dessa säkerhetskopior, använd --no-backup."
|
|
|
|
|
|
msgid "you can't specify a revision and a date"
|
|
|
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"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "forgetting %s\n"
|
|
|
msgstr "glömmer %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "reverting %s\n"
|
|
|
msgstr "återställer %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "undeleting %s\n"
|
|
|
msgstr "ångrar radering av %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "saving current version of %s as %s\n"
|
|
|
msgstr "sparar nuvarande revision av %s som %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "file not managed: %s\n"
|
|
|
msgstr "filen hanteras inte: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no changes needed to %s\n"
|
|
|
msgstr "inga ändringar behövs för %s\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."
|
|
|
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:"
|
|
|
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"
|
|
|
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"
|
|
|
" the changes). Furthermore, a race is possible with readers of the\n"
|
|
|
" repository; for example an in-progress pull from the repository\n"
|
|
|
" may fail if a rollback is performed."
|
|
|
msgstr ""
|
|
|
" 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"
|
|
|
" ändringarna). Dessutom finns möjligheten till timingproblem; som\n"
|
|
|
" ett exempel kan en pågående dragning misslyckas om en återgång\n"
|
|
|
" utförs."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if no rollback data is available.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om ingen återgångsdata finns.\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."
|
|
|
msgstr " Visa rotkatalogen för det aktuella arkivet."
|
|
|
|
|
|
msgid "start stand-alone webserver"
|
|
|
msgstr "starta fristående webbserver"
|
|
|
|
|
|
msgid ""
|
|
|
" Start a local HTTP repository browser and pull server. You can use\n"
|
|
|
" this for ad-hoc sharing and browing of repositories. It is\n"
|
|
|
" recommended to use a real web server to serve a repository for\n"
|
|
|
" longer periods of time."
|
|
|
msgstr ""
|
|
|
" Starta en lokal HTTP-arkivserver för webbläsare och pull-operationer.\n"
|
|
|
" Du kan använda detta för improviserad delning och skummande av arkiv.\n"
|
|
|
" Det är rekommenderat att använda en riktig webbserver för att dela ett\n"
|
|
|
" arkiv under längre tidsperioder."
|
|
|
|
|
|
msgid ""
|
|
|
" Please note that the server does not implement access control.\n"
|
|
|
" This means that, by default, anybody can read from the server and\n"
|
|
|
" nobody can write to it by default. Set the ``web.allow_push``\n"
|
|
|
" option to ``*`` to allow everybody to push to the server. You\n"
|
|
|
" should use a real web server if you need to authenticate users."
|
|
|
msgstr ""
|
|
|
" Notera att servern inte har någon åtkomstkontroll. Det betyder att vem\n"
|
|
|
" som helst kan läsa från servern och ingen kan skriva till den som\n"
|
|
|
" standard. Sätt flaggan ``web.allow_push`` till ``*`` för att tillåta\n"
|
|
|
" alla att trycka till servern. Om du behöver autenticiera användare,\n"
|
|
|
" borde du använda en riktig webbserver."
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid "There is no Mercurial repository here (.hg not found)"
|
|
|
msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
|
|
|
|
|
|
#, python-format
|
|
|
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"
|
|
|
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."
|
|
|
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."
|
|
|
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::\n"
|
|
|
" status may appear to disagree with diff if permissions have\n"
|
|
|
" changed or a merge has occurred. The standard diff format does\n"
|
|
|
" not report permission changes and diff only reports changes\n"
|
|
|
" relative to one merge parent."
|
|
|
msgstr ""
|
|
|
" .. note::\n"
|
|
|
" status kan verka osams med diff om tillstånd har ändrat eller en\n"
|
|
|
" 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."
|
|
|
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"
|
|
|
" C = clean\n"
|
|
|
" ! = missing (deleted by non-hg command, but still tracked)\n"
|
|
|
" ? = not tracked\n"
|
|
|
" I = ignored\n"
|
|
|
" = origin of the previous file listed as A (added)"
|
|
|
msgstr ""
|
|
|
" M = modifierad\n"
|
|
|
" A = adderad\n"
|
|
|
" R = raderad\n"
|
|
|
" C = ren\n"
|
|
|
" ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n"
|
|
|
" ? = inte spårad\n"
|
|
|
" I = ignorerad\n"
|
|
|
" = källa för den tidigare filen listad som A (adderad)"
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
#, python-format
|
|
|
msgid "parent: %d:%s "
|
|
|
msgstr "förälder: %d:%s "
|
|
|
|
|
|
msgid " (empty repository)"
|
|
|
msgstr " (tomt arkiv)"
|
|
|
|
|
|
msgid " (no revision checked out)"
|
|
|
msgstr " (ingen revision uthämtad)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "branch: %s\n"
|
|
|
msgstr "gren: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d modified"
|
|
|
msgstr "%d modifierad"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d added"
|
|
|
msgstr "%d tillagd"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d removed"
|
|
|
msgstr "%d borttagen"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d renamed"
|
|
|
msgstr "%d omdöpta"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d copied"
|
|
|
msgstr "%d kopierade"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d deleted"
|
|
|
msgstr "%d raderad"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d unknown"
|
|
|
msgstr "%d okänd"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d ignored"
|
|
|
msgstr "%d ignorerad"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d unresolved"
|
|
|
msgstr "%d olöst"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d subrepos"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (merge)"
|
|
|
msgstr " (sammanfogning)"
|
|
|
|
|
|
msgid " (new branch)"
|
|
|
msgstr " (ny gren)"
|
|
|
|
|
|
msgid " (head closed)"
|
|
|
msgstr " (huvudet stängt)"
|
|
|
|
|
|
msgid " (clean)"
|
|
|
msgstr " (ren)"
|
|
|
|
|
|
msgid " (new branch head)"
|
|
|
msgstr " (nytt grenhuvud)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "commit: %s\n"
|
|
|
msgstr "arkivera: %s\n"
|
|
|
|
|
|
msgid "update: (current)\n"
|
|
|
msgstr "uppdatera: (aktuell)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "update: %d new changesets (update)\n"
|
|
|
msgstr "uppdatera: %d nya ändringar (uppdatera)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "update: %d new changesets, %d branch heads (merge)\n"
|
|
|
msgstr "uppdatera: %d nya ändringar, %d grenhuvuden (sammanfoga)\n"
|
|
|
|
|
|
msgid "1 or more incoming"
|
|
|
msgstr "1 eller fler inkommande"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d outgoing"
|
|
|
msgstr "%d utgående"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "remote: %s\n"
|
|
|
msgstr "fjärran: %s\n"
|
|
|
|
|
|
msgid "remote: (synced)\n"
|
|
|
msgstr "fjärran: (synkad)\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."
|
|
|
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."
|
|
|
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)."
|
|
|
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)."
|
|
|
|
|
|
msgid ""
|
|
|
" Since tag names have priority over branch names during revision\n"
|
|
|
" lookup, using an existing branch name as a tag name is discouraged."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "tag names must be unique"
|
|
|
msgstr "märkesnamn måste vara unika"
|
|
|
|
|
|
msgid "tag names cannot consist entirely of whitespace"
|
|
|
msgstr "märkesnamn kan inte bara bestå av blanktecken"
|
|
|
|
|
|
msgid "--rev and --remove are incompatible"
|
|
|
msgstr "--rev och --remove är inkompatibla"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tag '%s' does not exist"
|
|
|
msgstr "märket '%s' existerar inte"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tag '%s' is not a global tag"
|
|
|
msgstr "märket '%s' är inte ett globalt märke"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tag '%s' is not a local tag"
|
|
|
msgstr "märket '%s' är inte ett lokalt märke"
|
|
|
|
|
|
#, python-format
|
|
|
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"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
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)."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" Applicera en eller flera komprimerade filer med ändringar genererade\n"
|
|
|
" av bundle-kommandot."
|
|
|
|
|
|
msgid ""
|
|
|
" Returns 0 on success, 1 if an update has unresolved files.\n"
|
|
|
" "
|
|
|
msgstr ""
|
|
|
" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n"
|
|
|
" filer.\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. If no changeset is specified, update to the tip of the\n"
|
|
|
" current named branch."
|
|
|
msgstr ""
|
|
|
" Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n"
|
|
|
" ändring anes, så uppdateras till toppen på den nuvarande namngivna\n"
|
|
|
" grenen."
|
|
|
|
|
|
msgid ""
|
|
|
" If the changeset is not a descendant of the working directory's\n"
|
|
|
" parent, the update is aborted. With the -c/--check option, the\n"
|
|
|
" working directory is checked for uncommitted changes; if none are\n"
|
|
|
" found, the working directory is updated to the specified\n"
|
|
|
" changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" The following rules apply when the working directory contains\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"
|
|
|
" are merged into the requested changeset and the merged\n"
|
|
|
" result is left uncommitted. If the requested changeset is\n"
|
|
|
" not an ancestor or descendant (that is, it is on another\n"
|
|
|
" branch), the update is aborted and the uncommitted changes\n"
|
|
|
" are preserved."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
|
|
|
msgid ""
|
|
|
" Use null as the changeset to remove the working directory (like\n"
|
|
|
" :hg:`clone -U`)."
|
|
|
msgstr ""
|
|
|
" Använd null som ändring för att radera arbetskatalogen (som\n"
|
|
|
" :hg:`clone -U`)."
|
|
|
|
|
|
msgid ""
|
|
|
" If you want to update just one file to an older changeset, use\n"
|
|
|
" :hg:`revert`."
|
|
|
msgstr ""
|
|
|
" Om du vill uppdatera bara en fil till en äldre ändring, använd\n"
|
|
|
" :hg:`revert`."
|
|
|
|
|
|
msgid "cannot specify both -c/--check and -C/--clean"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "uncommitted local changes"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
" 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."
|
|
|
|
|
|
msgid "output version and copyright information"
|
|
|
msgstr "visa version och copyright-information"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Mercurial Distributed SCM (version %s)\n"
|
|
|
msgstr "Mercurial Distribuerad SCM (version %s)\n"
|
|
|
|
|
|
msgid "(see http://mercurial.selenic.com for more information)"
|
|
|
msgstr "(se http://mercurial.selenic.com för mer information)"
|
|
|
|
|
|
msgid ""
|
|
|
"Copyright (C) 2005-2010 Matt Mackall and others\n"
|
|
|
"This is free software; see the source for copying conditions. There is NO\n"
|
|
|
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
|
|
|
msgstr ""
|
|
|
"Copyright (C) 2005-2010 Matt Mackall och andra\n"
|
|
|
"Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
|
|
|
"garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
|
|
|
|
|
|
msgid "repository root directory or name of overlay bundle file"
|
|
|
msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
|
|
|
|
|
|
msgid "DIR"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "change working directory"
|
|
|
msgstr "ändra arbetskatalog"
|
|
|
|
|
|
msgid "do not prompt, assume 'yes' for any required answers"
|
|
|
msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
|
|
|
|
|
|
msgid "suppress output"
|
|
|
msgstr "förhindra utmatning"
|
|
|
|
|
|
msgid "enable additional output"
|
|
|
msgstr "aktivera ytterligare utmatning"
|
|
|
|
|
|
msgid "set/override config option (use 'section.name=value')"
|
|
|
msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')"
|
|
|
|
|
|
msgid "CONFIG"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "enable debugging output"
|
|
|
msgstr "aktivera debugutmatning"
|
|
|
|
|
|
msgid "start debugger"
|
|
|
msgstr "starta debugger"
|
|
|
|
|
|
msgid "set the charset encoding"
|
|
|
msgstr "sätt teckenkodning"
|
|
|
|
|
|
msgid "ENCODE"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "MODE"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "set the charset encoding mode"
|
|
|
msgstr "sätt teckenkodningsläge"
|
|
|
|
|
|
msgid "always print a traceback on exception"
|
|
|
msgstr "visa alltid bakåtspårning vid undantag"
|
|
|
|
|
|
msgid "time how long the command takes"
|
|
|
msgstr "ta tid på hur lång tid kommandot körs"
|
|
|
|
|
|
msgid "print command execution profile"
|
|
|
msgstr "visa kommandoexekveringens profil"
|
|
|
|
|
|
msgid "output version information and exit"
|
|
|
msgstr "skriv versionsinformation och avsluta"
|
|
|
|
|
|
msgid "display help and exit"
|
|
|
msgstr "visa hjälp och avsluta"
|
|
|
|
|
|
msgid "do not perform actions, just print output"
|
|
|
msgstr "utför inget, bara visa"
|
|
|
|
|
|
msgid "specify ssh command to use"
|
|
|
msgstr "specificera ssh-kommando att använda"
|
|
|
|
|
|
msgid "specify hg command to run on the remote side"
|
|
|
msgstr "specificera hg-kommando att köra på andra sidan"
|
|
|
|
|
|
msgid "PATTERN"
|
|
|
msgstr "MÖNSTER"
|
|
|
|
|
|
msgid "include names matching the given patterns"
|
|
|
msgstr "inkludera namn som matchar de givna mönstren"
|
|
|
|
|
|
msgid "exclude names matching the given patterns"
|
|
|
msgstr "exkludera namn som matchar de givna mönstren"
|
|
|
|
|
|
msgid "use text as commit message"
|
|
|
msgstr "använd text som arkiveringsmeddelande"
|
|
|
|
|
|
msgid "read commit message from file"
|
|
|
msgstr "läs arkiveringsmeddelandet från fil"
|
|
|
|
|
|
msgid "record datecode as commit date"
|
|
|
msgstr "lagra datumkod som arkiveringsdatum"
|
|
|
|
|
|
msgid "record the specified user as committer"
|
|
|
msgstr "lagra den specificerade användaren som arkiverare"
|
|
|
|
|
|
msgid "STYLE"
|
|
|
msgstr "STIL"
|
|
|
|
|
|
msgid "display using template map file"
|
|
|
msgstr "visa med mallfil"
|
|
|
|
|
|
msgid "display with template"
|
|
|
msgstr "visa med mall"
|
|
|
|
|
|
msgid "do not show merges"
|
|
|
msgstr "visa inte sammanfogningar"
|
|
|
|
|
|
msgid "output diffstat-style summary of changes"
|
|
|
msgstr "visa sammanfattning av ändringar i diffstat-stil"
|
|
|
|
|
|
msgid "treat all files as text"
|
|
|
msgstr "behandla alla filer som text"
|
|
|
|
|
|
msgid "omit dates from diff headers"
|
|
|
msgstr "exkludera datum från diff-rubriker"
|
|
|
|
|
|
msgid "show which function each change is in"
|
|
|
msgstr "visa vilken funktion varje ändring är i"
|
|
|
|
|
|
msgid "produce a diff that undoes the changes"
|
|
|
msgstr "skapa en diff som ångrar ändringarna"
|
|
|
|
|
|
msgid "ignore white space when comparing lines"
|
|
|
msgstr "ignorera blanktecken när rader jämförs"
|
|
|
|
|
|
msgid "ignore changes in the amount of white space"
|
|
|
msgstr "ignorera ändringar av antalet blanktecken"
|
|
|
|
|
|
msgid "ignore changes whose lines are all blank"
|
|
|
msgstr "ignorera ändringar vars rader är tomma"
|
|
|
|
|
|
msgid "number of lines of context to show"
|
|
|
msgstr "antal sammanhangsrader att visa"
|
|
|
|
|
|
msgid "SIMILARITY"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "guess renamed files by similarity (0<=s<=100)"
|
|
|
msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
|
|
|
|
|
|
msgid "recurse into subrepositories"
|
|
|
msgstr "gå in i underarkiv"
|
|
|
|
|
|
msgid "[OPTION]... [FILE]..."
|
|
|
msgstr "[FLAGGA]... [FIL]..."
|
|
|
|
|
|
msgid "annotate the specified revision"
|
|
|
msgstr "annotera den specificerade revisionen"
|
|
|
|
|
|
msgid "follow copies/renames and list the filename (DEPRECATED)"
|
|
|
msgstr "följ kopieringar/namnbyten och visa filnamnet (FÖRLEGAD)"
|
|
|
|
|
|
msgid "don't follow copies and renames"
|
|
|
msgstr "följ inte kopieringar och namnbyten"
|
|
|
|
|
|
msgid "list the author (long with -v)"
|
|
|
msgstr "visa skapare (lång med -v)"
|
|
|
|
|
|
msgid "list the filename"
|
|
|
msgstr "visa filnamnet"
|
|
|
|
|
|
msgid "list the date (short with -q)"
|
|
|
msgstr "visa datum (kort med -q)"
|
|
|
|
|
|
msgid "list the revision number (default)"
|
|
|
msgstr "visa revisionsnummer (standard)"
|
|
|
|
|
|
msgid "list the changeset"
|
|
|
msgstr "visa ändring"
|
|
|
|
|
|
msgid "show line number at the first appearance"
|
|
|
msgstr "visa radnummer för första förekomsten"
|
|
|
|
|
|
msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
|
|
|
msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
|
|
|
|
|
|
msgid "do not pass files through decoders"
|
|
|
msgstr "passera inte filer genom dekoders"
|
|
|
|
|
|
msgid "PREFIX"
|
|
|
msgstr "PREFIX"
|
|
|
|
|
|
msgid "directory prefix for files in archive"
|
|
|
msgstr "katalogprefix för filer i arkiv"
|
|
|
|
|
|
msgid "revision to distribute"
|
|
|
msgstr "revision att distribuera"
|
|
|
|
|
|
msgid "type of distribution to create"
|
|
|
msgstr "distributionstyp att skapa"
|
|
|
|
|
|
msgid "[OPTION]... DEST"
|
|
|
msgstr "[FLAGGA]... DEST"
|
|
|
|
|
|
msgid "merge with old dirstate parent after backout"
|
|
|
msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning"
|
|
|
|
|
|
msgid "parent to choose when backing out merge"
|
|
|
msgstr "förälder att välja när en sammanfogning återkallas"
|
|
|
|
|
|
msgid "specify merge tool"
|
|
|
msgstr "ange sammanfogningsverktyg"
|
|
|
|
|
|
msgid "revision to backout"
|
|
|
msgstr "revision att återkalla"
|
|
|
|
|
|
msgid "[OPTION]... [-r] REV"
|
|
|
msgstr "[FLAGGA]... [-r] REV"
|
|
|
|
|
|
msgid "reset bisect state"
|
|
|
msgstr "återställ bisect-tillständ"
|
|
|
|
|
|
msgid "mark changeset good"
|
|
|
msgstr "markera ändringen som bra"
|
|
|
|
|
|
msgid "mark changeset bad"
|
|
|
msgstr "markera ändringen som dålig"
|
|
|
|
|
|
msgid "skip testing changeset"
|
|
|
msgstr "hoppa över test av ändring"
|
|
|
|
|
|
msgid "use command to check changeset state"
|
|
|
msgstr "använd kommando för att kontrollera ändringsstatus"
|
|
|
|
|
|
msgid "do not update to target"
|
|
|
msgstr "uppdatera inte till målet"
|
|
|
|
|
|
msgid "[-gbsr] [-U] [-c CMD] [REV]"
|
|
|
msgstr "[-gbsr] [-U] [-c KMD] [REV]"
|
|
|
|
|
|
msgid "set branch name even if it shadows an existing branch"
|
|
|
msgstr "sätt grennamnet även om det döljer en existerande gren"
|
|
|
|
|
|
msgid "reset branch name to parent branch name"
|
|
|
msgstr "återställ grennamn till förälderns grennamn"
|
|
|
|
|
|
msgid "[-fC] [NAME]"
|
|
|
msgstr "[-fC] [NAMN]"
|
|
|
|
|
|
msgid "show only branches that have unmerged heads"
|
|
|
msgstr "visa bara grenar som har icke-sammanfogade huvuden"
|
|
|
|
|
|
msgid "show normal and closed branches"
|
|
|
msgstr "visa normala och stängda grenar"
|
|
|
|
|
|
msgid "[-ac]"
|
|
|
msgstr "[-ac]"
|
|
|
|
|
|
msgid "run even when the destination is unrelated"
|
|
|
msgstr "kör även när destinationen är obesläktad"
|
|
|
|
|
|
msgid "a changeset intended to be added to the destination"
|
|
|
msgstr "en ändring avsedd att läggas till destinationen"
|
|
|
|
|
|
msgid "a specific branch you would like to bundle"
|
|
|
msgstr "en specifik gren du vill bunta"
|
|
|
|
|
|
msgid "a base changeset assumed to be available at the destination"
|
|
|
msgstr "en basändring som antas är tillgängliga i destinationen"
|
|
|
|
|
|
msgid "bundle all changesets in the repository"
|
|
|
msgstr "bunta alla ändringar i arkivet"
|
|
|
|
|
|
msgid "bundle compression type to use"
|
|
|
msgstr "typ av buntkompression att använda"
|
|
|
|
|
|
msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
|
|
|
msgstr "[-f] [-t TYP] [-a] [-r REV]... [--base REV]... FIL [DEST]"
|
|
|
|
|
|
msgid "print output to file with formatted name"
|
|
|
msgstr "skriv utmatning till fil med formatterat namn"
|
|
|
|
|
|
msgid "print the given revision"
|
|
|
msgstr "visa den angivna revisionen"
|
|
|
|
|
|
msgid "apply any matching decode filter"
|
|
|
msgstr "applicera valfritt överrensstämmande avkodningsfilter"
|
|
|
|
|
|
msgid "[OPTION]... FILE..."
|
|
|
msgstr "[FLAGGA]... FIL..."
|
|
|
|
|
|
msgid "the clone will include an empty working copy (only a repository)"
|
|
|
msgstr "klonen kommer add inkludera en tom arbetskopia (bara ett arkiv)"
|
|
|
|
|
|
msgid "revision, tag or branch to check out"
|
|
|
msgstr "revision, märke eller gren att hämta ut"
|
|
|
|
|
|
msgid "include the specified changeset"
|
|
|
msgstr "inkludera den angivna ändringen"
|
|
|
|
|
|
msgid "clone only the specified branch"
|
|
|
msgstr "klona bara den angivna grenen"
|
|
|
|
|
|
msgid "[OPTION]... SOURCE [DEST]"
|
|
|
msgstr "[FLAGGA]... KÄLLA [DEST]"
|
|
|
|
|
|
msgid "mark new/missing files as added/removed before committing"
|
|
|
msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
|
|
|
|
|
|
msgid "mark a branch as closed, hiding it from the branch list"
|
|
|
msgstr "markera en gren som stängd, och göm den från grenlistan"
|
|
|
|
|
|
msgid "record a copy that has already occurred"
|
|
|
msgstr "lagra en kopiering som redan har inträffat"
|
|
|
|
|
|
msgid "forcibly copy over an existing managed file"
|
|
|
msgstr "tvinga kopiering över en eixsterande hanterad fil"
|
|
|
|
|
|
msgid "[OPTION]... [SOURCE]... DEST"
|
|
|
msgstr "[FLAGGA]... [KÄLLA]... DEST"
|
|
|
|
|
|
msgid "[INDEX] REV1 REV2"
|
|
|
msgstr "[INDEX] REV1 REV2"
|
|
|
|
|
|
msgid "add single file mergeable changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add single file all revs append to"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add single file all revs overwrite"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "add new file at each rev"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[OPTION]... TEXT"
|
|
|
msgstr "[FLAGGA]... TEXT"
|
|
|
|
|
|
msgid "[COMMAND]"
|
|
|
msgstr "[KOMMANDO]"
|
|
|
|
|
|
msgid "show the command options"
|
|
|
msgstr "visa kommandoflaggor"
|
|
|
|
|
|
msgid "[-o] CMD"
|
|
|
msgstr "[-o] KMD"
|
|
|
|
|
|
msgid "use tags as labels"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "annotate with branch names"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "use dots for runs"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "separate elements by spaces"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[OPTION]... [FILE [REV]...]"
|
|
|
msgstr "[FLAGGA]... [FIL] [REV]...]"
|
|
|
|
|
|
msgid "try extended date formats"
|
|
|
msgstr "pröva utökade datumformat"
|
|
|
|
|
|
msgid "[-e] DATE [RANGE]"
|
|
|
msgstr "[-e] DATUM [SPANN]"
|
|
|
|
|
|
msgid "FILE REV"
|
|
|
msgstr "FIL REV"
|
|
|
|
|
|
msgid "[PATH]"
|
|
|
msgstr "[SÖKVÄG]"
|
|
|
|
|
|
msgid "revlog format"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "REPO NAMESPACE [KEY OLD NEW]"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "revision to rebuild to"
|
|
|
msgstr "revision att bygga om till"
|
|
|
|
|
|
msgid "[-r REV] [REV]"
|
|
|
msgstr "[-r REV] [REV]"
|
|
|
|
|
|
msgid "revision to debug"
|
|
|
msgstr "revision att debugga"
|
|
|
|
|
|
msgid "[-r REV] FILE"
|
|
|
msgstr "[-r REV] FIL"
|
|
|
|
|
|
msgid "REV1 [REV2]"
|
|
|
msgstr "REV1 [REV2]"
|
|
|
|
|
|
msgid "do not display the saved mtime"
|
|
|
msgstr "visa inte sparad mtime"
|
|
|
|
|
|
msgid "[OPTION]..."
|
|
|
msgstr "[FLAGGA]..."
|
|
|
|
|
|
msgid "revision to check"
|
|
|
msgstr "revision att kontrollera"
|
|
|
|
|
|
msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
|
|
|
msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
|
|
|
|
|
|
msgid "diff against the second parent"
|
|
|
msgstr "diffa mot den andra föräldern"
|
|
|
|
|
|
msgid "revisions to export"
|
|
|
msgstr "revisioner att exportera"
|
|
|
|
|
|
msgid "[OPTION]... [-o OUTFILESPEC] REV..."
|
|
|
msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
|
|
|
|
|
|
msgid "end fields with NUL"
|
|
|
msgstr "avsluta fält med NUL"
|
|
|
|
|
|
msgid "print all revisions that match"
|
|
|
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"
|
|
|
|
|
|
msgid "ignore case when matching"
|
|
|
msgstr "ignorera versaler/gemener vid matchning"
|
|
|
|
|
|
msgid "print only filenames and revisions that match"
|
|
|
msgstr "visa bara filnamn och revisioner som matchar"
|
|
|
|
|
|
msgid "print matching line numbers"
|
|
|
msgstr "visa matchande radnummer"
|
|
|
|
|
|
msgid "only search files changed within revision range"
|
|
|
msgstr "sök filer enbart inom ett givet revisionsområde"
|
|
|
|
|
|
msgid "[OPTION]... PATTERN [FILE]..."
|
|
|
msgstr "[FLAGGA]... MÖNSTER [FIL]..."
|
|
|
|
|
|
msgid "show only heads which are descendants of STARTREV"
|
|
|
msgstr "visa bara huvuden som är ättlingar till STARTREV"
|
|
|
|
|
|
msgid "STARTREV"
|
|
|
msgstr "STARTREV"
|
|
|
|
|
|
msgid "show topological heads only"
|
|
|
msgstr "visa bara topologiska huvuden"
|
|
|
|
|
|
msgid "show active branchheads only (DEPRECATED)"
|
|
|
msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
|
|
|
|
|
|
msgid "show normal and closed branch heads"
|
|
|
msgstr "visa normala och stängda grenhuvuden"
|
|
|
|
|
|
msgid "[-ac] [-r STARTREV] [REV]..."
|
|
|
msgstr "[-ac] [-r STARTREV] [REV]..."
|
|
|
|
|
|
msgid "[TOPIC]"
|
|
|
msgstr "[ÄMNE]"
|
|
|
|
|
|
msgid "identify the specified revision"
|
|
|
msgstr "identifiera den angivna revisionen"
|
|
|
|
|
|
msgid "show local revision number"
|
|
|
msgstr "visa lokala revisionsnummer"
|
|
|
|
|
|
msgid "show global revision id"
|
|
|
msgstr "visa globala revisions-id"
|
|
|
|
|
|
msgid "show branch"
|
|
|
msgstr "visa grenar"
|
|
|
|
|
|
msgid "show tags"
|
|
|
msgstr "visa märken"
|
|
|
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "PATH"
|
|
|
msgstr "SÖKVÄG"
|
|
|
|
|
|
msgid "base path"
|
|
|
msgstr "grundsökväg"
|
|
|
|
|
|
msgid "skip check for outstanding uncommitted changes"
|
|
|
msgstr "hoppa över kontroll av oarkiverade ändringar"
|
|
|
|
|
|
msgid "don't commit, just update the working directory"
|
|
|
msgstr "arkivera inte, uppdatera bara arbetskatalogen"
|
|
|
|
|
|
msgid "apply patch to the nodes from which it was generated"
|
|
|
msgstr "applicera patch till noderna som den genererades från"
|
|
|
|
|
|
msgid "use any branch information in patch (implied by --exact)"
|
|
|
msgstr "använd greninformation i patchen (implicit med --exact)"
|
|
|
|
|
|
msgid "[OPTION]... PATCH..."
|
|
|
msgstr "[FLAGGA]... PATCH..."
|
|
|
|
|
|
msgid "run even if remote repository is unrelated"
|
|
|
msgstr "kör även om fjärrarkivet är obesläktat"
|
|
|
|
|
|
msgid "show newest record first"
|
|
|
msgstr "visa nyaste saken först"
|
|
|
|
|
|
msgid "file to store the bundles into"
|
|
|
msgstr "fil att lagra buntarna i"
|
|
|
|
|
|
msgid "a remote changeset intended to be added"
|
|
|
msgstr "en fjärrändring som avses att läggas till"
|
|
|
|
|
|
msgid "a specific branch you would like to pull"
|
|
|
msgstr "en specifik gren som du vill dra"
|
|
|
|
|
|
msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
|
|
|
msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAMN] [KÄLLA]"
|
|
|
|
|
|
msgid "[-e CMD] [--remotecmd CMD] [DEST]"
|
|
|
msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
|
|
|
|
|
|
msgid "search the repository as it is in REV"
|
|
|
msgstr "sök igenom arkivet som det är vid REV"
|
|
|
|
|
|
msgid "end filenames with NUL, for use with xargs"
|
|
|
msgstr "filnamn slutar med NUL, för användning med xargs"
|
|
|
|
|
|
msgid "print complete paths from the filesystem root"
|
|
|
msgstr "visa kompletta sökvägar från filsystemsroten"
|
|
|
|
|
|
msgid "[OPTION]... [PATTERN]..."
|
|
|
msgstr "[FLAGGA]... [MÖNSTER]..."
|
|
|
|
|
|
msgid "only follow the first parent of merge changesets"
|
|
|
msgstr "följ bara den första föräldern vid sammanfogningar"
|
|
|
|
|
|
msgid "show revisions matching date spec"
|
|
|
msgstr "visa revisioner som matchar datumspecen"
|
|
|
|
|
|
msgid "show copied files"
|
|
|
msgstr "visa kopierade filer"
|
|
|
|
|
|
msgid "do case-insensitive search for a given text"
|
|
|
msgstr "gör versalokänslig sökning efter en given text"
|
|
|
|
|
|
msgid "include revisions where files were removed"
|
|
|
msgstr "inkludera revisioner där filer togs bort"
|
|
|
|
|
|
msgid "show only merges"
|
|
|
msgstr "visa bara sammanfogningar"
|
|
|
|
|
|
msgid "revisions committed by user"
|
|
|
msgstr "revisioner arkiverade av användare"
|
|
|
|
|
|
msgid "show only changesets within the given named branch (DEPRECATED)"
|
|
|
msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)"
|
|
|
|
|
|
msgid "show changesets within the given named branch"
|
|
|
msgstr "visa ändringar i den namngivna grenen"
|
|
|
|
|
|
msgid "do not display revision or any of its ancestors"
|
|
|
msgstr "visa inte revision eller någon av dess föräldrar"
|
|
|
|
|
|
msgid "[OPTION]... [FILE]"
|
|
|
msgstr "[FLAGGA]... [FIL]"
|
|
|
|
|
|
msgid "revision to display"
|
|
|
msgstr "revision att visa"
|
|
|
|
|
|
msgid "[-r REV]"
|
|
|
msgstr "[-r REV]"
|
|
|
|
|
|
msgid "force a merge with outstanding changes"
|
|
|
msgstr "tvinga en sammanfogning med utestående ändringar"
|
|
|
|
|
|
msgid "revision to merge"
|
|
|
msgstr "revision att sammanfoga"
|
|
|
|
|
|
msgid "review revisions to merge (no merge is performed)"
|
|
|
msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
|
|
|
|
|
|
msgid "[-P] [-f] [[-r] REV]"
|
|
|
msgstr "[-P] [-f] [[-r] REV]"
|
|
|
|
|
|
msgid "a changeset intended to be included in the destination"
|
|
|
msgstr "en ändring avsedd att inkluderas i destinationen"
|
|
|
|
|
|
msgid "a specific branch you would like to push"
|
|
|
msgstr "en specifik gren som du vill trycka"
|
|
|
|
|
|
msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
|
|
|
msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
|
|
|
|
|
|
msgid "show parents of the specified revision"
|
|
|
msgstr "visa föräldrar för den angivna revisionen"
|
|
|
|
|
|
msgid "[-r REV] [FILE]"
|
|
|
msgstr "[-r REV] [FIL]"
|
|
|
|
|
|
msgid "[NAME]"
|
|
|
msgstr "[NAMN]"
|
|
|
|
|
|
msgid "update to new branch head if changesets were pulled"
|
|
|
msgstr "uppdatera till nytt grenhuvud om ändringar drogs"
|
|
|
|
|
|
msgid "run even when remote repository is unrelated"
|
|
|
msgstr "kör även när fjärrarkivet är orelaterat"
|
|
|
|
|
|
msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
|
|
|
msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
|
|
|
|
|
|
msgid "force push"
|
|
|
msgstr "tvinga tryckning"
|
|
|
|
|
|
msgid "allow pushing a new branch"
|
|
|
msgstr "tillåt att trycka en ny gren"
|
|
|
|
|
|
msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
|
|
|
msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
|
|
|
|
|
|
msgid "record delete for missing files"
|
|
|
msgstr "markera saknade filer för radering"
|
|
|
|
|
|
msgid "remove (and delete) file even if added or modified"
|
|
|
msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
|
|
|
|
|
|
msgid "record a rename that has already occurred"
|
|
|
msgstr "spara en namnändring som redan har inträffat"
|
|
|
|
|
|
msgid "[OPTION]... SOURCE... DEST"
|
|
|
msgstr "[FLAGGA]... KÄLLA... DEST"
|
|
|
|
|
|
msgid "select all unresolved files"
|
|
|
msgstr "välj alla olösta filer"
|
|
|
|
|
|
msgid "list state of files needing merge"
|
|
|
msgstr "visa status för filer som behöver sammanfogas"
|
|
|
|
|
|
msgid "mark files as resolved"
|
|
|
msgstr "markera filer som lösta"
|
|
|
|
|
|
msgid "mark files as unresolved"
|
|
|
msgstr "markera filer som olösta"
|
|
|
|
|
|
msgid "hide status prefix"
|
|
|
msgstr "göm statusprefix"
|
|
|
|
|
|
msgid "revert all changes when no arguments given"
|
|
|
msgstr "återställ alla ändringar när inga argument ges"
|
|
|
|
|
|
msgid "tipmost revision matching date"
|
|
|
msgstr "senaste revision matchande datum"
|
|
|
|
|
|
msgid "revert to the specified revision"
|
|
|
msgstr "återgå till den angivna revisionen"
|
|
|
|
|
|
msgid "do not save backup copies of files"
|
|
|
msgstr "spara inte backup-kopior av filer"
|
|
|
|
|
|
msgid "[OPTION]... [-r REV] [NAME]..."
|
|
|
msgstr "[FLAGGA]... [-r REV] [NAMN]..."
|
|
|
|
|
|
msgid "name of access log file to write to"
|
|
|
msgstr "namn på åtkomstlogg att skriva till"
|
|
|
|
|
|
msgid "name of error log file to write to"
|
|
|
msgstr "namn på fellogg att skriva till"
|
|
|
|
|
|
msgid "PORT"
|
|
|
msgstr "PORT"
|
|
|
|
|
|
msgid "port to listen on (default: 8000)"
|
|
|
msgstr "port att lyssna på (standard: 8000)"
|
|
|
|
|
|
msgid "ADDR"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "address to listen on (default: all interfaces)"
|
|
|
msgstr "adress att lyssna på (standard alla gränssnitt)"
|
|
|
|
|
|
msgid "prefix path to serve from (default: server root)"
|
|
|
msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
|
|
|
|
|
|
msgid "name to show in web pages (default: working directory)"
|
|
|
msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
|
|
|
|
|
|
msgid "name of the hgweb config file (see \"hg help hgweb\")"
|
|
|
msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
|
|
|
|
|
|
msgid "name of the hgweb config file (DEPRECATED)"
|
|
|
msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
|
|
|
|
|
|
msgid "for remote clients"
|
|
|
msgstr "för fjärrklienter"
|
|
|
|
|
|
msgid "web templates to use"
|
|
|
msgstr "webbmallar att använda"
|
|
|
|
|
|
msgid "template style to use"
|
|
|
msgstr "mallstil att använda"
|
|
|
|
|
|
msgid "use IPv6 in addition to IPv4"
|
|
|
msgstr "använd IPv6 förutom IPv4"
|
|
|
|
|
|
msgid "SSL certificate file"
|
|
|
msgstr "SSL-certifikatsfil"
|
|
|
|
|
|
msgid "show untrusted configuration options"
|
|
|
msgstr "visa opålitliga konfigurationsalternativ"
|
|
|
|
|
|
msgid "[-u] [NAME]..."
|
|
|
msgstr "[-u] [NAMN]..."
|
|
|
|
|
|
msgid "check for push and pull"
|
|
|
msgstr "sök efter inkommande och utgående ändringar"
|
|
|
|
|
|
msgid "show status of all files"
|
|
|
msgstr "visa status för alla filer"
|
|
|
|
|
|
msgid "show only modified files"
|
|
|
msgstr "visa bara modifierade filer"
|
|
|
|
|
|
msgid "show only added files"
|
|
|
msgstr "visa bara adderade filer"
|
|
|
|
|
|
msgid "show only removed files"
|
|
|
msgstr "visa bara raderade filer"
|
|
|
|
|
|
msgid "show only deleted (but tracked) files"
|
|
|
msgstr "visa bara borttagna (men spårade) filer"
|
|
|
|
|
|
msgid "show only files without changes"
|
|
|
msgstr "visa bara filer utan ändringar"
|
|
|
|
|
|
msgid "show only unknown (not tracked) files"
|
|
|
msgstr "visa bara okända (ospårade) filer"
|
|
|
|
|
|
msgid "show only ignored files"
|
|
|
msgstr "visa bara ignorerade filer"
|
|
|
|
|
|
msgid "show source of copied files"
|
|
|
msgstr "visa källan för kopierade filer"
|
|
|
|
|
|
msgid "show difference from revision"
|
|
|
msgstr "visa differens från revision"
|
|
|
|
|
|
msgid "list the changed files of a revision"
|
|
|
msgstr "visa de ändrade filerna från en revision"
|
|
|
|
|
|
msgid "replace existing tag"
|
|
|
msgstr "ersätt existerande märke"
|
|
|
|
|
|
msgid "make the tag local"
|
|
|
msgstr "gör märket lokalt"
|
|
|
|
|
|
msgid "revision to tag"
|
|
|
msgstr "revision att märka"
|
|
|
|
|
|
msgid "remove a tag"
|
|
|
msgstr "ta bort ett märke"
|
|
|
|
|
|
msgid "use <text> as commit message"
|
|
|
msgstr "använd <text> som arkiveringsmeddelande"
|
|
|
|
|
|
msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
|
|
|
msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..."
|
|
|
|
|
|
msgid "[-p] [-g]"
|
|
|
msgstr "[-p] [-g]"
|
|
|
|
|
|
msgid "update to new branch head if changesets were unbundled"
|
|
|
msgstr "uppdatera till nytt grenhuvud om ändringar packades upp"
|
|
|
|
|
|
msgid "[-u] FILE..."
|
|
|
msgstr "[-u] FIL..."
|
|
|
|
|
|
msgid "discard uncommitted changes (no backup)"
|
|
|
msgstr "kassera oarkiverade ändringar (ingen backup)"
|
|
|
|
|
|
msgid "update across branches if no uncommitted changes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "[-c] [-C] [-d DATE] [[-r] REV]"
|
|
|
msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot include %s (%s)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "not found in manifest"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no such file in rev %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "branch name not in UTF-8!"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s does not exist!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"%s: up to %d MB of RAM may be required to manage this file\n"
|
|
|
"(use 'hg revert %s' to cancel the pending addition)\n"
|
|
|
msgstr ""
|
|
|
"%s: upp till %d MB RAM kan behövas för att hantera denna fil\n"
|
|
|
"(använd 'hg revert %s' för att ångra den väntande additionen)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not added: only files and symlinks supported currently\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s already tracked!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not added!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s still exists!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not tracked!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not removed!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "copy failed: %s is not a file or a symbolic link\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid character in dag description: %s..."
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "expected id %i, got %i"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "parent id %i is larger than current id %i"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid event type in dag: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "working directory state appears damaged!"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'\\n' and '\\r' disallowed in filenames: %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "directory %r already in dirstate"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "file %r in dirstate clashes with %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "setting %r to other parent only allowed in merges"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not in dirstate: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unknown"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "character device"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "block device"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "fifo"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "socket"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "directory"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unsupported file type (type is %s)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "searching for changes\n"
|
|
|
msgstr "söker efter ändringar\n"
|
|
|
|
|
|
msgid "queries"
|
|
|
msgstr "frågor"
|
|
|
|
|
|
msgid "searching"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "already have changeset "
|
|
|
msgstr "har redan ändringen "
|
|
|
|
|
|
msgid "warning: repository is unrelated\n"
|
|
|
msgstr "varning: arkivet är obesälktat\n"
|
|
|
|
|
|
msgid "repository is unrelated"
|
|
|
msgstr "arkivet är obesläktat"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "push creates new remote branches: %s!"
|
|
|
msgstr "push skapar nya fjärrhuvuden: %s!"
|
|
|
|
|
|
msgid "use 'hg push --new-branch' to create new remote branches"
|
|
|
msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "push creates new remote heads on branch '%s'!"
|
|
|
msgstr "push skapar nya fjärrhuvuden på grenen '%s'!"
|
|
|
|
|
|
msgid "push creates new remote heads!"
|
|
|
msgstr "push skapar nya fjärrhuvuden!"
|
|
|
|
|
|
msgid "you should pull and merge or use push -f to force"
|
|
|
msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga"
|
|
|
|
|
|
msgid "did you forget to merge? use push -f to force"
|
|
|
msgstr "glömde du att sammanfoga? använd push -f för att tvinga"
|
|
|
|
|
|
msgid "note: unsynced remote changes!\n"
|
|
|
msgstr "notera: osynkade fjärrändringar!\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: %s\n"
|
|
|
msgstr "avbryter: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(%s)\n"
|
|
|
msgstr "(%s)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg: parse error at %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg: parse error: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "entering debugger - type c to continue starting hg or h for help\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"hg: command '%s' is ambiguous:\n"
|
|
|
" %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "timed out waiting for lock held by %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "lock held by %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: could not lock %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: %s!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " empty string\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "killed!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "hg: unknown command '%s'\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "(did you forget to compile extensions?)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "(is your Python install correct?)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "abort: error: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "broken pipe\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "interrupted!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"broken pipe\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "abort: out of memory\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "** unknown exception encountered, please report by visiting\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "** Python %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "** Mercurial Distributed SCM (version %s)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "** Extensions loaded: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no definition for alias '%s'\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"error in definition for alias '%s': %s may only be given on the command "
|
|
|
"line\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "alias '%s' resolves to unknown command '%s'\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "alias '%s' resolves to ambiguous command '%s'\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "malformed --config option: %r (use --config section.name=value)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error getting current working directory: %s"
|
|
|
msgstr "fel när nuvarande arbetskatalog hämtades: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "extension '%s' overrides commands: %s\n"
|
|
|
msgstr "utökningen '%s' tar över dessa kommandon: %s\n"
|
|
|
|
|
|
msgid "option --config may not be abbreviated!"
|
|
|
msgstr ""
|
|
|
|
|
|
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!"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "repository '%s' is not local"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "warning: --repository ignored\n"
|
|
|
msgstr "varning: --repository ignorerades\n"
|
|
|
|
|
|
msgid "invalid arguments"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unrecognized profiling format '%s' - Ignored\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
|
|
|
"misc/lsprof/"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "*** failed to import extension %s from %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "*** failed to import extension %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "couldn't find merge tool %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tool %s can't handle symlinks\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tool %s can't handle binary\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "tool %s requires a GUI\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" no tool found to merge %s\n"
|
|
|
"keep (l)ocal or take (o)ther?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Local"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Other"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging %s and %s to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "was merge of '%s' successful (yn)?"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" output file %s appears unchanged\n"
|
|
|
"was merge successful (yn)?"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "merging %s failed!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "starting revisions are not directly related"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "inconsistent state, %s:%s is good and bad"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown bisect kind %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "disabled extensions:"
|
|
|
msgstr "deaktiverade utökningar:"
|
|
|
|
|
|
msgid "Configuration Files"
|
|
|
msgstr "Konfigurationsfiler"
|
|
|
|
|
|
msgid "Date Formats"
|
|
|
msgstr "Datumformat"
|
|
|
|
|
|
msgid "File Name Patterns"
|
|
|
msgstr "Filnamnsmönster"
|
|
|
|
|
|
msgid "Environment Variables"
|
|
|
msgstr "Miljövariabler"
|
|
|
|
|
|
msgid "Specifying Single Revisions"
|
|
|
msgstr "Ange En Revision"
|
|
|
|
|
|
msgid "Specifying Multiple Revisions"
|
|
|
msgstr "Ange Flera Revisioner"
|
|
|
|
|
|
msgid "Specifying Revision Sets"
|
|
|
msgstr "Ange Revisionsset"
|
|
|
|
|
|
msgid "Diff Formats"
|
|
|
msgstr "Diff-format"
|
|
|
|
|
|
msgid "Merge Tools"
|
|
|
msgstr "Sammanfogningsverktyg"
|
|
|
|
|
|
msgid "Template Usage"
|
|
|
msgstr "Användning Av Mallar"
|
|
|
|
|
|
msgid "URL Paths"
|
|
|
msgstr "URL-sökvägar"
|
|
|
|
|
|
msgid "Using additional features"
|
|
|
msgstr "Använda ytterligare funktioner"
|
|
|
|
|
|
msgid "Subrepositories"
|
|
|
msgstr "Underarkiv"
|
|
|
|
|
|
msgid "Configuring hgweb"
|
|
|
msgstr "Konfiguration av hgweb"
|
|
|
|
|
|
msgid "Glossary"
|
|
|
msgstr "Ordlista"
|
|
|
|
|
|
msgid ""
|
|
|
"Mercurial reads configuration data from several files, if they exist.\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"
|
|
|
"- ``%HOME%\\.hgrc``\n"
|
|
|
"- ``%HOME%\\mercurial.ini``\n"
|
|
|
"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
|
|
|
"ini found)\n"
|
|
|
"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
|
|
|
"ini found)\n"
|
|
|
"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
|
|
|
"- ``<hg.exe-dir>\\mercurial.ini``"
|
|
|
msgstr ""
|
|
|
"- ``<arkiv>\\.hg\\hgrc``\n"
|
|
|
"- ``%USERPROFILE%\\.hgrc``\n"
|
|
|
"- ``%USERPROFILE%\\mercurial.ini``\n"
|
|
|
"- ``%HOME%\\.hgrc``\n"
|
|
|
"- ``%HOME%\\mercurial.ini``\n"
|
|
|
"- ``C:\\mercurial\\mercurial.ini`` (om inte registernyckel eller hgrc.d\\ "
|
|
|
"eller mercurial.ini hittas)\n"
|
|
|
"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (om inte hgrc.d\\ eller "
|
|
|
"mercurial.ini hittas)\n"
|
|
|
"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (om inte mercurial.ini hittas)\n"
|
|
|
"- ``<hg.exe-dir>\\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``"
|
|
|
|
|
|
msgid ""
|
|
|
"If there is a per-repository configuration file which is not owned by\n"
|
|
|
"the active user, Mercurial will warn you that the file is skipped::"
|
|
|
msgstr ""
|
|
|
"Om det finns en arkivkonfigurationsfil som inte ägs av den aktiva\n"
|
|
|
"användaren, kommer Mercurial att varna dig att filen ignoreras::"
|
|
|
|
|
|
msgid ""
|
|
|
" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
|
|
|
msgstr ""
|
|
|
" Litar inte på filen <arkiv>/.hg/hgrc från opålitlig användare ANVÄNDARE,\n"
|
|
|
" grupp GRUPP"
|
|
|
|
|
|
msgid ""
|
|
|
"If this bothers you, the warning can be silenced (the file would still\n"
|
|
|
"be ignored) or trust can be established. Use one of the following\n"
|
|
|
"settings, the syntax is explained below:"
|
|
|
msgstr ""
|
|
|
"Om det stör dig, så kan varningen tystas (filen kommer fortfarande att\n"
|
|
|
"ignoreras) eller du kan tala om att vederbörande är tillförlitlig. Använd\n"
|
|
|
"en av de följande inställningarna. Den första raden tystar varningarna, de\n"
|
|
|
"två andra visar att du litar på användaren:"
|
|
|
|
|
|
msgid ""
|
|
|
"- ``ui.report_untrusted = False``\n"
|
|
|
"- ``trusted.users = USER``\n"
|
|
|
"- ``trusted.groups = GROUP``"
|
|
|
msgstr ""
|
|
|
"- ``ui.report_untrusted = False``\n"
|
|
|
"- ``trusted.users = ANVÄNDARE``\n"
|
|
|
"- ``trusted.groups = GRUPP``"
|
|
|
|
|
|
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``::"
|
|
|
|
|
|
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"
|
|
|
|
|
|
msgid ""
|
|
|
"The 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:"
|
|
|
|
|
|
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.:"
|
|
|
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."
|
|
|
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"
|
|
|
"- ``Dec 6`` (midnight)\n"
|
|
|
"- ``13:18`` (today assumed)\n"
|
|
|
"- ``3:39`` (3:39AM assumed)\n"
|
|
|
"- ``3:39pm`` (15:39)\n"
|
|
|
"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n"
|
|
|
"- ``2006-12-6 13:18``\n"
|
|
|
"- ``2006-12-6``\n"
|
|
|
"- ``12-6``\n"
|
|
|
"- ``12/6``\n"
|
|
|
"- ``12/6/6`` (Dec 6 2006)"
|
|
|
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"
|
|
|
"- ``Dec 6`` (midnatt)\n"
|
|
|
"- ``13:18`` (idag antas)\n"
|
|
|
"- ``3:39`` (3:39 på natten antas)\n"
|
|
|
"- ``3:39pm`` (15:39)\n"
|
|
|
"- ``2006-12-06 13:18:29`` (ISO 8601-format)\n"
|
|
|
"- ``2006-12-6 13:18``\n"
|
|
|
"- ``2006-12-6``\n"
|
|
|
"- ``12-6``\n"
|
|
|
"- ``12/6``\n"
|
|
|
"- ``12/6/6`` (Dec 6 2006)"
|
|
|
|
|
|
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)."
|
|
|
|
|
|
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"
|
|
|
"- ``-{dagar}`` - inom ett givet antal dagar från idag\n"
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"While this standard format is often enough, it does not encode the\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"
|
|
|
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."
|
|
|
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."
|
|
|
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 configuration file. You do not need to set this option\n"
|
|
|
"when importing diffs in this format or using them in the mq extension.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"HG\n"
|
|
|
" Path to the 'hg' executable, automatically passed when running\n"
|
|
|
" 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."
|
|
|
msgstr ""
|
|
|
"HG\n"
|
|
|
" Sökväg till den exekverbara filen 'hg', skickas automatiskt med när\n"
|
|
|
" hakar, utökningar eller externa verktyg körs. Om osatt eller tom, så är\n"
|
|
|
" det här hg:s körbara namn om den är frysen, eller en exekverbar fil vid\n"
|
|
|
" namnet 'hg' (med tillägget %PATHEXT% [COM/EXE/BAT/CMD som standard] på\n"
|
|
|
" Windows) sökes."
|
|
|
|
|
|
msgid ""
|
|
|
"HGEDITOR\n"
|
|
|
" This is the name of the editor to run when committing. See EDITOR."
|
|
|
msgstr ""
|
|
|
"HGEDITOR\n"
|
|
|
" Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR."
|
|
|
|
|
|
msgid " (deprecated, use configuration file)"
|
|
|
msgstr " (föråldrad, använd konfigurationsfilen)"
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"HGENCODINGAMBIGUOUS\n"
|
|
|
" This sets Mercurial's behavior for handling characters with\n"
|
|
|
" \"ambiguous\" widths like accented Latin characters with East Asian\n"
|
|
|
" fonts. By default, Mercurial assumes ambiguous characters are\n"
|
|
|
" narrow, set this variable to \"wide\" if such characters cause\n"
|
|
|
" formatting problems."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"HGRCPATH\n"
|
|
|
" A list of files or directories to search for configuration\n"
|
|
|
" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
|
|
|
" is not set, platform default search path is used. If empty, only\n"
|
|
|
" the .hg/hgrc 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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"HGPLAIN\n"
|
|
|
" When set, this disables any configuration settings that might\n"
|
|
|
" change Mercurial's default output. This includes encoding,\n"
|
|
|
" defaults, 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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Equivalent options set via command line flags or environment\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:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - HGUSER (deprecated)\n"
|
|
|
" - configuration files from the HGRCPATH\n"
|
|
|
" - EMAIL\n"
|
|
|
" - interactive prompt\n"
|
|
|
" - LOGNAME (with ``@hostname`` appended)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"EMAIL\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"VISUAL\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'."
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"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."
|
|
|
msgstr ""
|
|
|
"Mercurial har förmågan att lägga till nya funktioner genom utökningar.\n"
|
|
|
"Utökningar kan lägga till nya kommandon, lägga till flaggor till\n"
|
|
|
"existerande kommandon, ändra hur ett kommando beter sig, eller\n"
|
|
|
"implementera hakar."
|
|
|
|
|
|
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."
|
|
|
msgstr ""
|
|
|
"Utökningar laddas inte som standard av ett antal orsaker: de kan göra att\n"
|
|
|
"Mercurial startar långsammare; de kan vara avsedda för avancerat\n"
|
|
|
"användning; de kan tillföra potentiellt farliga förmågor (som att låta dig\n"
|
|
|
"förstöra eller modifiera historik); de kanske inte är redo för fullskalig\n"
|
|
|
"användning än; eller de kan förändra beteendet för Mercurial. Det är därför\n"
|
|
|
"upp till användaren att aktiverade utökningar om de behövs."
|
|
|
|
|
|
msgid ""
|
|
|
"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
|
|
|
"Python search path, create an entry for it in your configuration file,\n"
|
|
|
"like this::"
|
|
|
msgstr ""
|
|
|
"För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n"
|
|
|
"eller finns i Pythons sökväg, skapa en post för den i din\n"
|
|
|
"konfigurationsfil, så här::"
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\n"
|
|
|
" foo ="
|
|
|
msgstr ""
|
|
|
" [extensions]\n"
|
|
|
" foo ="
|
|
|
|
|
|
msgid "You may also specify the full path to an extension::"
|
|
|
msgstr "Du kan också ange den fullständiga sökvägen till en utökning::"
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\n"
|
|
|
" myfeature = ~/.hgext/myfeature.py"
|
|
|
msgstr ""
|
|
|
" [extensions]\n"
|
|
|
" minfunktion = ~/.hgext/minfunktion.py"
|
|
|
|
|
|
msgid ""
|
|
|
"To explicitly disable an extension enabled in a configuration file of\n"
|
|
|
"broader scope, prepend its path with !::"
|
|
|
msgstr ""
|
|
|
"För att explicit deaktivera en utökning som aktiverats i en\n"
|
|
|
"konfigurationsfil med större omfång, börja dess sökväg med !::"
|
|
|
|
|
|
msgid ""
|
|
|
" [extensions]\n"
|
|
|
" # disabling extension bar residing in /path/to/extension/bar.py\n"
|
|
|
" bar = !/path/to/extension/bar.py\n"
|
|
|
" # ditto, but no path was supplied for extension baz\n"
|
|
|
" baz = !\n"
|
|
|
msgstr ""
|
|
|
" [extensions]\n"
|
|
|
" # deaktiverar utökningen bar som finns i /sökväg/till/utökningen/bar.py\n"
|
|
|
" bar = !/sökväg/till/utökningen/bar.py\n"
|
|
|
" # samma sak, men ingen sökväg angavs för utökningen baz\n"
|
|
|
" baz = !\n"
|
|
|
|
|
|
msgid ""
|
|
|
"Ancestor\n"
|
|
|
" Any changeset that can be reached by an unbroken chain of parent\n"
|
|
|
" changesets from a given changeset. More precisely, the ancestors\n"
|
|
|
" of a changeset can be defined by two properties: a parent of a\n"
|
|
|
" changeset is an ancestor, and a parent of an ancestor is an\n"
|
|
|
" ancestor. See also: 'Descendant'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch\n"
|
|
|
" (Noun) A child changeset that has been created from a parent that\n"
|
|
|
" is not a head. These are known as topological branches, see\n"
|
|
|
" 'Branch, topological'. If a topological branch is named, it becomes\n"
|
|
|
" a named branch. If a topological branch is not named, it becomes\n"
|
|
|
" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Branches may be created when changes are pulled from or pushed to\n"
|
|
|
" a remote repository, since new heads may be created by these\n"
|
|
|
" operations. Note that the term branch can also be used informally\n"
|
|
|
" to describe a development process in which certain development is\n"
|
|
|
" done independently of other development. This is sometimes done\n"
|
|
|
" explicitly with a named branch, but it can also be done locally,\n"
|
|
|
" using bookmarks or clones and anonymous branches."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"The experimental branch\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) The action of creating a child changeset which results in\n"
|
|
|
" its parent having more than one child."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I'm going to branch at X\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, anonymous\n"
|
|
|
" Every time a new child changeset is created from a parent that is not\n"
|
|
|
" a head and the name of the branch is not changed, a new anonymous\n"
|
|
|
" branch is created."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, closed\n"
|
|
|
" A named branch whose branch heads have all been closed."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, default\n"
|
|
|
" The branch assigned to a changeset when no name has previously been\n"
|
|
|
" assigned."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch head\n"
|
|
|
" See 'Head, branch'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, inactive\n"
|
|
|
" If a named branch has no topological heads, it is considered to be\n"
|
|
|
" inactive. As an example, a feature branch becomes inactive when it\n"
|
|
|
" is merged into the default branch. The :hg:`branches` command\n"
|
|
|
" shows inactive branches by default, though they can be hidden with\n"
|
|
|
" :hg:`branches --active`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" NOTE: this concept is deprecated because it is too implicit.\n"
|
|
|
" Branches should now be explicitly closed using :hg:`commit\n"
|
|
|
" --close-branch` when they are no longer needed."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, named\n"
|
|
|
" A collection of changesets which have the same branch name. By\n"
|
|
|
" default, children of a changeset in a named branch belong to the\n"
|
|
|
" same named branch. A child can be explicitly assigned to a\n"
|
|
|
" different branch. See :hg:`help branch`, :hg:`help branches` and\n"
|
|
|
" :hg:`commit --close-branch` for more information on managing\n"
|
|
|
" branches."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Named branches can be thought of as a kind of namespace, dividing\n"
|
|
|
" the collection of changesets that comprise the repository into a\n"
|
|
|
" collection of disjoint subsets. A named branch is not necessarily\n"
|
|
|
" a topological branch. If a new named branch is created from the\n"
|
|
|
" head of another named branch, or the default branch, but no\n"
|
|
|
" further changesets are added to that previous branch, then that\n"
|
|
|
" previous branch will be a branch in name only."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch tip\n"
|
|
|
" See 'Tip, branch'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Branch, topological\n"
|
|
|
" Every time a new child changeset is created from a parent that is\n"
|
|
|
" not a head, a new topological branch is created. If a topological\n"
|
|
|
" branch is named, it becomes a named branch. If a topological\n"
|
|
|
" branch is not named, it becomes an anonymous branch of the\n"
|
|
|
" current, possibly default, branch."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changelog\n"
|
|
|
" A record of the changesets in the order in which they were added\n"
|
|
|
" to the repository. This includes details such as changeset id,\n"
|
|
|
" author, commit message, date, and list of changed files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changeset\n"
|
|
|
" A snapshot of the state of the repository used to record a change."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changeset, child\n"
|
|
|
" The converse of parent changeset: if P is a parent of C, then C is\n"
|
|
|
" a child of P. There is no limit to the number of children that a\n"
|
|
|
" changeset may have."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changeset id\n"
|
|
|
" A SHA-1 hash that uniquely identifies a changeset. It may be\n"
|
|
|
" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
|
|
|
" \"short\" 12 hexadecimal digit string."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changeset, merge\n"
|
|
|
" A changeset with two parents. This occurs when a merge is\n"
|
|
|
" committed."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Changeset, parent\n"
|
|
|
" A revision upon which a child changeset is based. Specifically, a\n"
|
|
|
" parent changeset of a changeset C is a changeset whose node\n"
|
|
|
" immediately precedes C in the DAG. Changesets have at most two\n"
|
|
|
" parents."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Checkout\n"
|
|
|
" (Noun) The working directory being updated to a specific\n"
|
|
|
" revision. This use should probably be avoided where possible, as\n"
|
|
|
" changeset is much more appropriate than checkout in this context."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I'm using checkout X.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) Updating the working directory to a specific changeset. See\n"
|
|
|
" :hg:`help update`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I'm going to check out changeset X.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Child changeset\n"
|
|
|
" See 'Changeset, child'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Close changeset\n"
|
|
|
" See 'Changeset, close'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Closed branch\n"
|
|
|
" See 'Branch, closed'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Clone\n"
|
|
|
" (Noun) An entire or partial copy of a repository. The partial\n"
|
|
|
" clone must be in the form of a revision and its ancestors."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"Is your clone up to date?\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " (Verb) The process of creating a clone, using :hg:`clone`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I'm going to clone the repository\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Closed branch head\n"
|
|
|
" See 'Head, closed branch'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Commit\n"
|
|
|
" (Noun) A synonym for changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"Is the bug fixed in your recent commit?\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) The act of recording changes to a repository. When files\n"
|
|
|
" are committed in a working directory, Mercurial finds the\n"
|
|
|
" differences between the committed files and their parent\n"
|
|
|
" changeset, creating a new changeset in the repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"You should commit those changes now.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Cset\n"
|
|
|
" A common abbreviation of the term changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"DAG\n"
|
|
|
" The repository of changesets of a distributed version control\n"
|
|
|
" system (DVCS) can be described as a directed acyclic graph (DAG),\n"
|
|
|
" consisting of nodes and edges, where nodes correspond to\n"
|
|
|
" changesets and edges imply a parent -> child relation. This graph\n"
|
|
|
" can be visualized by graphical tools such as :hg:`glog`\n"
|
|
|
" (graphlog). In Mercurial, the DAG is limited by the requirement\n"
|
|
|
" for children to have at most two parents."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Default branch\n"
|
|
|
" See 'Branch, default'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Descendant\n"
|
|
|
" Any changeset that can be reached by a chain of child changesets\n"
|
|
|
" from a given changeset. More precisely, the descendants of a\n"
|
|
|
" changeset can be defined by two properties: the child of a\n"
|
|
|
" changeset is a descendant, and the child of a descendant is a\n"
|
|
|
" descendant. See also: 'Ancestor'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Diff\n"
|
|
|
" (Noun) The difference between the contents and attributes of files\n"
|
|
|
" in two changesets or a changeset and the current working\n"
|
|
|
" directory. The difference is usually represented in a standard\n"
|
|
|
" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n"
|
|
|
" when the changes include copies, renames, or changes to file\n"
|
|
|
" attributes, none of which can be represented/handled by classic\n"
|
|
|
" \"diff\" and \"patch\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"Did you see my correction in the diff?\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) Diffing two changesets is the action of creating a diff or\n"
|
|
|
" patch."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Example: \"If you diff with changeset X, you will see what I mean.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Directory, working\n"
|
|
|
" The working directory represents the state of the files tracked by\n"
|
|
|
" Mercurial, that will be recorded in the next commit. The working\n"
|
|
|
" directory initially corresponds to the snapshot at an existing\n"
|
|
|
" changeset, known as the parent of the working directory. See\n"
|
|
|
" 'Parent, working directory'. The state may be modified by changes\n"
|
|
|
" to the files introduced manually or by a merge. The repository\n"
|
|
|
" metadata exists in the .hg directory inside the working directory."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Graph\n"
|
|
|
" See DAG and :hg:`help graphlog`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Head\n"
|
|
|
" The term 'head' may be used to refer to both a branch head or a\n"
|
|
|
" repository head, depending on the context. See 'Head, branch' and\n"
|
|
|
" 'Head, repository' for specific definitions."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Heads are where development generally takes place and are the\n"
|
|
|
" usual targets for update and merge operations."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Head, branch\n"
|
|
|
" A changeset with no descendants on the same named branch."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Head, closed branch\n"
|
|
|
" A changeset that marks a head as no longer interesting. The closed\n"
|
|
|
" head is no longer listed by :hg:`heads`. A branch is considered\n"
|
|
|
" closed when all its heads are closed and consequently is not\n"
|
|
|
" listed by :hg:`branches`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Head, repository\n"
|
|
|
" A topological head which has not been closed."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Head, topological\n"
|
|
|
" A changeset with no children in the repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"History, immutable\n"
|
|
|
" Once committed, changesets cannot be altered. Extensions which\n"
|
|
|
" appear to change history actually create new changesets that\n"
|
|
|
" replace existing ones, and then destroy the old changesets. Doing\n"
|
|
|
" so in public repositories can result in old changesets being\n"
|
|
|
" reintroduced to the repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"History, rewriting\n"
|
|
|
" The changesets in a repository are immutable. However, extensions\n"
|
|
|
" to Mercurial can be used to alter the repository, usually in such\n"
|
|
|
" a way as to preserve changeset contents."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Immutable history\n"
|
|
|
" See 'History, immutable'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Merge changeset\n"
|
|
|
" See 'Changeset, merge'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Manifest\n"
|
|
|
" Each changeset has a manifest, which is the list of files that are\n"
|
|
|
" tracked by the changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Merge\n"
|
|
|
" Used to bring together divergent branches of work. When you update\n"
|
|
|
" to a changeset and then merge another changeset, you bring the\n"
|
|
|
" history of the latter changeset into your working directory. Once\n"
|
|
|
" conflicts are resolved (and marked), this merge may be committed\n"
|
|
|
" as a merge changeset, bringing two branches together in the DAG."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Named branch\n"
|
|
|
" See 'Branch, named'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Null changeset\n"
|
|
|
" The empty changeset. It is the parent state of newly-initialized\n"
|
|
|
" repositories and repositories with no checked out revision. It is\n"
|
|
|
" thus the parent of root changesets and the effective ancestor when\n"
|
|
|
" merging unrelated changesets. Can be specified by the alias 'null'\n"
|
|
|
" or by the changeset ID '000000000000'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Parent\n"
|
|
|
" See 'Changeset, parent'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Parent changeset\n"
|
|
|
" See 'Changeset, parent'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Parent, working directory\n"
|
|
|
" The working directory parent reflects a virtual revision which is\n"
|
|
|
" the child of the changeset (or two changesets with an uncommitted\n"
|
|
|
" merge) shown by :hg:`parents`. This is changed with\n"
|
|
|
" :hg:`update`. Other commands to see the working directory parent\n"
|
|
|
" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Patch\n"
|
|
|
" (Noun) The product of a diff operation."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I've sent you my patch.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) The process of using a patch file to transform one\n"
|
|
|
" changeset into another."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"You will need to patch that revision.\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Pull\n"
|
|
|
" An operation in which changesets in a remote repository which are\n"
|
|
|
" not in the local repository are brought into the local\n"
|
|
|
" repository. Note that this operation without special arguments\n"
|
|
|
" only updates the repository, it does not update the files in the\n"
|
|
|
" working directory. See :hg:`help pull`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Push\n"
|
|
|
" An operation in which changesets in a local repository which are\n"
|
|
|
" not in a remote repository are sent to the remote repository. Note\n"
|
|
|
" that this operation only adds changesets which have been committed\n"
|
|
|
" locally to the remote repository. Uncommitted changes are not\n"
|
|
|
" sent. See :hg:`help push`."
|
|
|
msgstr ""
|
|
|
"Push\n"
|
|
|
" En operation där ändringarna ett lokalt arkiv som inte är i ett annat\n"
|
|
|
" arkiv skickas till det andra arkivet. Notera att denna operation bara\n"
|
|
|
" lägger till öndringar som har arkiverats lokalt till det andra arkivet.\n"
|
|
|
" Oarkiverade ändringar skickas inte. Se :hg:`help push`."
|
|
|
|
|
|
msgid ""
|
|
|
"Repository\n"
|
|
|
" The metadata describing all recorded states of a collection of\n"
|
|
|
" files. Each recorded state is represented by a changeset. A\n"
|
|
|
" repository is usually (but not always) found in the ``.hg``\n"
|
|
|
" subdirectory of a working directory. Any recorded state can be\n"
|
|
|
" recreated by \"updating\" a working directory to a specific\n"
|
|
|
" changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Repository head\n"
|
|
|
" See 'Head, repository'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Revision\n"
|
|
|
" A state of the repository at some point in time. Earlier revisions\n"
|
|
|
" can be updated to by using :hg:`update`. See also 'Revision\n"
|
|
|
" number'; See also 'Changeset'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Revision number\n"
|
|
|
" This integer uniquely identifies a changeset in a specific\n"
|
|
|
" repository. It represents the order in which changesets were added\n"
|
|
|
" to a repository, starting with revision number 0. Note that the\n"
|
|
|
" revision number may be different in each clone of a repository. To\n"
|
|
|
" identify changesets uniquely between different clones, see\n"
|
|
|
" 'Changeset id'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Revlog\n"
|
|
|
" History storage mechanism used by Mercurial. It is a form of delta\n"
|
|
|
" encoding, with occasional full revision of data followed by delta\n"
|
|
|
" of each successive revision. It includes data and an index\n"
|
|
|
" pointing to the data."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Rewriting history\n"
|
|
|
" See 'History, rewriting'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Root\n"
|
|
|
" A changeset that has only the null changeset as its parent. Most\n"
|
|
|
" repositories have only a single root changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Tip\n"
|
|
|
" The changeset with the highest revision number. It is the changeset\n"
|
|
|
" most recently added in a repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Tip, branch\n"
|
|
|
" The head of a given branch with the highest revision number. When\n"
|
|
|
" a branch name is used as a revision identifier, it refers to the\n"
|
|
|
" branch tip. See also 'Branch, head'. Note that because revision\n"
|
|
|
" numbers may be different in different repository clones, the\n"
|
|
|
" branch tip may be different in different cloned repositories."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Update\n"
|
|
|
" (Noun) Another synonym of changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"I've pushed an update\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" (Verb) This term is usually used to describe updating the state of\n"
|
|
|
" the working directory to that of a specific changeset. See\n"
|
|
|
" :hg:`help update`."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " Example: \"You should update\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Working directory\n"
|
|
|
" See 'Directory, working'."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Working directory parent\n"
|
|
|
" See 'Parent, working directory'.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Mercurial's internal web server, hgweb, can serve either a single\n"
|
|
|
"repository, or a collection of them. In the latter case, a special\n"
|
|
|
"configuration file can be used to specify the repository paths to use\n"
|
|
|
"and global web configuration options."
|
|
|
msgstr ""
|
|
|
"Mercurials interna webbserver, hgweb, kan endera dela ut ett arkiv, eller\n"
|
|
|
"flera stycken. I det senare fallet, så kan en speciell konfigurationsfil\n"
|
|
|
"användas för att ange arkivsökvägarna att använda och globala alternativ\n"
|
|
|
"för webbkonfiguration"
|
|
|
|
|
|
msgid ""
|
|
|
"This file uses the same syntax as hgrc configuration files, but only\n"
|
|
|
"the following sections are recognized:"
|
|
|
msgstr ""
|
|
|
"Denna fil använder samma syntax som hgrc-konfigurationsfiler, men bara de\n"
|
|
|
"följande sektionerna används:"
|
|
|
|
|
|
msgid ""
|
|
|
" - web\n"
|
|
|
" - paths\n"
|
|
|
" - collections"
|
|
|
msgstr ""
|
|
|
" - web\n"
|
|
|
" - paths\n"
|
|
|
" - collections"
|
|
|
|
|
|
msgid ""
|
|
|
"The ``web`` section can specify all the settings described in the web\n"
|
|
|
"section of the hgrc documentation."
|
|
|
msgstr ""
|
|
|
"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n"
|
|
|
"i hgrc-dokumentationen."
|
|
|
|
|
|
msgid ""
|
|
|
"The ``paths`` section provides mappings of physical repository\n"
|
|
|
"paths to virtual ones. For instance::"
|
|
|
msgstr ""
|
|
|
"Sektionen ``paths`` mappar upp fysiska arkiv till virtuella. Exempelvis::"
|
|
|
|
|
|
msgid ""
|
|
|
" [paths]\n"
|
|
|
" projects/a = /foo/bar\n"
|
|
|
" projects/b = /baz/quux\n"
|
|
|
" web/root = /real/root/*\n"
|
|
|
" / = /real/root2/*\n"
|
|
|
" virtual/root2 = /real/root2/**"
|
|
|
msgstr ""
|
|
|
" [paths]\n"
|
|
|
" projekt/a = /foo/bar\n"
|
|
|
" projekt/b = /baz/quux\n"
|
|
|
" web/rot = /riktig/rot/*\n"
|
|
|
" / = /riktig/rot2/*\n"
|
|
|
" virtuell/rot2 = /riktig/rot2/**"
|
|
|
|
|
|
msgid ""
|
|
|
"- The first two entries make two repositories in different directories\n"
|
|
|
" appear under the same directory in the web interface\n"
|
|
|
"- The third entry maps every Mercurial repository found in '/real/root'\n"
|
|
|
" into 'web/root'. This format is preferred over the [collections] one,\n"
|
|
|
" since using absolute paths as configuration keys is not supported on "
|
|
|
"every\n"
|
|
|
" platform (especially on Windows).\n"
|
|
|
"- The fourth entry is a special case mapping all repositories in\n"
|
|
|
" '/real/root2' in the root of the virtual directory.\n"
|
|
|
"- The fifth entry recursively finds all repositories under the real\n"
|
|
|
" root, and maps their relative paths under the virtual root."
|
|
|
msgstr ""
|
|
|
"- De första två posterna gör att två arkiv i olika kataloger visas under\n"
|
|
|
" samma katalog i webbgränssnittet\n"
|
|
|
"- Den tredje posten mappar alla Mercurial-arkiv som hittas i '/riktig/rot'\n"
|
|
|
" i 'web/rot'. Detta format är att föredra över det i [collections],\n"
|
|
|
" eftersom användning av absoluta sökvägar som konfigurationsnycklar inte\n"
|
|
|
" stödjs på alla plattformar (särskilt Windows).\n"
|
|
|
"- Den fjärde posten är ett specialfall som mappar alla arkiv i\n"
|
|
|
" '/riktig/rot2' i roten på den virtuella katalogen.\n"
|
|
|
"- Den femte posten söker rekursivt efter alla arkiv under den riktiga\n"
|
|
|
" roten, och mappar deras relativa sökvägar under den virtuella roten."
|
|
|
|
|
|
msgid ""
|
|
|
"The ``collections`` section provides mappings of trees of physical\n"
|
|
|
"repositories paths to virtual ones, though the paths syntax is generally\n"
|
|
|
"preferred. For instance::"
|
|
|
msgstr ""
|
|
|
"Sektionen ``collections`` mappar upp träd av fysiska arkiv till virtuella,\n"
|
|
|
"men användning av paths är generellt sett att föredra. Exempel::"
|
|
|
|
|
|
msgid ""
|
|
|
" [collections]\n"
|
|
|
" /foo = /foo"
|
|
|
msgstr ""
|
|
|
" [collections]\n"
|
|
|
" /foo = /foo"
|
|
|
|
|
|
msgid ""
|
|
|
"Here, the left side will be stripped off all repositories found in the\n"
|
|
|
"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
|
|
|
"``bar`` and ``quux/baz`` respectively.\n"
|
|
|
msgstr ""
|
|
|
"Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n"
|
|
|
"högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n"
|
|
|
"visas som ``bar``och ``quux/baz``.\n"
|
|
|
|
|
|
msgid "To merge files Mercurial uses merge tools."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"A merge tool combines two different versions of a file into a merged\n"
|
|
|
"file. Merge tools are given the two files and the greatest common\n"
|
|
|
"ancestor of the two file versions, so they can determine the changes\n"
|
|
|
"made on both branches."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
|
|
|
":hg:`backout` and in several extensions."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Usually, the merge tool tries to automatically reconcile the files by\n"
|
|
|
"combining all non-overlapping changes that occurred separately in\n"
|
|
|
"the two different evolutions of the same initial base file. Furthermore, "
|
|
|
"some\n"
|
|
|
"interactive merge programs make it easier to manually resolve\n"
|
|
|
"conflicting merges, either in a graphical way, or by inserting some\n"
|
|
|
"conflict markers. Mercurial does not include any interactive merge\n"
|
|
|
"programs but relies on external tools for that."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Available merge tools\n"
|
|
|
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"External merge tools and their properties are configured in the\n"
|
|
|
"merge-tools configuration section - see hgrc(5) - but they can often just\n"
|
|
|
"be named by their executable."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"A merge tool is generally usable if its executable can be found on the\n"
|
|
|
"system and if it can handle the merge. The executable is found if it\n"
|
|
|
"is an absolute or relative executable path or the name of an\n"
|
|
|
"application in the executable search path. The tool is assumed to be\n"
|
|
|
"able to handle the merge if it can handle symlinks if the file is a\n"
|
|
|
"symlink, if it can handle binary files if the file is binary, and if a\n"
|
|
|
"GUI is available if the tool requires a GUI."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"There are some internal merge tools which can be used. The internal\n"
|
|
|
"merge tools are:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:merge``\n"
|
|
|
" Uses the internal non-interactive simple merge algorithm for merging\n"
|
|
|
" files. It will fail if there are any conflicts and leave markers in\n"
|
|
|
" the partially merged file."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:fail``\n"
|
|
|
" Rather than attempting to merge files that were modified on both\n"
|
|
|
" branches, it marks them as unresolved. The resolve command must be\n"
|
|
|
" used to resolve these conflicts."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:local``\n"
|
|
|
" Uses the local version of files as the merged version."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:other``\n"
|
|
|
" Uses the other version of files as the merged version."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:prompt``\n"
|
|
|
" Asks the user which of the local or the other version to keep as\n"
|
|
|
" the merged version."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``internal:dump``\n"
|
|
|
" Creates three versions of the files to merge, containing the\n"
|
|
|
" contents of local, other and base. These files can then be used to\n"
|
|
|
" perform a merge manually. If the file to be merged is named\n"
|
|
|
" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
|
|
|
" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
|
|
|
" same directory as ``a.txt``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Internal tools are always available and do not require a GUI but will by "
|
|
|
"default\n"
|
|
|
"not handle symlinks or binary files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Choosing a merge tool\n"
|
|
|
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Mercurial uses these rules when deciding which merge tool to use:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"1. If a tool has been specified with the --tool option to merge or resolve, "
|
|
|
"it\n"
|
|
|
" is used. If it is the name of a tool in the merge-tools configuration, "
|
|
|
"its\n"
|
|
|
" configuration is used. Otherwise the specified tool must be executable "
|
|
|
"by\n"
|
|
|
" the shell."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"2. If the ``HGMERGE`` environment variable is present, its value is used "
|
|
|
"and\n"
|
|
|
" must be executable by the shell."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"3. If the filename of the file to be merged matches any of the patterns in "
|
|
|
"the\n"
|
|
|
" merge-patterns configuration section, the first usable merge tool\n"
|
|
|
" corresponding to a matching pattern is used. Here, binary capabilities of "
|
|
|
"the\n"
|
|
|
" merge tool are not considered."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"4. If ui.merge is set it will be considered next. If the value is not the "
|
|
|
"name\n"
|
|
|
" of a configured tool, the specified value is used and must be executable "
|
|
|
"by\n"
|
|
|
" the shell. Otherwise the named tool is used if it is usable."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"5. If any usable merge tools are present in the merge-tools configuration\n"
|
|
|
" section, the one with the highest priority is used."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"6. If a program named ``hgmerge`` can be found on the system, it is used - "
|
|
|
"but\n"
|
|
|
" it will by default not be used for symlinks and binary files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"7. If the file to be merged is not binary and is not a symlink, then\n"
|
|
|
" ``internal:merge`` is used."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "8. The merge of the file fails and must be resolved before commit."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
".. note::\n"
|
|
|
" After selecting a merge program, Mercurial will by default attempt\n"
|
|
|
" to merge the files using a simple merge algorithm first. Only if it "
|
|
|
"doesn't\n"
|
|
|
" succeed because of conflicting changes Mercurial will actually execute "
|
|
|
"the\n"
|
|
|
" merge program. Whether to use the simple merge algorithm first can be\n"
|
|
|
" controlled by the premerge setting of the merge tool. Premerge is enabled "
|
|
|
"by\n"
|
|
|
" default unless the file is binary or a symlink."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"See the merge-tools and ui sections of hgrc(5) for details on the\n"
|
|
|
"configuration of merge tools.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
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\"."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
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``."
|
|
|
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\"."
|
|
|
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."
|
|
|
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\""
|
|
|
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."
|
|
|
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."
|
|
|
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
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."
|
|
|
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 ""
|
|
|
"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"
|
|
|
|
|
|
msgid ""
|
|
|
"Mercurial supports a functional language for selecting a set of\n"
|
|
|
"revisions."
|
|
|
msgstr "Mercurial stöder flera sött att ange individuella revisioner."
|
|
|
|
|
|
msgid ""
|
|
|
"The language supports a number of predicates which are joined by infix\n"
|
|
|
"operators. Parenthesis can be used for grouping."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Identifiers such as branch names must be quoted with single or double\n"
|
|
|
"quotes if they contain characters outside of\n"
|
|
|
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
|
|
|
"predicates."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Special characters can be used in quoted identifiers by escaping them,\n"
|
|
|
"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
|
|
|
"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "There is a single prefix operator:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``not x``\n"
|
|
|
" Changesets not in x. Short form is ``! x``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "These are the supported infix operators:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``x::y``\n"
|
|
|
" A DAG range, meaning all changesets that are descendants of x and\n"
|
|
|
" ancestors of y, including x and y themselves. If the first endpoint\n"
|
|
|
" is left out, this is equivalent to ``ancestors(y)``, if the second\n"
|
|
|
" is left out it is equivalent to ``descendants(x)``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " An alternative syntax is ``x..y``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``x:y``\n"
|
|
|
" All changesets with revision numbers between x and y, both\n"
|
|
|
" inclusive. Either endpoint can be left out, they default to 0 and\n"
|
|
|
" tip."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``x and y``\n"
|
|
|
" The intersection of changesets in x and y. Short form is ``x & y``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``x or y``\n"
|
|
|
" The union of changesets in x and y. There are two alternative short\n"
|
|
|
" forms: ``x | y`` and ``x + y``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``x - y``\n"
|
|
|
" Changesets in x but not in y."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "The following predicates are supported:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ".. predicatesmarker"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Command line equivalents for :hg:`log`::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" -f -> ::.\n"
|
|
|
" -d x -> date(x)\n"
|
|
|
" -k x -> keyword(x)\n"
|
|
|
" -m -> merge()\n"
|
|
|
" -u x -> user(x)\n"
|
|
|
" -b x -> branch(x)\n"
|
|
|
" -P x -> !::x\n"
|
|
|
" -l x -> limit(expr, x)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Some sample queries:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "- Changesets on the default branch::"
|
|
|
msgstr "- Ändringar på default-grenen::"
|
|
|
|
|
|
msgid " hg log -r \"branch(default)\""
|
|
|
msgstr " hg log -r \"branch(default)\""
|
|
|
|
|
|
msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
|
|
|
msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\""
|
|
|
|
|
|
msgid "- Open branch heads::"
|
|
|
msgstr "- Öppna grenhuvuden::"
|
|
|
|
|
|
msgid " hg log -r \"head() and not closed()\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
|
|
|
" ``hgext/*``::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "- Changesets in committed May 2008, sorted by user::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " hg log -r \"sort(date('May 2008'), user)\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
|
|
|
" release::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
|
|
|
"())\"\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Subrepositories let you nest external repositories or projects into a\n"
|
|
|
"parent Mercurial repository, and make commands operate on them as a\n"
|
|
|
"group. External Mercurial and Subversion projects are currently\n"
|
|
|
"supported."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Subrepositories are made of three components:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"1. Nested repository checkouts. They can appear anywhere in the\n"
|
|
|
" parent working directory, and are Mercurial clones or Subversion\n"
|
|
|
" checkouts."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"2. Nested repository references. They are defined in ``.hgsub`` and\n"
|
|
|
" tell where the subrepository checkouts come from. Mercurial\n"
|
|
|
" subrepositories are referenced like:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " path/to/nested = https://example.com/nested/repo/path"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" where ``path/to/nested`` is the checkout location relatively to the\n"
|
|
|
" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
|
|
|
" is the source repository path. The source can also reference a\n"
|
|
|
" filesystem path. Subversion repositories are defined with:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Note that ``.hgsub`` does not exist by default in Mercurial\n"
|
|
|
" repositories, you have to create and add it to the parent\n"
|
|
|
" repository before using subrepositories."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
|
|
|
" capture whatever information is required to restore the\n"
|
|
|
" subrepositories to the state they were committed in a parent\n"
|
|
|
" repository changeset. Mercurial automatically record the nested\n"
|
|
|
" repositories states when committing in the parent repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" .. note::\n"
|
|
|
" The ``.hgsubstate`` file should not be edited manually."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"\n"
|
|
|
"Adding a Subrepository\n"
|
|
|
"----------------------"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"If ``.hgsub`` does not exist, create it and add it to the parent\n"
|
|
|
"repository. Clone or checkout the external projects where you want it\n"
|
|
|
"to live in the parent repository. Edit ``.hgsub`` and add the\n"
|
|
|
"subrepository entry as described above. At this point, the\n"
|
|
|
"subrepository is tracked and the next commit will record its state in\n"
|
|
|
"``.hgsubstate`` and bind it to the committed changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Synchronizing a Subrepository\n"
|
|
|
"-----------------------------"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Subrepos do not automatically track the latest changeset of their\n"
|
|
|
"sources. Instead, they are updated to the changeset that corresponds\n"
|
|
|
"with the changeset checked out in the top-level changeset. This is so\n"
|
|
|
"developers always get a consistent set of compatible code and\n"
|
|
|
"libraries when they update."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Thus, updating subrepos is a manual process. Simply check out target\n"
|
|
|
"subrepo at the desired revision, test in the top-level repo, then\n"
|
|
|
"commit in the parent repository to record the new combination."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Deleting a Subrepository\n"
|
|
|
"------------------------"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"To remove a subrepository from the parent repository, delete its\n"
|
|
|
"reference from ``.hgsub``, then remove its files."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Interaction with Mercurial Commands\n"
|
|
|
"-----------------------------------"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":add: add does not recurse in subrepos unless -S/--subrepos is\n"
|
|
|
" specified. Subversion subrepositories are currently silently\n"
|
|
|
" ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":archive: archive does not recurse in subrepositories unless\n"
|
|
|
" -S/--subrepos is specified."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":commit: commit creates a consistent snapshot of the state of the\n"
|
|
|
" entire project and its subrepositories. It does this by first\n"
|
|
|
" attempting to commit all modified subrepositories, then recording\n"
|
|
|
" their state and finally committing it in the parent repository."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
|
|
|
" specified. Changes are displayed as usual, on the subrepositories\n"
|
|
|
" elements. Subversion subrepositories are currently silently\n"
|
|
|
" ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
|
|
|
" is specified. Subversion subrepositories are currently silently\n"
|
|
|
" ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
|
|
|
" is specified. Subversion subrepositories are currently silently\n"
|
|
|
" ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":pull: pull is not recursive since it is not clear what to pull prior\n"
|
|
|
" to running :hg:`update`. Listing and retrieving all\n"
|
|
|
" subrepositories changes referenced by the parent repository pulled\n"
|
|
|
" changesets is expensive at best, impossible in the Subversion\n"
|
|
|
" case."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":push: Mercurial will automatically push all subrepositories first\n"
|
|
|
" when the parent repository is being pushed. This ensures new\n"
|
|
|
" subrepository changes are available when referenced by top-level\n"
|
|
|
" repositories."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":status: status does not recurse into subrepositories unless\n"
|
|
|
" -S/--subrepos is specified. Subrepository changes are displayed as\n"
|
|
|
" regular Mercurial changes on the subrepository\n"
|
|
|
" elements. Subversion subrepositories are currently silently\n"
|
|
|
" ignored."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":update: update restores the subrepos in the state they were\n"
|
|
|
" originally committed in target changeset. If the recorded\n"
|
|
|
" changeset is not available in the current subrepository, Mercurial\n"
|
|
|
" will pull it in first before updating. This means that updating\n"
|
|
|
" can require network access when using subrepositories."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Remapping Subrepositories Sources\n"
|
|
|
"---------------------------------"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"A subrepository source location may change during a project life,\n"
|
|
|
"invalidating references stored in the parent repository history. To\n"
|
|
|
"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
|
|
|
"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
|
|
|
"hgrc(5) for more details."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"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)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"You can customize output for any \"log-like\" command: log,\n"
|
|
|
"outgoing, incoming, tip, parents, heads and glog."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Four styles are packaged with Mercurial: default (the style used\n"
|
|
|
"when no explicit preference is passed), compact, changelog,\n"
|
|
|
"and xml.\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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" $ hg log -r1 --template \"{node}\\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:"
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ":children: List of strings. The children of the changeset."
|
|
|
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\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":files: List of strings. All files modified, added, or removed by this\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":file_copies_switch: List of strings. Like \"file_copies\" but displayed\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 hexadecimal\n"
|
|
|
" digit 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."
|
|
|
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::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" $ hg tip --template \"{date|isodate}\\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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":age: Date. Returns a human-readable date/time difference between the\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\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":stripdir: Treat the text as path and strip a directory level, if\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\"."
|
|
|
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``."
|
|
|
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``."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
|
|
|
" and \">\" with XML entities."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":hex: Any text. Convert a binary Mercurial node identifier into\n"
|
|
|
" its long hexadecimal representation."
|
|
|
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)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\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."
|
|
|
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."
|
|
|
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\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":rfc3339date: Date. Returns a date using the Internet date format\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 hexadecimal digit string."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":stringify: Any type. Turns the value into text by converting values into\n"
|
|
|
" text and concatenating them."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
":urlescape: Any text. Escapes all \"special\" characters. For example,\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]"
|
|
|
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`)."
|
|
|
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`."
|
|
|
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."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Note that the security of HTTPS URLs depends on proper configuration of\n"
|
|
|
"web.cacerts."
|
|
|
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::"
|
|
|
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.::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Host *.mylocalnetwork.example.com\n"
|
|
|
" Compression no\n"
|
|
|
" Host *\n"
|
|
|
" Compression yes"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" Alternatively specify \"ssh -C\" as your ssh command in your\n"
|
|
|
" configuration file or with the --ssh command line option."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"These URLs can all be stored in your configuration file with path\n"
|
|
|
"aliases under the [paths] section like so::"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" [paths]\n"
|
|
|
" alias1 = URL1\n"
|
|
|
" alias2 = URL2\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`)."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"Two path aliases are special because they are used as defaults when\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)."
|
|
|
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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "remote branch lookup not supported"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "dirstate branch not accessible"
|
|
|
msgstr "dirstate-grenen inte åtkomlig"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown branch '%s'"
|
|
|
msgstr "okänd gren '%s'"
|
|
|
|
|
|
msgid "can only share local repositories"
|
|
|
msgstr "kan bara dela lokala arkiv"
|
|
|
|
|
|
msgid "destination already exists"
|
|
|
msgstr "destinationen finns redan"
|
|
|
|
|
|
msgid "updating working directory\n"
|
|
|
msgstr "uppdaterar arbetskatalog\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "destination directory: %s\n"
|
|
|
msgstr "destinationskatalog: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "destination '%s' already exists"
|
|
|
msgstr "destinationen '%s' finns redan"
|
|
|
|
|
|
#, python-format
|
|
|
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 "clone from remote to remote not supported"
|
|
|
msgstr "kloning från fjärr till fjärr stödjs inte"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "updating to branch %s\n"
|
|
|
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 "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"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "(branch merge, don't forget to commit)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error reading %s/.hg/hgrc: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error accessing repository at %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "SSL support is unavailable"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "IPv6 is not available on this system"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot start server at '%s:%d': %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "calling hook %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook is invalid (\"%s\" not in a module)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "exception from first failed import attempt:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "exception from second failed import attempt:\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook is invalid (import of \"%s\" failed)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook is invalid (\"%s\" is not defined)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook is invalid (\"%s\" is not callable)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error: %s hook failed: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error: %s hook raised an exception: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook failed"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: %s hook failed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "running hook %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s hook %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: %s hook %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "connection ended unexpectedly"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unsupported URL component: \"%s\""
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "operation not supported over http"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "authorization failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "http error, possibly caused by proxy setting"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "real URL is %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"'%s' does not appear to be an hg repository:\n"
|
|
|
"---%%<--- (%s)\n"
|
|
|
"%s\n"
|
|
|
"---%%<---\n"
|
|
|
msgstr ""
|
|
|
"'%s' verkar inte vara ett hg-arkiv:\n"
|
|
|
"---%%<--- (%s)\n"
|
|
|
"%s\n"
|
|
|
"---%%<---\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'%s' sent a broken Content-Type header (%s)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'%s' uses newer protocol %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "push failed: %s"
|
|
|
msgstr "tryckning misslyckades: %s"
|
|
|
|
|
|
msgid "Python support for SSL and HTTPS is not installed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot create new http repository"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring invalid syntax '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "skipping unreadable ignore file '%s': %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "repository %s not found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "repository %s already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "requirement '%s' not supported"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ".hg/sharedpath points to nonexistent directory %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%r cannot be used in a tag name"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: tag %s conflicts with existing branch name\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "working directory has unknown parent '%s'!"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown revision '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "abandoned transaction found - run hg recover"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rolling back interrupted transaction\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no interrupted transaction available\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "rolling back to revision %s (undo %s: %s)\n"
|
|
|
msgstr "återgår till revisionen %s (ångra %s: %s)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "rolling back to revision %s (undo %s)\n"
|
|
|
msgstr "återgår till revisionen %s (ångra %s)\n"
|
|
|
|
|
|
msgid "rolling back unknown transaction\n"
|
|
|
msgstr "återkallar okänd transaktion\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Named branch could not be reset, current branch still is: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no rollback information available\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "waiting for lock on %s held by %r\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "repository %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "working directory of %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot partially commit a merge (do not specify files or patterns)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "can't commit subrepos without .hgsub"
|
|
|
msgstr "kan inte arkivera underarkiv utan .hgsub"
|
|
|
|
|
|
msgid "file not found!"
|
|
|
msgstr "filen hittades inte!"
|
|
|
|
|
|
msgid "no match under directory!"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "file not tracked!"
|
|
|
msgstr "filen spåras inte!"
|
|
|
|
|
|
msgid "unresolved merge conflicts (see hg resolve)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "committing subrepository %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "note: commit message saved in %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "trouble committing %s!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
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."
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d changesets found\n"
|
|
|
msgstr "%d ändringar hittades\n"
|
|
|
|
|
|
msgid "bundling changes"
|
|
|
msgstr "buntar ändringar"
|
|
|
|
|
|
msgid "chunks"
|
|
|
msgstr "stycken"
|
|
|
|
|
|
msgid "bundling manifests"
|
|
|
msgstr "buntar manifest"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "empty or missing revlog for %s"
|
|
|
msgstr "tom eller saknad revlog för %s"
|
|
|
|
|
|
msgid "bundling files"
|
|
|
msgstr "buntar filer"
|
|
|
|
|
|
msgid "adding changesets\n"
|
|
|
msgstr "lägger till ändringar\n"
|
|
|
|
|
|
msgid "received changelog group is empty"
|
|
|
msgstr "mottagen ändringsgrupp är tom"
|
|
|
|
|
|
msgid "adding manifests\n"
|
|
|
msgstr "lägger till manifest\n"
|
|
|
|
|
|
msgid "manifests"
|
|
|
msgstr "manifest"
|
|
|
|
|
|
msgid "adding file changes\n"
|
|
|
msgstr "lägger till filändringar\n"
|
|
|
|
|
|
msgid "received file revlog group is empty"
|
|
|
msgstr "mottagen revlog-grupp för filer är tom"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "missing file data for %s:%s - run hg verify"
|
|
|
msgstr "fildata för %s:%s saknas - kör hg verify"
|
|
|
|
|
|
#, python-format
|
|
|
msgid " (%+d heads)"
|
|
|
msgstr " (%+d huvuden)"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "added %d changesets with %d changes to %d files%s\n"
|
|
|
msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n"
|
|
|
|
|
|
msgid "Unexpected response from remote server:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "operation forbidden by server"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "locking the remote repository failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "the server sent an unknown error code"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "streaming all changes\n"
|
|
|
msgstr "strömmar alla ändringar\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d files to transfer, %s of data\n"
|
|
|
msgstr "%d filer att överföra, %s med data\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "transferred %s in %.1f seconds (%s/sec)\n"
|
|
|
msgstr "överförde %s på %.1f sekunder (%s/sek)\n"
|
|
|
|
|
|
msgid "smtp.host not configured - cannot send mail"
|
|
|
msgstr "smtp.host är inte konfigurerad - kan inte sända mail"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "sending mail: smtp host %s, port %s\n"
|
|
|
msgstr "sänder mail: smtp-server %s, port %s\n"
|
|
|
|
|
|
msgid "can't use TLS: Python SSL support not installed"
|
|
|
msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat"
|
|
|
|
|
|
msgid "(using tls)\n"
|
|
|
msgstr "(använder tls)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(authenticating to mail server as %s)\n"
|
|
|
msgstr "(autenticerar mot mailserver som %s)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "sending mail: %s\n"
|
|
|
msgstr "sänder mail: %s\n"
|
|
|
|
|
|
msgid "smtp specified as email transport, but no smtp host configured"
|
|
|
msgstr "smtp angiven som emailtransport, men ingen smtp-server konfigurerad"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%r specified as email transport, but not in PATH"
|
|
|
msgstr "%r angiven som emailtransport, men inte i PATH"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring invalid sendcharset: %s\n"
|
|
|
msgstr "ignorerar ogiltig sendcharset: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid email address: %s"
|
|
|
msgstr "ogiltig emailadress: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid local address: %s"
|
|
|
msgstr "ogiltig lokal adress: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "failed to remove %s from manifest"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid pattern (%s): %s"
|
|
|
msgstr "ogiltigt mönster (%s): %s"
|
|
|
|
|
|
msgid "invalid pattern"
|
|
|
msgstr "ogiltigt mönster"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "diff context lines count must be an integer, not %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"untracked file in working directory differs from file in requested revision: "
|
|
|
"'%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "case-folding collision between %s and %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" conflicting flags for %s\n"
|
|
|
"(n)one, e(x)ec or sym(l)ink?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&None"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "E&xec"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Sym&link"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "resolving manifests\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" local changed %s which remote deleted\n"
|
|
|
"use (c)hanged version or (d)elete?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Changed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Delete"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
"remote changed %s which local deleted\n"
|
|
|
"use (c)hanged version or leave (d)eleted?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Deleted"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "updating"
|
|
|
msgstr "uppdaterar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "update failed to remove %s: %s!\n"
|
|
|
msgstr "update kunde inte ta bort %s: %s!\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "getting %s\n"
|
|
|
msgstr "hämtar %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "getting %s to %s\n"
|
|
|
msgstr "hämtar %s till %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "note: possible conflict - %s was renamed multiple times to:\n"
|
|
|
msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "branch %s not found"
|
|
|
msgstr "grenen %s hittades inte"
|
|
|
|
|
|
msgid "merging with a working directory ancestor has no effect"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "nothing to merge (use 'hg update' or check 'hg heads')"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "crosses branches (merge branches or use --clean to discard changes)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "crosses branches (merge branches or use --check to force update)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Attention:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Caution:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "!Danger!"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Error:"
|
|
|
msgstr "Fel:"
|
|
|
|
|
|
msgid "Hint:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Important:"
|
|
|
msgstr "Viktigt:"
|
|
|
|
|
|
msgid "Note:"
|
|
|
msgstr "Notera:"
|
|
|
|
|
|
msgid "Tip:"
|
|
|
msgstr "Tips:"
|
|
|
|
|
|
msgid "Warning!"
|
|
|
msgstr "Varning!"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot create %s: destination already exists"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot create %s: unable to create destination directory"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unable to find '%s' for patching\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patching file %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bad hunk #%d %s (%d %d %d %d)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "file %s already exists\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
|
|
|
msgstr "Stycke #%d lyckades vid %d med luddigheten %d (offset %d rader).\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
|
|
|
msgstr "Stycke #%d lyckades vid %d (offset %d rader).\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Hunk #%d FAILED at %d\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bad hunk #%d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bad hunk #%d old text line %d"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "could not extract binary patch"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "binary patch is %d bytes, not %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unable to strip away %d of %d dirs from %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "undefined source and destination files"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "malformed patch %s %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unsupported parser state: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "patch command failed: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unsupported line endings type: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "patch failed to apply"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "exited with status %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "killed by signal %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "saved backup bundle to %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "adding branch\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "strip failed, full bundle stored in '%s'\n"
|
|
|
msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "strip failed, partial bundle stored in '%s'\n"
|
|
|
msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot %s; remote repository does not support the %r capability"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown compression type %r"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "index entry flags need RevlogNG"
|
|
|
msgstr "indexflaggor kräver RevlogNG"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "index %s unknown flags %#04x for format v0"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "index %s unknown flags %#04x for revlogng"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "index %s unknown format %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "index %s is corrupted"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no node"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "ambiguous identifier"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no match found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "incompatible revision flag %x"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not found in the transaction"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "consistency error in delta"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unknown base"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unterminated string"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "syntax error"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "missing argument"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "can't use %s here"
|
|
|
msgstr "kan inte använda %s här"
|
|
|
|
|
|
msgid "can't use a list in this context"
|
|
|
msgstr "kan inte använda en lista i detta sammanhang"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not a function: %s"
|
|
|
msgstr "inte en funktion: %s"
|
|
|
|
|
|
msgid ""
|
|
|
"``id(string)``\n"
|
|
|
" Revision non-ambiguously specified by the given hex string prefix."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "id" is a keyword
|
|
|
msgid "id requires one argument"
|
|
|
msgstr "id kräver ett argument"
|
|
|
|
|
|
#. i18n: "id" is a keyword
|
|
|
msgid "id requires a string"
|
|
|
msgstr "id kräver en sträng"
|
|
|
|
|
|
msgid ""
|
|
|
"``rev(number)``\n"
|
|
|
" Revision with the given numeric identifier."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "rev" is a keyword
|
|
|
msgid "rev requires one argument"
|
|
|
msgstr "rev kräver ett argument"
|
|
|
|
|
|
#. i18n: "rev" is a keyword
|
|
|
msgid "rev requires a number"
|
|
|
msgstr "rev kräver ett nummer"
|
|
|
|
|
|
#. i18n: "rev" is a keyword
|
|
|
msgid "rev expects a number"
|
|
|
msgstr "rev förväntar sig ett nummer"
|
|
|
|
|
|
msgid ""
|
|
|
"``p1(set)``\n"
|
|
|
" First parent of changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``p2(set)``\n"
|
|
|
" Second parent of changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``parents(set)``\n"
|
|
|
" The set of all parents for all changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``max(set)``\n"
|
|
|
" Changeset with highest revision number in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``min(set)``\n"
|
|
|
" Changeset with lowest revision number in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``limit(set, n)``\n"
|
|
|
" First n members of set."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "limit" is a keyword
|
|
|
msgid "limit requires two arguments"
|
|
|
msgstr "limit kräver två argument"
|
|
|
|
|
|
#. i18n: "limit" is a keyword
|
|
|
msgid "limit requires a number"
|
|
|
msgstr "limit kräver ett nummer"
|
|
|
|
|
|
#. i18n: "limit" is a keyword
|
|
|
msgid "limit expects a number"
|
|
|
msgstr "limit förväntar sig ett nummer"
|
|
|
|
|
|
msgid ""
|
|
|
"``children(set)``\n"
|
|
|
" Child changesets of changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``branch(set)``\n"
|
|
|
" All changesets belonging to the branches of changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``ancestor(single, single)``\n"
|
|
|
" Greatest common ancestor of the two changesets."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "ancestor" is a keyword
|
|
|
msgid "ancestor requires two arguments"
|
|
|
msgstr "ancestor kräver två argument"
|
|
|
|
|
|
#. i18n: "ancestor" is a keyword
|
|
|
msgid "ancestor arguments must be single revisions"
|
|
|
msgstr "argument till ancestor måste vara singelrevisioner"
|
|
|
|
|
|
msgid ""
|
|
|
"``ancestors(set)``\n"
|
|
|
" Changesets that are ancestors of a changeset in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``descendants(set)``\n"
|
|
|
" Changesets which are descendants of changesets in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``follow()``\n"
|
|
|
" An alias for ``::.`` (ancestors of the working copy's first parent)."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "follow" is a keyword
|
|
|
msgid "follow takes no arguments"
|
|
|
msgstr "follow tar inga argument"
|
|
|
|
|
|
msgid ""
|
|
|
"``date(interval)``\n"
|
|
|
" Changesets within the interval, see :hg:`help dates`."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "date" is a keyword
|
|
|
msgid "date requires a string"
|
|
|
msgstr "date kräver en sträng"
|
|
|
|
|
|
msgid ""
|
|
|
"``keyword(string)``\n"
|
|
|
" Search commit message, user name, and names of changed files for\n"
|
|
|
" string."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "keyword" is a keyword
|
|
|
msgid "keyword requires a string"
|
|
|
msgstr "keyword kräver en sträng"
|
|
|
|
|
|
msgid ""
|
|
|
"``grep(regex)``\n"
|
|
|
" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
|
|
|
" to ensure special escape characters are handled correctly."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "grep" is a keyword
|
|
|
msgid "grep requires a string"
|
|
|
msgstr "grep kräver en sträng"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid match pattern: %s"
|
|
|
msgstr "ogiltigt träffmönster: %s"
|
|
|
|
|
|
msgid ""
|
|
|
"``author(string)``\n"
|
|
|
" Alias for ``user(string)``."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "author" is a keyword
|
|
|
msgid "author requires a string"
|
|
|
msgstr "author kräver en sträng"
|
|
|
|
|
|
msgid ""
|
|
|
"``user(string)``\n"
|
|
|
" User name is string."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``file(pattern)``\n"
|
|
|
" Changesets affecting files matched by pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "file" is a keyword
|
|
|
msgid "file requires a pattern"
|
|
|
msgstr "file kräver ett mönster"
|
|
|
|
|
|
msgid ""
|
|
|
"``contains(pattern)``\n"
|
|
|
" Revision contains pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "contains" is a keyword
|
|
|
msgid "contains requires a pattern"
|
|
|
msgstr "contains kräver ett mönster"
|
|
|
|
|
|
msgid ""
|
|
|
"``modifies(pattern)``\n"
|
|
|
" Changesets modifying files matched by pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "modifies" is a keyword
|
|
|
msgid "modifies requires a pattern"
|
|
|
msgstr "modifies kräver ett mönster"
|
|
|
|
|
|
msgid ""
|
|
|
"``adds(pattern)``\n"
|
|
|
" Changesets that add a file matching pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "adds" is a keyword
|
|
|
msgid "adds requires a pattern"
|
|
|
msgstr "adds kräver ett mönster"
|
|
|
|
|
|
msgid ""
|
|
|
"``removes(pattern)``\n"
|
|
|
" Changesets which remove files matching pattern."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "removes" is a keyword
|
|
|
msgid "removes requires a pattern"
|
|
|
msgstr "removes kräver ett mänster"
|
|
|
|
|
|
msgid ""
|
|
|
"``merge()``\n"
|
|
|
" Changeset is a merge changeset."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "merge" is a keyword
|
|
|
msgid "merge takes no arguments"
|
|
|
msgstr "merge tar inga argument"
|
|
|
|
|
|
msgid ""
|
|
|
"``closed()``\n"
|
|
|
" Changeset is closed."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "closed" is a keyword
|
|
|
msgid "closed takes no arguments"
|
|
|
msgstr "closed tar inga argument"
|
|
|
|
|
|
msgid ""
|
|
|
"``head()``\n"
|
|
|
" Changeset is a named branch head."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "head" is a keyword
|
|
|
msgid "head takes no arguments"
|
|
|
msgstr "head tar inga argument"
|
|
|
|
|
|
msgid ""
|
|
|
"``reverse(set)``\n"
|
|
|
" Reverse order of set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``present(set)``\n"
|
|
|
" An empty set, if any revision in set isn't found; otherwise,\n"
|
|
|
" all revisions in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``sort(set[, [-]key...])``\n"
|
|
|
" Sort set by keys. The default sort order is ascending, specify a key\n"
|
|
|
" as ``-key`` to sort in descending order."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid " The keys can be:"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
" - ``rev`` for the revision number,\n"
|
|
|
" - ``branch`` for the branch name,\n"
|
|
|
" - ``desc`` for the commit message (description),\n"
|
|
|
" - ``user`` for user name (``author`` can be used as an alias),\n"
|
|
|
" - ``date`` for the commit date"
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "sort" is a keyword
|
|
|
msgid "sort requires one or two arguments"
|
|
|
msgstr "sort kräver ett eller två argument"
|
|
|
|
|
|
msgid "sort spec must be a string"
|
|
|
msgstr "sort-spec måste vara en sträng"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown sort key %r"
|
|
|
msgstr "okänd sorteringsnyckel %r"
|
|
|
|
|
|
msgid ""
|
|
|
"``all()``\n"
|
|
|
" All changesets, the same as ``0:tip``."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "all" is a keyword
|
|
|
msgid "all takes no arguments"
|
|
|
msgstr "all tar inga argument"
|
|
|
|
|
|
msgid ""
|
|
|
"``heads(set)``\n"
|
|
|
" Members of set with no children in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``roots(set)``\n"
|
|
|
" Changesets with no parent changeset in set."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ""
|
|
|
"``outgoing([path])``\n"
|
|
|
" Changesets not found in the specified destination repository, or the\n"
|
|
|
" default push location."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "outgoing" is a keyword
|
|
|
msgid "outgoing requires a repository path"
|
|
|
msgstr "outgoing kräver en arkivsökväg"
|
|
|
|
|
|
msgid ""
|
|
|
"``tag(name)``\n"
|
|
|
" The specified tag by name, or all tagged revisions if no name is given."
|
|
|
msgstr ""
|
|
|
|
|
|
#. i18n: "tag" is a keyword
|
|
|
msgid "tag takes one or no arguments"
|
|
|
msgstr "tag tar ett eller inga argument"
|
|
|
|
|
|
#. i18n: "tag" is a keyword
|
|
|
msgid "the argument to tag must be a string"
|
|
|
msgstr "argumentet till tag måste vara en sträng"
|
|
|
|
|
|
msgid "can't negate that"
|
|
|
msgstr "kan inte negera det"
|
|
|
|
|
|
msgid "not a symbol"
|
|
|
msgstr "inte en symbol"
|
|
|
|
|
|
msgid "empty query"
|
|
|
msgstr "tom fråga"
|
|
|
|
|
|
msgid "searching for exact renames"
|
|
|
msgstr "söker efter exakta namnbyten"
|
|
|
|
|
|
msgid "searching for similar files"
|
|
|
msgstr "söker efter liknande filer"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s looks like a binary file."
|
|
|
msgstr "%s verkar vara en binärfil."
|
|
|
|
|
|
msgid "can only specify two labels."
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "warning: conflicts during merge.\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "couldn't parse location %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "could not create remote repo"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no suitable response from remote hg"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "remote: "
|
|
|
msgstr "fjärr: "
|
|
|
|
|
|
msgid "unexpected response:"
|
|
|
msgstr "oväntat svar:"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "push refused: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "'%s' does not appear to be an hg repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot lock static-http repository"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot create new static-http repository"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid entry in fncache, line %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "subrepo spec file %s not found"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "missing ] in subrepo source"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "bad subrepository pattern in %s: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" subrepository sources for %s differ\n"
|
|
|
"use (l)ocal source (%s) or (r)emote source (%s)?"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "&Remote"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" local changed subrepository %s which remote removed\n"
|
|
|
"use (c)hanged version or (d)elete?"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid ""
|
|
|
" remote changed subrepository %s which local removed\n"
|
|
|
"use (c)hanged version or (d)elete?"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "default path for subrepository %s not found"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown subrepo type %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: error \"%s\" in subrepository \"%s\"\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "removing subrepo %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "pulling subrepo %s from %s\n"
|
|
|
msgstr "drar subarkivet %s från %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "pushing subrepo %s to %s\n"
|
|
|
msgstr "trycker subarkivet %s från %s\n"
|
|
|
|
|
|
msgid "cannot commit svn externals"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "not removing repo %s because it has changes.\n"
|
|
|
msgstr "raderar inte arkivet %s eftersom den har ändringar.\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s, line %s: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot parse entry"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "node '%s' is not well formed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid ".hg/tags.cache is corrupt, rebuilding it\n"
|
|
|
msgstr ".hg/tags.cache är korrupt, bygger om den\n"
|
|
|
|
|
|
msgid "unmatched quotes"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "error expanding '%s%%%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown filter '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "style not found: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "template file %s: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot use transaction when it is already committed/aborted"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "failed to truncate %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "transaction abort!\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rollback completed\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "rollback failed - please run hg recover\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Not trusting file %s from untrusted user %s, group %s\n"
|
|
|
msgstr "Litar inte på filen %s från opålitlig användare %s, grupp %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "Ignored: %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(deprecated '%%' in path %s=%s from %s)\n"
|
|
|
msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring untrusted configuration option %s.%s = %s\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s.%s not a boolean ('%s')"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "enter a commit username:"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "No username found, using '%s' instead\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "no username supplied (see \"hg help config\")"
|
|
|
msgstr "inget användarnamn angivet (se \"hg help config\")"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "username %s contains a newline\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "response expected"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "unrecognized response\n"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "password: "
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "edit failed"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "http authorization required"
|
|
|
msgstr "http-autenticiering krävs"
|
|
|
|
|
|
msgid "http authorization required\n"
|
|
|
msgstr "http-autenticiering krävs\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "realm: %s\n"
|
|
|
msgstr "realm: %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "user: %s\n"
|
|
|
msgstr "användare: %s\n"
|
|
|
|
|
|
msgid "user:"
|
|
|
msgstr "användare:"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "http auth: user %s, password %s\n"
|
|
|
msgstr "http-auth: användare %s, lösenord %s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "ignoring invalid [auth] key '%s'\n"
|
|
|
msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
|
|
|
|
|
|
msgid "certificate checking requires Python 2.6"
|
|
|
msgstr "certifikatkontroll kräver Python 2.6"
|
|
|
|
|
|
msgid "no certificate received"
|
|
|
msgstr "inget certifikat mottaget"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "certificate is for %s"
|
|
|
msgstr "certifikat är för %s"
|
|
|
|
|
|
msgid "no commonName found in certificate"
|
|
|
msgstr "inget commonName hittades i certifikat"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s certificate error: %s"
|
|
|
msgstr "%s certifikatfel: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "command '%s' failed: %s"
|
|
|
msgstr "kommandot '%s' misslyckades: %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "path contains illegal component: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "path %r is inside repo %r"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "path %r traverses symbolic link %r"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "Hardlinks not supported"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "could not symlink to %r: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid date: %r"
|
|
|
msgstr "ogiltigt datum: %r"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "date exceeds 32 bits: %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "impossible time zone offset: %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "invalid day spec: %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.0f GB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.1f GB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.2f GB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.0f MB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.1f MB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.2f MB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.0f KB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.1f KB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.2f KB"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%.0f bytes"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "no port number associated with service '%s'"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "cannot verify bundle or remote repos"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "interrupted"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "empty or missing %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "data length off by %d bytes"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "index contains %d extra bytes"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: `%s' uses revlog format 1"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: `%s' uses revlog format 0"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "rev %d points to nonexistent changeset %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "rev %d points to unexpected changeset %d"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid " (expected %s)"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown parent 1 %s of %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unknown parent 2 %s of %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "checking parents of %s"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "duplicate revision %d (%d)"
|
|
|
msgstr ""
|
|
|
|
|
|
msgid "abandoned transaction found - run hg recover\n"
|
|
|
msgstr ""
|
|
|
|
|
|
#, python-format
|
|
|
msgid "repository uses revlog format %d\n"
|
|
|
msgstr "arkivet använder revlog-format %d\n"
|
|
|
|
|
|
msgid "checking changesets\n"
|
|
|
msgstr "kontrollerar ändringar\n"
|
|
|
|
|
|
msgid "checking"
|
|
|
msgstr "kontrollerar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unpacking changeset %s"
|
|
|
msgstr "packar upp ändringen %s"
|
|
|
|
|
|
msgid "checking manifests\n"
|
|
|
msgstr "kontrollerar manifest\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not in changesets"
|
|
|
msgstr "%s inte i ändringarna"
|
|
|
|
|
|
msgid "file without name in manifest"
|
|
|
msgstr "fil utan namn i manifest"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "reading manifest delta %s"
|
|
|
msgstr "läser manifestdelta %s"
|
|
|
|
|
|
msgid "crosschecking files in changesets and manifests\n"
|
|
|
msgstr "korskontrollerar filer i ändringar och manifest\n"
|
|
|
|
|
|
msgid "crosschecking"
|
|
|
msgstr "korskontrollerar"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "changeset refers to unknown manifest %s"
|
|
|
msgstr "ändring refererar till okänt manifest %s"
|
|
|
|
|
|
msgid "in changeset but not in manifest"
|
|
|
msgstr "i ändring men inte i manifest"
|
|
|
|
|
|
msgid "in manifest but not in changeset"
|
|
|
msgstr "i manifest men inte i ändring"
|
|
|
|
|
|
msgid "checking files\n"
|
|
|
msgstr "kontrollerar filer\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "cannot decode filename '%s'"
|
|
|
msgstr "kan inte avkoda filnamnet '%s'"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "broken revlog! (%s)"
|
|
|
msgstr "skadad revlog! (%s)"
|
|
|
|
|
|
msgid "missing revlog!"
|
|
|
msgstr "saknad revlog!"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s not in manifests"
|
|
|
msgstr "%s inte i manifest"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unpacked size is %s, %s expected"
|
|
|
msgstr "uppackad storlek är %s, %s förväntades"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "unpacking %s"
|
|
|
msgstr "packar upp %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: copy source of '%s' not in parents of %s"
|
|
|
msgstr "varning: kopieringskällan för '%s' inte i föräldrar till %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "empty or missing copy source revlog %s:%s"
|
|
|
msgstr "tom eller saknar kopieringskälla för revlog %s:%s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
|
|
|
msgstr "varning: %s@%s: kopieringskällrevision är nullid %s:%s\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "checking rename of %s"
|
|
|
msgstr "kontrollerar namnbytet på %s"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%s in manifests not found"
|
|
|
msgstr "%s i manifest hittades inte"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "warning: orphan revlog '%s'"
|
|
|
msgstr "varning: övergiven revlog '%s'"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d files, %d changesets, %d total revisions\n"
|
|
|
msgstr "%d filer, %d ändringar, %d totala revisioner\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d warnings encountered!\n"
|
|
|
msgstr "%d varningar påträffades!\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "%d integrity errors encountered!\n"
|
|
|
msgstr "%d integritetsfel påträffades!\n"
|
|
|
|
|
|
#, python-format
|
|
|
msgid "(first damaged changeset appears to be %d)\n"
|
|
|
msgstr "(första skadade ändringen verkar vara %d)\n"
|
|
|
|
|
|
msgid "user name not available - set USERNAME environment variable"
|
|
|
msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME"
|
|
|
|
|
|
msgid "look up remote revision"
|
|
|
msgstr "söker fjärrevision"
|
|
|
|
|
|
msgid "look up remote changes"
|
|
|
msgstr "söker fjärrändringar"
|
|
|
|
|
|
msgid "push failed:"
|
|
|
msgstr "tryckning misslyckades:"
|
|
|
|
|
|
msgid "push failed (unexpected response):"
|
|
|
msgstr "tryckning misslyckades (oväntat svar):"
|
|
|
|
