i18n-sv: synchronized with d1b49b02bc16

i18n/sv.po

@@ -1,18650 +1,19952 b''
 # Swedish translation for Mercurial
 # Svensk översättning för Mercurial
 # Copyright (C) 2009-2012 Matt Mackall and others
 #
 # Translation dictionary:
 #
+# amend      förändra
 # changeset  ändring
 # commit     arkivera
+# graft      ympa
 # merge      sammanfoga
+# strip      avlägsna
 # tag        märke
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2012-01-30 16:25+0100\n"
-"PO-Revision-Date: 2012-01-30 16:27+0100\n"
+"POT-Creation-Date: 2012-07-23 20:26+0200\n"
+"PO-Revision-Date: 2012-07-23 20:38+0200\n"
 "Last-Translator: Jens Bäckman <[e-mail]>\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ökningar ä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 ""
+"You can add the \"!\" prefix to a user or group name to invert the sense\n"
+"of the match."
+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"
+"  # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n"
+"  # will have write access to any file under the \"resources\" folder\n"
+"  # (except for 1 file. See acl.deny):\n"
 "  src/main/resources/** = *"
 msgstr ""
 
 msgid "  .hgtags = release_engineer"
 msgstr ""
 
+msgid ""
+"Examples using the \"!\" prefix\n"
+"............................."
+msgstr ""
+
+msgid ""
+"Suppose there's a branch that only a given user (or group) should be able "
+"to\n"
+"push to, and you don't want to restrict access to any other branch that may\n"
+"be created."
+msgstr ""
+
+msgid ""
+"The \"!\" prefix allows you to prevent anyone except a given user or group "
+"to\n"
+"push changesets in a given branch or path."
+msgstr ""
+
+msgid ""
+"In the examples below, we will:\n"
+"1) Deny access to branch \"ring\" to anyone but user \"gollum\"\n"
+"2) Deny access to branch \"lake\" to anyone but members of the group \"hobbit"
+"\"\n"
+"3) Deny access to a file to anyone but user \"gollum\""
+msgstr ""
+
+msgid ""
+"  [acl.allow.branches]\n"
+"  # Empty"
+msgstr ""
+
+msgid ""
+"  # 1) only 'gollum' can commit to branch 'ring';\n"
+"  # 'gollum' and anyone else can still commit to any other branch.\n"
+"  ring = !gollum"
+msgstr ""
+
+msgid ""
+"  # 2) only members of the group 'hobbit' can commit to branch 'lake';\n"
+"  # 'hobbit' members and anyone else can still commit to any other branch.\n"
+"  lake = !@hobbit"
+msgstr ""
+
+msgid "  # You can also deny access based on file paths:"
+msgstr ""
+
+msgid ""
+"  [acl.allow]\n"
+"  # Empty"
+msgstr ""
+
+msgid ""
+"  [acl.deny]\n"
+"  # 3) only 'gollum' can change the file below;\n"
+"  # 'gollum' and anyone else can still change any other file.\n"
+"  /misty/mountains/cave/ring = !gollum"
+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: user \"%s\" denied on \"%s\" (changeset \"%s\")"
 msgstr "acl: användaren \"%s\" nekades på \"%s\" (ändringen \"%s\")"
 
 #, python-format
 msgid "acl: user \"%s\" not allowed on \"%s\" (changeset \"%s\")"
 msgstr "acl: användaren \"%s\" tillåts inte på \"%s\" (ändringen \"%s\")"
 
 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 comment is formatted using\n"
 "the Mercurial template mechanism."
 msgstr ""
 
-msgid "The hook does not change bug status."
+msgid ""
+"The bug references can optionally include an update for Bugzilla of the\n"
+"hours spent working on the bug. Bugs can also be marked fixed."
 msgstr ""
 
 msgid "Three basic modes of access to Bugzilla are provided:"
 msgstr ""
 
 msgid ""
 "1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later."
 msgstr ""
 
 msgid ""
 "2. Check data via the Bugzilla XMLRPC interface and submit bug change\n"
 "   via email to Bugzilla email interface. Requires Bugzilla 3.4 or later."
 msgstr ""
 
 msgid ""
 "3. Writing directly to the Bugzilla database. Only Bugzilla installations\n"
 "   using MySQL are supported. Requires Python MySQLdb."
 msgstr ""
 
 msgid ""
 "Writing directly to the database is susceptible to schema changes, and\n"
 "relies on a Bugzilla contrib script to send out bug change\n"
 "notification emails. This script runs as the user running Mercurial,\n"
 "must be run on the host with the Bugzilla install, and requires\n"
 "permission to read Bugzilla configuration details and the necessary\n"
 "MySQL user and password to have full access rights to the Bugzilla\n"
 "database. For these reasons this access mode is now considered\n"
 "deprecated, and will not be updated for new Bugzilla versions going\n"
-"forward."
+"forward. Only adding comments is supported in this access mode."
 msgstr ""
 
 msgid ""
 "Access via XMLRPC needs a Bugzilla username and password to be specified\n"
 "in the configuration. Comments are added under that username. Since the\n"
 "configuration must be readable by all Mercurial users, it is recommended\n"
 "that the rights of that user are restricted in Bugzilla to the minimum\n"
-"necessary to add comments."
+"necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and "
+"later."
 msgstr ""
 
 msgid ""
 "Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n"
 "email to the Bugzilla email interface to submit comments to bugs.\n"
 "The From: address in the email is set to the email address of the Mercurial\n"
 "user, so the comment appears to come from the Mercurial user. In the event\n"
 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n"
 "user, the email associated with the Bugzilla username used to log into\n"
-"Bugzilla is used instead as the source of the comment."
+"Bugzilla is used instead as the source of the comment. Marking bugs fixed\n"
+"works on all supported Bugzilla versions."
 msgstr ""
 
 msgid "Configuration items common to all access modes:"
 msgstr ""
 
 msgid ""
 "bugzilla.version\n"
 "  This access type to use. Values recognised are:"
 msgstr ""
 
 msgid ""
 "  :``xmlrpc``:       Bugzilla XMLRPC interface.\n"
 "  :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n"
 "  :``3.0``:          MySQL access, Bugzilla 3.0 and later.\n"
 "  :``2.18``:         MySQL access, Bugzilla 2.18 and up to but not\n"
 "                     including 3.0.\n"
 "  :``2.16``:         MySQL access, Bugzilla 2.16 and up to but not\n"
 "                     including 2.18."
 msgstr ""
 
 msgid ""
 "bugzilla.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``,\n"
-"  ``Bug 1234 and 5678`` and variations thereof. Matching is case\n"
-"  insensitive."
+"  Regular expression to match bug IDs for update in changeset commit "
+"message.\n"
+"  It must contain one \"()\" named group ``<ids>`` containing the bug\n"
+"  IDs separated by non-digit characters. It may also contain\n"
+"  a named group ``<hours>`` with a floating-point number giving the\n"
+"  hours worked on the bug. If no named groups are present, the first\n"
+"  \"()\" group is assumed to contain the bug IDs, and work time is not\n"
+"  updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,\n"
+"  ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and\n"
+"  variations thereof, followed by an hours number prefixed by ``h`` or\n"
+"  ``hours``, e.g. ``hours 1.5``. Matching is case insensitive."
+msgstr ""
+
+msgid ""
+"bugzilla.fixregexp\n"
+"  Regular expression to match bug IDs for marking fixed in changeset\n"
+"  commit message. This must contain a \"()\" named group ``<ids>` "
+"containing\n"
+"  the bug IDs separated by non-digit characters. It may also contain\n"
+"  a named group ``<hours>`` with a floating-point number giving the\n"
+"  hours worked on the bug. If no named groups are present, the first\n"
+"  \"()\" group is assumed to contain the bug IDs, and work time is not\n"
+"  updated. The default expression matches ``Fixes 1234``, ``Fixes bug "
+"1234``,\n"
+"  ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and\n"
+"  variations thereof, followed by an hours number prefixed by ``h`` or\n"
+"  ``hours``, e.g. ``hours 1.5``. Matching is case insensitive."
+msgstr ""
+
+msgid ""
+"bugzilla.fixstatus\n"
+"  The status to set a bug to when marking fixed. Default ``RESOLVED``."
+msgstr ""
+
+msgid ""
+"bugzilla.fixresolution\n"
+"  The resolution to set a bug to when marking fixed. Default ``FIXED``."
 msgstr ""
 
 msgid ""
 "bugzilla.style\n"
 "  The style file to use when formatting comments."
 msgstr ""
 
 msgid ""
 "bugzilla.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 to bug\n"
 "  {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
 msgstr ""
 
 msgid ""
 "bugzilla.strip\n"
 "  The number of path separator characters to strip from the front of\n"
 "  the Mercurial repository path (``{root}`` in templates) to produce\n"
 "  ``{webroot}``. For example, a repository with ``{root}``\n"
 "  ``/var/local/my-project`` with a strip of 2 gives a value for\n"
 "  ``{webroot}`` of ``my-project``. Default 0."
 msgstr ""
 
 msgid ""
 "web.baseurl\n"
 "  Base URL for browsing Mercurial repositories. Referenced from\n"
 "  templates as ``{hgweb}``."
 msgstr ""
 
 msgid "Configuration items common to XMLRPC+email and MySQL access modes:"
 msgstr ""
 
 msgid ""
 "bugzilla.usermap\n"
 "  Path of file containing Mercurial committer email to Bugzilla user email\n"
 "  mappings. If specified, the file should contain one mapping per\n"
 "  line::"
 msgstr ""
 
 msgid "    committer = Bugzilla user"
 msgstr ""
 
 msgid "  See also the ``[usermap]`` section."
 msgstr ""
 
 msgid ""
 "The ``[usermap]`` section is used to specify mappings of Mercurial\n"
 "committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n"
 "Contains entries of the form ``committer = Bugzilla user``."
 msgstr ""
 
 msgid "XMLRPC access mode configuration:"
 msgstr ""
 
 msgid ""
 "bugzilla.bzurl\n"
 "  The base URL for the Bugzilla installation.\n"
 "  Default ``http://localhost/bugzilla``."
 msgstr ""
 
 msgid ""
 "bugzilla.user\n"
 "  The username to use to log into Bugzilla via XMLRPC. Default\n"
 "  ``bugs``."
 msgstr ""
 
 msgid ""
 "bugzilla.password\n"
 "  The password for Bugzilla login."
 msgstr ""
 
 msgid ""
 "XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n"
 "and also:"
 msgstr ""
 
 msgid ""
 "bugzilla.bzemail\n"
 "  The Bugzilla email address."
 msgstr ""
 
 msgid ""
 "In addition, the Mercurial email settings must be configured. See the\n"
 "documentation in hgrc(5), sections ``[email]`` and ``[smtp]``."
 msgstr ""
 
 msgid "MySQL access mode configuration:"
 msgstr ""
 
 msgid ""
 "bugzilla.host\n"
 "  Hostname of the MySQL server holding the Bugzilla database.\n"
 "  Default ``localhost``."
 msgstr ""
 
 msgid ""
 "bugzilla.db\n"
 "  Name of the Bugzilla database in MySQL. Default ``bugs``."
 msgstr ""
 
 msgid ""
 "bugzilla.user\n"
 "  Username to use to access MySQL server. Default ``bugs``."
 msgstr ""
 
 msgid ""
 "bugzilla.password\n"
 "  Password to use to access MySQL server."
 msgstr ""
 
 msgid ""
 "bugzilla.timeout\n"
 "  Database connection timeout (seconds). Default 5."
 msgstr ""
 
 msgid ""
 "bugzilla.bzuser\n"
 "  Fallback Bugzilla user name to record comments with, if changeset\n"
 "  committer cannot be found as a Bugzilla user."
 msgstr ""
 
 msgid ""
 "bugzilla.bzdir\n"
 "   Bugzilla install directory. Used by default notify. Default\n"
 "   ``/var/www/html/bugzilla``."
 msgstr ""
 
 msgid ""
 "bugzilla.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\n"
 "  id) and ``user`` (committer bugzilla email). Default depends on\n"
 "  version; from 2.18 it is \"cd %(bzdir)s && perl -T\n"
 "  contrib/sendbugmail.pl %(id)s %(user)s\"."
 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 configurations:"
 msgstr "Exempelkonfigurationer:"
 
 msgid ""
 "XMLRPC example configuration. This uses the Bugzilla at\n"
 "``http://my-project.org/bugzilla``, logging in as user\n"
 "``[e-mail]`` with password ``plugh``. It is used with a\n"
 "collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
 "with a web interface at ``http://my-project.org/hg``. ::"
 msgstr ""
 
 msgid ""
 "    [bugzilla]\n"
 "    bzurl=http://my-project.org/bugzilla\n"
 "    user=[e-mail]\n"
 "    password=plugh\n"
 "    version=xmlrpc\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://my-project.org/hg"
 msgstr ""
 
 msgid ""
 "XMLRPC+email example configuration. This uses the Bugzilla at\n"
 "``http://my-project.org/bugzilla``, logging in as user\n"
 "``[e-mail]`` with password ``plugh``. It is used with a\n"
 "collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
 "with a web interface at ``http://my-project.org/hg``. Bug comments\n"
 "are sent to the Bugzilla email address\n"
 "``[e-mail]``. ::"
 msgstr ""
 
 msgid ""
 "    [bugzilla]\n"
 "    bzurl=http://my-project.org/bugzilla\n"
 "    user=[e-mail]\n"
 "    password=plugh\n"
 "    version=xmlrpc\n"
 "    bzemail=[e-mail]\n"
 "    template=Changeset {node|short} in {root|basename}.\n"
 "             {hgweb}/{webroot}/rev/{node|short}\\n\n"
 "             {desc}\\n\n"
 "    strip=5"
 msgstr ""
 
 msgid ""
 "    [usermap]\n"
 "    [e-mail]=[e-mail]"
 msgstr ""
 
 msgid ""
 "MySQL example configuration. This has a local Bugzilla 3.2 installation\n"
 "in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n"
 "the Bugzilla database name is ``bugs`` and MySQL is\n"
 "accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n"
 "with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
 "with a web interface at ``http://my-project.org/hg``. ::"
 msgstr ""
 
 msgid ""
 "    [bugzilla]\n"
 "    host=localhost\n"
 "    password=XYZZY\n"
 "    version=3.0\n"
 "    bzuser=[e-mail]\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 "All the above add a comment to the Bugzilla bug record of the form::"
 msgstr ""
 
 msgid ""
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://my-project.org/hg/repository-name/rev/3b16791d6642"
 msgstr ""
 
 msgid "    Changeset commit comment. Bug 1234.\n"
 msgstr ""
 
 #, python-format
 msgid "python mysql support not available: %s"
 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 does not exist\n"
+msgstr "bugg %d existerar inte\n"
+
+#, 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 ""
 
+msgid "Bugzilla/MySQL cannot update bug state\n"
+msgstr ""
+
+msgid "Bugzilla/XMLRPC needs Bugzilla 4.0 or later to mark bugs fixed\n"
+msgstr ""
+
 msgid "configuration 'bzemail' missing"
 msgstr "'bzemail' inte konfigurerad"
 
 #, python-format
 msgid "default bugzilla user %s email not found"
 msgstr ""
 
 #, python-format
 msgid "bugzilla version %s not supported"
 msgstr "bugzilla version %s stöds inte"
 
+#, python-format
+msgid "%s: invalid hours\n"
+msgstr "%s: ogiltiga timmar\n"
+
 msgid ""
 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
 "details:\n"
 "\t{desc|tabindent}"
 msgstr ""
 
 #, python-format
 msgid "hook type %s does not pass a changeset id"
 msgstr ""
 
 #, python-format
 msgid "Bugzilla error: %s"
 msgstr "Bugzilla-fel: %s"
 
-msgid "command to display child changesets"
-msgstr ""
+msgid "command to display child changesets (DEPRECATED)"
+msgstr "kommando för att visa barnändringar (FÖRLEGAD)"
+
+msgid ""
+"This extension is deprecated. You should use :hg:`log -r\n"
+"\"children(REV)\"` instead.\n"
+msgstr ""
+"Detta är en förlegad utökning. Du kan avända :hg:`log -r\n"
+"\"children(REV)\"` instead.\n"
 
 msgid "show the children of the given or working directory revision"
 msgstr ""
 
 msgid ""
 "    Print the children of the working directory's revisions. If a\n"
 "    revision is given via -r/--rev, the children of that revision will\n"
 "    be printed. If a file argument is given, revision in which the\n"
 "    file was last changed (after the working directory revision or the\n"
 "    argument to --rev if given) is printed.\n"
 "    "
 msgstr ""
 
 msgid "REV"
 msgstr "REV"
 
 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"
+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\n"
 "to their output to reflect file status, the qseries command to add\n"
 "color to reflect patch status (applied, unapplied, missing), and to\n"
 "diff-related commands to highlight additions, removals, diff headers,\n"
 "and trailing 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. By default, the terminfo database is used to find the\n"
 "terminal codes used to change color and effect.  If terminfo is not\n"
 "available, then effects are rendered with the ECMA-48 SGR control\n"
 "function (aka ANSI escape codes)."
 msgstr ""
 "Andra effekter förutom färg, såsom fet och understryken text, är också\n"
 "tillgänglig. Som standard används terminfo-databasen för att hitta\n"
 "terminalkoderna för att ändra färg och effekt. Om terminfo inte är\n"
 "tillgänglig, så renderas effekterna med kontrollfunktionerna ECMA-48 SGR\n"
 "(ANSI-escape-koder)."
 
 msgid "Default effects may be overridden from your configuration file::"
 msgstr "Standardeffekter kan modifieras från din konfigurationsfil::"
 
 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 ""
 "  tags.normal = green\n"
 "  tags.local = black bold"
 msgstr ""
 "  tags.normal = green\n"
 "  tags.local = black bold"
 
 msgid ""
 "The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
 "'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
 "ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
 "'underline'.  How each is rendered depends on the terminal emulator.\n"
 "Some may not be available for a given terminal type, and will be\n"
 "silently ignored."
 msgstr ""
 "De tillgängliga effekterna i terminfo-läge är 'blink', 'bold', 'dim',\n"
 "'inverse', 'invisible', 'italic', 'standout', och 'underline'; i\n"
 "ECMA-48-läge, så är 'bold', 'inverse', 'italic', och 'underline'\n"
 "tillgängliga. Hur varje effekt renderas beror på terminalemulatorn. Vissa\n"
 "kan vara otillgängliga för en viss terminaltyp, och kommer att ignoreras i\n"
 "det tysta."
 
 msgid ""
 "Note that on some systems, terminfo mode may cause problems when using\n"
 "color with the pager extension and less -R. less with the -R option\n"
 "will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
 "emit codes that less doesn't understand. You can work around this by\n"
 "either using ansi mode (or auto mode), or by using less -r (which will\n"
 "pass through all terminal control codes, not just color control\n"
 "codes)."
 msgstr ""
 "Notera att på vissa system kan terminfo-läget orsaka problem när color-\n"
 "och pager-utökningarna används med less -R. less med flaggan -R kommer bara\n"
 "att visa ECMA-48-färgkoder, och terminfo kan sända koder som less inte\n"
 "förstår. Du kan gå runt detta genom att endera använda ansi-läge (eller\n"
 "auto-läge), eller att använda less -r (som skickar vidare alla\n"
 "terminalkoder, inte bara färgkoder)."
 
 msgid ""
 "Because there are only eight standard colors, this module allows you\n"
 "to define color names for other color slots which might be available\n"
 "for your terminal type, assuming terminfo mode.  For instance::"
 msgstr ""
 "Eftersom det bara finns åtta standardfärger, tillåter denna modul dig att\n"
 "definiera färgnamn för andra färgnummer som är tillgängliga för din\n"
 "terminaltyp. Exempelvis::"
 
 msgid ""
 "  color.brightblue = 12\n"
 "  color.pink = 207\n"
 "  color.orange = 202"
 msgstr ""
 "  color.brightblue = 12\n"
 "  color.pink = 207\n"
 "  color.orange = 202"
 
 msgid ""
 "to set 'brightblue' to color slot 12 (useful for 16 color terminals\n"
 "that have brighter colors defined in the upper eight) and, 'pink' and\n"
 "'orange' to colors in 256-color xterm's default color cube.  These\n"
 "defined colors may then be used as any of the pre-defined eight,\n"
 "including appending '_background' to set the background to that color."
 msgstr ""
 "för att sätta 'brightblue' till färgnummer 12 (användbart för terminaler\n"
 "med 16 färger som har ljusare färger definierade bland de övre åtta), samt\n"
 "'pink' och 'orange' till färger i 256-färgs terminalfärger. Dessa\n"
 "definierade färger kan sedan användas som vilken som helst av de\n"
 "fördefinierade åtta, inklusive att lägga till '_background' för att sätta\n"
 "bakgrunden till den färgen."
 
 msgid ""
 "By default, the color extension will use ANSI mode (or win32 mode on\n"
 "Windows) if it detects a terminal. To override auto mode (to enable\n"
 "terminfo mode, for example), set the following configuration option::"
 msgstr ""
 "Som standard kommer color-utökningen att använda ANSI-läge (eller\n"
 "win32-läge i Windows) om en terminal upptäcks. För att upphäva auto-läge\n"
 "(för att exempelvis aktivera terminfo-läge), sätt följande\n"
 "konfigurationsflagga::"
 
 msgid ""
 "  [color]\n"
 "  mode = terminfo"
 msgstr ""
 "  [color]\n"
 "  mode = terminfo"
 
 msgid ""
 "Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
 "disable color.\n"
 msgstr ""
 "Ett värde skilt från 'ansi', 'win32', 'terminfo' eller 'auto' stänger av\n"
 "färg.\n"
 
 msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
 msgstr "ingen terminfo-post för setab/setaf: återgår till ECMA-48-färger\n"
 
 #, python-format
 msgid "warning: failed to set color mode to %s\n"
 msgstr "varning: kunde inte sätta färgläge till %s\n"
 
 #, 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"
 
 #. 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\n"
 "    text file that maps each source commit ID to the destination ID\n"
 "    for that 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 ""
 "    The Mercurial source recognizes the following configuration\n"
 "    options, which you can set on the command line with ``--config``:"
 msgstr ""
 
 msgid ""
 "    :convert.hg.ignoreerrors: ignore integrity errors when reading.\n"
 "        Use it to fix Mercurial repositories with missing revlogs, by\n"
 "        converting from and to Mercurial. Default is False."
 msgstr ""
 
 msgid ""
 "    :convert.hg.saverev: store original revision ID in changeset\n"
 "        (forces target IDs to change). It takes a boolean argument and\n"
 "        defaults to False."
 msgstr ""
 
 msgid ""
 "    :convert.hg.startrev: convert start revision and its descendants.\n"
 "        It takes a hg revision identifier and defaults to 0."
 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\n"
 "    directory in the sandbox to find the CVS repository, and then uses\n"
 "    CVS rlog commands to find files to convert. This means that unless\n"
 "    a 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 following options can be used with ``--config``:"
 msgstr ""
 
 msgid ""
 "    :convert.cvsps.cache: Set to False to disable remote log caching,\n"
 "        for testing and debugging purposes. Default is True."
 msgstr ""
 
 msgid ""
 "    :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n"
 "        allowed between commits with identical user and log message in\n"
 "        a single changeset. When very large files were checked in as\n"
 "        part of a changeset then the default may not be long enough.\n"
 "        The default is 60."
 msgstr ""
 
 msgid ""
 "    :convert.cvsps.mergeto: Specify a regular expression to which\n"
 "        commit log messages are matched. If a match occurs, then the\n"
 "        conversion process will insert a dummy revision merging the\n"
 "        branch on which this log message occurs to the branch\n"
 "        indicated in the regex. Default is ``{{mergetobranch\n"
 "        ([-\\w]+)}}``"
 msgstr ""
 
 msgid ""
 "    :convert.cvsps.mergefrom: Specify a regular expression to which\n"
 "        commit log messages are matched. If a match occurs, then the\n"
 "        conversion process will add the most recent revision on the\n"
 "        branch indicated in the regex as the second parent of the\n"
 "        changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``"
 msgstr ""
 
 msgid ""
 "    :hook.cvslog: Specify a Python function to be called at the end of\n"
 "        gathering the CVS log. The function is passed a list with the\n"
 "        log entries, and can modify the entries in-place, or add or\n"
 "        delete them."
 msgstr ""
 
 msgid ""
 "    :hook.cvschangesets: Specify a Python function to be called after\n"
 "        the changesets are calculated from the the CVS log. The\n"
 "        function is passed a list with the changeset entries, and can\n"
 "        modify the changesets 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\n"
 "    it replaces the default branch. If ``svn://repo/path/branches``\n"
 "    exists, 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``\n"
 "    values 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 "    The following options can be set with ``--config``:"
 msgstr ""
 
 msgid ""
 "    :convert.svn.branches: specify the directory containing branches.\n"
 "        The default is ``branches``."
 msgstr ""
 
 msgid ""
 "    :convert.svn.tags: specify the directory containing tags. The\n"
 "        default is ``tags``."
 msgstr ""
 
 msgid ""
 "    :convert.svn.trunk: specify the name of the trunk branch. The\n"
 "        default is ``trunk``."
 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 ""
 "    :convert.svn.startrev: specify start Subversion revision number.\n"
 "        The default is 0."
 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 ""
 "    :convert.p4.startrev: specify initial Perforce revision (a\n"
 "        Perforce changelist number)."
 msgstr ""
 
 msgid ""
 "    Mercurial Destination\n"
 "    '''''''''''''''''''''"
 msgstr ""
 "    Mercurial-destination\n"
 "    '''''''''''''''''''''"
 
 msgid "    The following options are supported:"
 msgstr ""
 
 msgid ""
 "    :convert.hg.clonebranches: dispatch source branches in separate\n"
 "        clones. The default is False."
 msgstr ""
 
 msgid ""
 "    :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n"
 "        ``default``."
 msgstr ""
 
 msgid ""
 "    :convert.hg.usebranchnames: preserve branch names. The default is\n"
 "        True.\n"
 "    "
 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 ""
 
 msgid ":svnrev: String. Converted subversion revision number."
 msgstr ""
 
 msgid ":svnpath: String. Converted subversion revision project path."
 msgstr ""
 
 msgid ":svnuuid: String. Converted subversion revision repository identifier."
 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 ""
+msgid "%s is not a valid revision"
+msgstr "%s är inte en giltig revision"
 
 #, 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 "syntax error in %s(%d): child parent1[,parent2] expected"
+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 "splice map revision %s is not being converted, ignoring\n"
+msgstr ""
+
+#, python-format
+msgid "unknown splice map parent: %s"
+msgstr ""
+
+#, 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"
+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 "drar från %s till %s\n"
 
 msgid "filtering out empty revision\n"
 msgstr "filtrerar bort tom revision\n"
 
 msgid "updating tags\n"
 msgstr "uppdaterar märken\n"
 
 msgid "updating bookmarks\n"
 msgstr "uppdaterar bokmärken\n"
 
 #, python-format
+msgid ""
+"revision %s not found in destination repository (lookups with "
+"clonebranches=true are not implemented)"
+msgstr ""
+
+#, python-format
 msgid "%s is not a valid start revision"
 msgstr ""
 
 #, python-format
 msgid "ignoring: %s\n"
 msgstr "ignorerar: %s\n"
 
 #, python-format
 msgid "%s does not look like a monotone repository"
 msgstr "%s verkar inte vara ett monotone-arkiv"
 
 msgid "bad mtn packet - no end of commandnbr"
 msgstr ""
 
 #, python-format
 msgid "bad mtn packet - bad stream type %s"
 msgstr ""
 
 msgid "bad mtn packet - no divider before size"
 msgstr ""
 
 msgid "bad mtn packet - no end of packet size"
 msgstr ""
 
 #, python-format
 msgid "bad mtn packet - bad packet size %s"
 msgstr ""
 
 #, python-format
 msgid "bad mtn packet - unable to read full packet read %s of %s"
 msgstr ""
 
 #, python-format
 msgid "mtn command '%s' returned %s"
 msgstr "mtn-kommandot '%s' returnerade %s"
 
 #, python-format
 msgid "copying file in renamed directory from '%s' to '%s'"
 msgstr ""
 
 msgid "unable to determine mtn automate interface version"
 msgstr ""
 
 #, python-format
 msgid "mtn automate stdio header unexpected: %s"
 msgstr ""
 
 msgid "failed to reach end of mtn automate stdio headers"
 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 "debugsvnlog could not load Subversion python bindings"
+msgstr ""
+
 msgid "Mercurial failed to run itself, check hg executable is in PATH"
 msgstr ""
 
 #, python-format
 msgid "log stream exception '%s'"
 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 "Could not load Subversion python bindings"
+msgid "could not load Subversion python bindings"
 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 "svn: revision %s not found"
 msgstr "svn: revisionen %s hittades inte"
 
 #, 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 ""
 
+#, python-format
+msgid ""
+"splice map revision %s not found in subversion child map (revision lookups "
+"are not implemented)"
+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 found in the root of the working copy. 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 how line endings should be\n"
 "converted between the working copy and the repository. The format is\n"
 "specified by a file pattern. The first match is used, so put more\n"
 "specific patterns first. The available line endings are ``LF``,\n"
 "``CRLF``, and ``BIN``."
 msgstr ""
 
 msgid ""
 "Files with the declared format of ``CRLF`` or ``LF`` are always\n"
 "checked out and stored in the repository in that format and files\n"
 "declared to be binary (``BIN``) are left unchanged. Additionally,\n"
 "``native`` is an alias for checking out in the platform's default line\n"
 "ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n"
 "Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n"
 "default behaviour; it is only needed if you need to override a later,\n"
 "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 ""
 ".. note::\n"
 "   The rules will first apply when files are touched in the working\n"
 "   copy, e.g. by updating to null and back to tip to touch all files."
 msgstr ""
 
 msgid ""
 "The extension uses an optional ``[eol]`` section read from both the\n"
 "normal Mercurial configuration files and the ``.hgeol`` file, with the\n"
 "latter overriding the former. You can use that section to control the\n"
 "overall behavior. There are three 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 ""
 "- ``eol.fix-trailing-newline`` (default False) can be set to True to\n"
 "  ensure that converted files end with a EOL character (either ``\\n``\n"
 "  or ``\\r\\n`` as per the configured patterns)."
 msgstr ""
 
 msgid ""
 "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n"
 "like the deprecated win32text extension does. This means that you can\n"
 "disable win32text and enable eol and your filters will still work. You\n"
 "only need to these filters until you have prepared a ``.hgeol`` file."
 msgstr ""
 
 msgid ""
 "The ``win32text.forbid*`` hooks provided by the win32text extension\n"
 "have been unified into a single hook named ``eol.checkheadshook``. The\n"
 "hook will lookup the expected line endings from the ``.hgeol`` file,\n"
 "which means you must migrate to a ``.hgeol`` file first before using\n"
 "the hook. ``eol.checkheadshook`` only checks heads, intermediate\n"
 "invalid revisions will be pushed. To forbid them completely, use the\n"
 "``eol.checkallhook`` hook. These hooks are best used as\n"
 "``pretxnchangegroup`` hooks."
 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 "ignoring unknown EOL style '%s' from %s\n"
 msgstr "ignorerar okänd EOL-stil '%s' från %s\n"
 
 #, python-format
 msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
 msgstr "varning: ignorerar .hgeol-fil, parsningsfel vid %s: %s\n"
 
 #, python-format
 msgid "  %s in %s should not have %s line endings"
 msgstr "  %s i %s borde inte ha %s-radslut"
 
 msgid "end-of-line check failed:\n"
 msgstr "radslutskontroll misslyckades:\n"
 
 msgid "the eol extension is incompatible with the win32text extension\n"
 msgstr "eol-utökningen är inkompatibel med win32text-utökningen\n"
 
 #, python-format
 msgid "inconsistent newline style in %s\n"
 msgstr "inkonsekvent radslutsstil i %s\n"
 
 msgid "command to allow external programs to compare revisions"
 msgstr ""
 
 msgid ""
 "The extdiff Mercurial extension allows you to use external programs\n"
 "to compare revisions, or revision with working directory. The external\n"
 "diff programs are called with a configurable set of options and two\n"
 "non-option arguments: paths to directories containing snapshots of\n"
 "files to compare."
 msgstr ""
 
 msgid ""
 "The extdiff extension also allows you 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)'"
+"  vimdiff = gvim -f \"+next\" \\\n"
+"            \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(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"
 "  $root              - repository root\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 "revision"
 msgstr "revision"
 
 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"
+msgid "http authentication with factotum"
+msgstr ""
+
+msgid ""
+"This extension allows the factotum(4) facility on Plan 9 from Bell Labs\n"
+"platforms to provide authentication information for HTTP access. "
+"Configuration\n"
+"entries specified in the auth section as well as authentication information\n"
+"provided in the repository URL are fully supported. If no prefix is "
+"specified,\n"
+"a value of \"*\" will be assumed."
+msgstr ""
+
+msgid "By default, keys are specified as::"
+msgstr ""
+
+msgid ""
+"  proto=pass service=hg prefix=<prefix> user=<username> !password=<password>"
+msgstr ""
+
+msgid ""
+"If the factotum extension is unable to read the required key, one will be\n"
+"requested interactively."
+msgstr ""
+
+msgid ""
+"A configuration section is available to customize runtime behavior. By\n"
+"default, these entries are::"
+msgstr ""
+
+msgid ""
+"  [factotum]\n"
+"  executable = /bin/auth/factotum\n"
+"  mountpoint = /mnt/factotum\n"
+"  service = hg"
+msgstr ""
+
+msgid ""
+"The executable entry defines the full path to the factotum binary. The\n"
+"mountpoint entry defines the path to the factotum file service. Lastly, the\n"
+"service entry controls the service name used when reading keys."
+msgstr ""
+
+msgid "factotum not interactive"
+msgstr ""
+
+msgid "factotum not responding"
+msgstr ""
+
+msgid "pull, update and merge in one command (DEPRECATED)"
 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."
+"    When a merge is needed, the working directory is first updated to\n"
+"    the newly pulled changes. Local changes are then merged into the\n"
+"    pulled changes. To switch the merge 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 "
+"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 "
+"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 "hg sigs"
 msgstr "hg sigs"
 
 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 "hg sigcheck REVISION"
-msgstr "hg sigcheck REVISION"
+msgid "hg sigcheck REV"
+msgstr "hg sigcheck REV"
 
 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 "no valid signature for %s\n"
+msgstr "ingen giltig signatur för %s\n"
 
 msgid "make the signature local"
 msgstr "gör signaturen lokal"
 
 msgid "sign even if the sigfile is modified"
 msgstr "signera även om signaturfilen är modifierad"
 
 msgid "do not commit the sigfile after signing"
 msgstr "arkivera inte signaturfilen efter signering"
 
 msgid "ID"
 msgstr "ID"
 
 msgid "the key id to sign with"
 msgstr "nyckel-ID att signera med"
 
 msgid "TEXT"
 msgstr "TEXT"
 
 msgid "commit message"
 msgstr "arkiveringsmeddelande"
 
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr "hg sign [FLAGGA]... [REVISION]..."
+msgid "hg sign [OPTION]... [REV]..."
+msgstr "hg sign [FLAGGA]... [REV]..."
 
 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 "oarkiverad sammanfogning - ange en specifik revision"
 
 #, python-format
-msgid "Signing %d:%s\n"
-msgstr "Signerar %d:%s\n"
+msgid "signing %d:%s\n"
+msgstr "signerar %d:%s\n"
 
 msgid "error while signing"
 msgstr "fel vid signering"
 
 msgid ""
 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
 "force)"
 msgstr ""
 "arbetskopian av .hgsigs är ändrad (arkivera .hgsigs manuellt eller använd\n"
 "--force)"
 
 msgid "unknown signature version"
 msgstr "okänd signaturversion"
 
 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 "-G/--graph option is incompatible with --%s"
-msgstr "flaggan -G/--graph är inkompatibel med --%s"
-
-msgid "-G/--graph option is incompatible with --follow with file argument"
-msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument"
-
-msgid "NUM"
-msgstr "NUM"
-
-msgid "limit number of changes displayed"
-msgstr "begränsa antalet visade ändringar"
-
-msgid "show patch"
-msgstr "visa patch"
+msgid "follow changeset history, or file history across copies and renames"
+msgstr ""
+"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
+
+msgid "only follow the first parent of merge changesets (DEPRECATED)"
+msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)"
+
+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 "show the specified revision or range"
 msgstr "visa den specifika revisionen eller serien"
 
-msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [FLAGGA]... [FIL]"
+msgid "include revisions where files were removed"
+msgstr "inkludera revisioner där filer togs bort"
+
+msgid "show only merges (DEPRECATED)"
+msgstr "visa bara sammanfogningar (FÖRLEGAD)"
+
+msgid "USER"
+msgstr "ANVÄNDARE"
+
+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 "BRANCH"
+msgstr "GREN"
+
+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 "show hidden changesets (DEPRECATED)"
+msgstr "visa dolda ändringar (FÖRLEGAD)"
+
+msgid "[OPTION]... [FILE]"
+msgstr "[FLAGGA]... [FIL]"
 
 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 "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}{webroot}/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:[e-mail]\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\n"
 "  # number of slashes to strip for url paths\n"
 "  #strip = 0"
 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 "NUM"
+msgstr "NUM"
+
+msgid "limit number of changes displayed"
+msgstr "begränsa antalet visade ändringar"
+
 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 ""
 
 #. i18n: bisect changeset status
 msgid "ignored"
 msgstr "ignorerad"
 
 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 ""
+msgstr "syntaxfärgning för hgweb (kräver Pygments)"
 
 msgid ""
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/"
 msgstr ""
+"Den beror på syntaxfärgningsbiblioteket Pygments:\n"
+"http://pygments.org/"
 
 msgid "There is a single configuration option::"
-msgstr ""
+msgstr "Det finns ett enda konfigurationsalternativ::"
 
 msgid ""
 "  [web]\n"
 "  pygments_style = <style>"
 msgstr ""
+"  [web]\n"
+"  pygments_style = <style>"
 
 msgid "The default is 'colorful'.\n"
-msgstr ""
+msgstr "Som standard används 'colorful'.\n"
+
+msgid "interactive history editing"
+msgstr "interaktiv historieredigering"
+
+msgid ""
+"With this extension installed, Mercurial gains one new command: histedit. "
+"Usage\n"
+"is as follows, assuming the following history::"
+msgstr ""
+"Med denna utökning installerad, så får Mercurial ett nytt kommando: \n"
+"histedit. Det används som följer, förutsatt denna historia::"
+
+msgid ""
+" @  3[tip]   7c2fd3b9020c   2009-04-27 18:04 -0500   durin42\n"
+" |    Add delta\n"
+" |\n"
+" o  2   030b686bedc4   2009-04-27 18:04 -0500   durin42\n"
+" |    Add gamma\n"
+" |\n"
+" o  1   c561b4e977df   2009-04-27 18:04 -0500   durin42\n"
+" |    Add beta\n"
+" |\n"
+" o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42\n"
+"      Add alpha"
+msgstr ""
+" @  3[tip]   7c2fd3b9020c   2009-04-27 18:04 -0500   durin42\n"
+" |    Add delta\n"
+" |\n"
+" o  2   030b686bedc4   2009-04-27 18:04 -0500   durin42\n"
+" |    Add gamma\n"
+" |\n"
+" o  1   c561b4e977df   2009-04-27 18:04 -0500   durin42\n"
+" |    Add beta\n"
+" |\n"
+" o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42\n"
+"      Add alpha"
+
+msgid ""
+"If you were to run ``hg histedit c561b4e977df``, you would see the "
+"following\n"
+"file open in your editor::"
+msgstr ""
+"Om du skulle köra ``hg histedit c561b4e977df``, så skulle den följande \n"
+"filen öppnas i din editor::"
+
+msgid ""
+" pick c561b4e977df Add beta\n"
+" pick 030b686bedc4 Add gamma\n"
+" pick 7c2fd3b9020c Add delta"
+msgstr ""
+" pick c561b4e977df Add beta\n"
+" pick 030b686bedc4 Add gamma\n"
+" pick 7c2fd3b9020c Add delta"
+
+msgid ""
+" # Edit history between 633536316234 and 7c2fd3b9020c\n"
+" #\n"
+" # Commands:\n"
+" #  p, pick = use commit\n"
+" #  e, edit = use commit, but stop for amending\n"
+" #  f, fold = use commit, but fold into previous commit\n"
+" #  d, drop = remove commit from history\n"
+" #  m, mess = edit message without changing commit content\n"
+" #\n"
+" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved"
+msgstr ""
+
+msgid ""
+"In this file, lines beginning with ``#`` are ignored. You must specify a "
+"rule\n"
+"for each revision in your history. For example, if you had meant to add "
+"gamma\n"
+"before beta, and then wanted to add delta in the same revision as beta, you\n"
+"would reorganize the file to look like this::"
+msgstr ""
+
+msgid ""
+" pick 030b686bedc4 Add gamma\n"
+" pick c561b4e977df Add beta\n"
+" fold 7c2fd3b9020c Add delta"
+msgstr ""
+" pick 030b686bedc4 Add gamma\n"
+" pick c561b4e977df Add beta\n"
+" fold 7c2fd3b9020c Add delta"
+
+msgid ""
+"At which point you close the editor and ``histedit`` starts working. When "
+"you\n"
+"specify a ``fold`` operation, ``histedit`` will open an editor when it "
+"folds\n"
+"those revisions together, offering you a chance to clean up the commit "
+"message::"
+msgstr ""
+
+msgid ""
+" Add beta\n"
+" ***\n"
+" Add delta"
+msgstr ""
+
+msgid ""
+"Edit the commit message to your liking, then close the editor. For\n"
+"this example, let's assume that the commit message was changed to\n"
+"``Add beta and delta.`` After histedit has run and had a chance to\n"
+"remove any old or temporary revisions it needed, the history looks\n"
+"like this::"
+msgstr ""
+
+msgid ""
+" @  2[tip]   989b4d060121   2009-04-27 18:04 -0500   durin42\n"
+" |    Add beta and delta.\n"
+" |\n"
+" o  1   081603921c3f   2009-04-27 18:04 -0500   durin42\n"
+" |    Add gamma\n"
+" |\n"
+" o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42\n"
+"      Add alpha"
+msgstr ""
+
+msgid ""
+"Note that ``histedit`` does *not* remove any revisions (even its own "
+"temporary\n"
+"ones) until after it has completed all the editing operations, so it will\n"
+"probably perform several strip operations when it's done. For the above "
+"example,\n"
+"it had to run strip twice. Strip can be slow depending on a variety of "
+"factors,\n"
+"so you might need to be a little patient. You can choose to keep the "
+"original\n"
+"revisions by passing the ``--keep`` flag."
+msgstr ""
+
+msgid ""
+"The ``edit`` operation will drop you back to a command prompt,\n"
+"allowing you to edit files freely, or even use ``hg record`` to commit\n"
+"some changes as a separate commit. When you're done, any remaining\n"
+"uncommitted changes will be committed as well. When done, run ``hg\n"
+"histedit --continue`` to finish this step. You'll be prompted for a\n"
+"new commit message, but the default commit message will be the\n"
+"original message for the ``edit`` ed revision."
+msgstr ""
+
+msgid ""
+"The ``message`` operation will give you a chance to revise a commit\n"
+"message without changing the contents. It's a shortcut for doing\n"
+"``edit`` immediately followed by `hg histedit --continue``."
+msgstr ""
+
+msgid ""
+"If ``histedit`` encounters a conflict when moving a revision (while\n"
+"handling ``pick`` or ``fold``), it'll stop in a similar manner to\n"
+"``edit`` with the difference that it won't prompt you for a commit\n"
+"message when done. If you decide at this point that you don't like how\n"
+"much work it will be to rearrange history, or that you made a mistake,\n"
+"you can use ``hg histedit --abort`` to abandon the new changes you\n"
+"have made and return to the state before you attempted to edit your\n"
+"history."
+msgstr ""
+
+msgid ""
+"If we clone the example repository above and add three more changes, such "
+"that\n"
+"we have the following history::"
+msgstr ""
+
+msgid ""
+"   @  6[tip]   038383181893   2009-04-27 18:04 -0500   stefan\n"
+"   |    Add theta\n"
+"   |\n"
+"   o  5   140988835471   2009-04-27 18:04 -0500   stefan\n"
+"   |    Add eta\n"
+"   |\n"
+"   o  4   122930637314   2009-04-27 18:04 -0500   stefan\n"
+"   |    Add zeta\n"
+"   |\n"
+"   o  3   836302820282   2009-04-27 18:04 -0500   stefan\n"
+"   |    Add epsilon\n"
+"   |\n"
+"   o  2   989b4d060121   2009-04-27 18:04 -0500   durin42\n"
+"   |    Add beta and delta.\n"
+"   |\n"
+"   o  1   081603921c3f   2009-04-27 18:04 -0500   durin42\n"
+"   |    Add gamma\n"
+"   |\n"
+"   o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42\n"
+"        Add alpha"
+msgstr ""
+
+msgid ""
+"If you run ``hg histedit --outgoing`` on the clone then it is the same\n"
+"as running ``hg histedit 836302820282``. If you need plan to push to a\n"
+"repository that Mercurial does not detect to be related to the source\n"
+"repo, you can add a ``--force`` option.\n"
+msgstr ""
+
+msgid "cannot edit history that would orphan nodes"
+msgstr ""
+
+msgid "can't edit history with merges"
+msgstr "kan inte redigera historik med sammanfogningar"
+
+#, python-format
+msgid "%s: empty changeset"
+msgstr "%s: tom ändring"
+
+msgid "Fix up the change and run hg histedit --continue"
+msgstr "Fixa ändringen och kör hg histedit --continue"
+
+msgid ""
+"Make changes as needed, you may commit or record as needed now.\n"
+"When you are finished, run hg histedit --continue to resume."
+msgstr ""
+
+msgid "Read history edits from the specified file."
+msgstr "Läs historieändringar från den angivna filen"
+
+msgid "continue an edit already in progress"
+msgstr ""
+
+msgid "don't strip old nodes after edit is complete"
+msgstr ""
+
+msgid "abort an edit in progress"
+msgstr ""
+
+msgid "changesets not found in destination"
+msgstr "visa ändringar som inte hittas i destinationen"
+
+msgid "force outgoing even for unrelated repositories"
+msgstr ""
+
+msgid "first revision to be edited"
+msgstr "första revision att redigera"
+
+msgid "[PARENT]"
+msgstr "[FÖRÄLDER]"
+
+msgid ""
+"interactively edit changeset history\n"
+"    "
+msgstr ""
+
+msgid "source has mq patches applied"
+msgstr ""
+
+msgid "only one repo argument allowed with --outgoing"
+msgstr ""
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr "jämför med %s\n"
+
+msgid "--force only allowed with --outgoing"
+msgstr ""
+
+msgid "no arguments allowed with --continue"
+msgstr ""
+
+msgid "no arguments allowed with --abort"
+msgstr ""
+
+msgid "history edit already in progress, try --continue or --abort"
+msgstr ""
+
+msgid "histedit requires exactly one parent revision"
+msgstr "histedit kräver exakt en förälderrevision"
+
+msgid "histedit: Should update metadata for the following changes:\n"
+msgstr ""
+
+#, python-format
+msgid "histedit:  %s to %s\n"
+msgstr "histedit:  %s till %s\n"
+
+#, python-format
+msgid "histedit:     moving bookmarks %s\n"
+msgstr "histedit:     flyttar bokmärken %s\n"
+
+msgid "must specify a rule for each changeset once"
+msgstr ""
+
+#, python-format
+msgid "malformed line \"%s\""
+msgstr "defekt rad \"%s\""
+
+msgid "may not use changesets other than the ones listed"
+msgstr ""
+
+#, python-format
+msgid "unknown changeset %s listed"
+msgstr "okänd ändring %s angiven"
+
+#, python-format
+msgid "unknown action \"%s\""
+msgstr "okänd handling \"%s\""
 
 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 configuration changes."
 msgstr ""
 
 msgid ""
 "Before changing/disabling active keywords, you must run :hg:`kwshrink`\n"
 "to avoid storing expanded keywords in the change 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 "show default keyword template maps"
 msgstr ""
 
 msgid "read maps from rcfile"
 msgstr ""
 
 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
 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 svn keywordset\n"
 msgstr ""
 
 msgid "\toverriding default cvs keywordset\n"
 msgstr ""
 
 msgid ""
 "\n"
 "\tconfiguration using default svn keywordset\n"
 msgstr ""
 
 msgid ""
 "\n"
 "\tconfiguration using default cvs keywordset\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 "hg kwexpand [OPTION]... [FILE]..."
 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 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 "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 "hg kwshrink [OPTION]... [FILE]..."
 msgstr ""
 
 msgid "revert expanded keywords in the working directory"
 msgstr ""
 
 msgid "    Must be run before changing/disabling active keywords."
 msgstr ""
 
 msgid ""
 "    kwshrink refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid "track large binary files"
 msgstr "spåra stora binärfiler"
 
 msgid ""
 "Large binary files tend to be not very compressible, not very\n"
 "diffable, and not at all mergeable. Such files are not handled\n"
 "efficiently by Mercurial's storage format (revlog), which is based on\n"
 "compressed binary deltas; storing large binary files as regular\n"
 "Mercurial files wastes bandwidth and disk space and increases\n"
 "Mercurial's memory usage. The largefiles extension addresses these\n"
 "problems by adding a centralized client-server layer on top of\n"
 "Mercurial: largefiles live in a *central store* out on the network\n"
 "somewhere, and you only fetch the revisions that you need when you\n"
 "need them."
 msgstr ""
 
 msgid ""
 "largefiles works by maintaining a \"standin file\" in .hglf/ for each\n"
 "largefile. The standins are small (41 bytes: an SHA-1 hash plus\n"
 "newline) and are tracked by Mercurial. Largefile revisions are\n"
 "identified by the SHA-1 hash of their contents, which is written to\n"
 "the standin. largefiles uses that revision ID to get/put largefile\n"
 "revisions from/to the central store. This saves both disk space and\n"
 "bandwidth, since you don't need to retrieve all historical revisions\n"
 "of large files when you clone or pull."
 msgstr ""
 
 msgid ""
 "To start a new repository or add new large binary files, just add\n"
 "--large to your :hg:`add` command. For example::"
 msgstr ""
 
 msgid ""
 "  $ dd if=/dev/urandom of=randomdata count=2000\n"
 "  $ hg add --large randomdata\n"
 "  $ hg commit -m 'add randomdata as a largefile'"
 msgstr ""
 
 msgid ""
 "When you push a changeset that adds/modifies largefiles to a remote\n"
 "repository, its largefile revisions will be uploaded along with it.\n"
 "Note that the remote Mercurial must also have the largefiles extension\n"
 "enabled for this to work."
 msgstr ""
 
 msgid ""
 "When you pull a changeset that affects largefiles from a remote\n"
 "repository, Mercurial behaves as normal. However, when you update to\n"
 "such a revision, any largefiles needed by that revision are downloaded\n"
 "and cached (if they have never been downloaded before). This means\n"
 "that network access may be required to update to changesets you have\n"
 "not previously updated to."
 msgstr ""
 
 msgid ""
 "If you already have large files tracked by Mercurial without the\n"
 "largefiles extension, you will need to convert your repository in\n"
 "order to benefit from largefiles. This is done with the\n"
 ":hg:`lfconvert` command::"
 msgstr ""
 
 msgid "  $ hg lfconvert --size 10 oldrepo newrepo"
 msgstr ""
 
 msgid ""
 "In repositories that already have largefiles in them, any new file\n"
 "over 10MB will automatically be added as a largefile. To change this\n"
 "threshold, set ``largefiles.minsize`` in your Mercurial config file\n"
 "to the minimum size in megabytes to track as a largefile, or use the\n"
 "--lfsize option to the add command (also in megabytes)::"
 msgstr ""
 
 msgid ""
 "  [largefiles]\n"
 "  minsize = 2"
 msgstr ""
 
 msgid "  $ hg add --lfsize 2"
 msgstr ""
 
 msgid ""
 "The ``largefiles.patterns`` config option allows you to specify a list\n"
 "of filename patterns (see :hg:`help patterns`) that should always be\n"
 "tracked as largefiles::"
 msgstr ""
 
 msgid ""
 "  [largefiles]\n"
 "  patterns =\n"
 "    *.jpg\n"
 "    re:.*\\.(png|bmp)$\n"
 "    library.zip\n"
 "    content/audio/*"
 msgstr ""
 
 msgid ""
 "Files that match one of these patterns will be added as largefiles\n"
 "regardless of their size."
 msgstr ""
 
 msgid ""
 "The ``largefiles.minsize`` and ``largefiles.patterns`` config options\n"
 "will be ignored for any repositories not already containing a\n"
 "largefile. To add the first largefile to a repository, you must\n"
 "explicitly do so with the --large flag passed to the :hg:`add`\n"
 "command.\n"
 msgstr ""
 
 msgid "convert a normal repository to a largefiles repository"
 msgstr "konvertera ett normalt arkiv till ett largefiles-arkiv"
 
 msgid ""
 "    Convert repository SOURCE to a new repository DEST, identical to\n"
 "    SOURCE except that certain files will be converted as largefiles:\n"
 "    specifically, any file that matches any PATTERN *or* whose size is\n"
 "    above the minimum size threshold is converted as a largefile. The\n"
 "    size used to determine whether or not to track a file as a\n"
 "    largefile is the size of the first version of the file. The\n"
 "    minimum size can be specified either with --size or in\n"
 "    configuration as ``largefiles.size``."
 msgstr ""
 
 msgid ""
 "    After running this command you will need to make sure that\n"
 "    largefiles is enabled anywhere you intend to push the new\n"
 "    repository."
 msgstr ""
 
 msgid ""
 "    Use --to-normal to convert largefiles back to normal files; after\n"
 "    this, the DEST repository can be used without largefiles at all."
 msgstr ""
 
 msgid "getting largefiles"
 msgstr "hämtar largefiles"
 
 #, python-format
 msgid "getting %s:%s\n"
 msgstr "hämtar %s:%s\n"
 
 #, python-format
 msgid "%s: data corruption (expected %s, got %s)\n"
 msgstr "%s: datakorruption (förväntade mig %s, fick %s)\n"
 
 #, python-format
 msgid "searching %d changesets for largefiles\n"
 msgstr "söker i %d ändringar efter largefiles\n"
 
 #, python-format
 msgid "verified contents of %d revisions of %d largefiles\n"
 msgstr ""
 
 #, python-format
 msgid "verified existence of %d revisions of %d largefiles\n"
 msgstr ""
 
 #, python-format
 msgid "unsupported URL scheme %r"
 msgstr ""
 
 #, python-format
 msgid "%s does not appear to be a largefile store"
 msgstr "%s verkar inte vara en largefiles-lagring"
 
 #, python-format
 msgid "%s is not a local Mercurial repo"
 msgstr "%s är inte ett lokalt Mercurial-arkiv"
 
 #, python-format
 msgid "initializing destination %s\n"
 msgstr ""
 
 msgid "converting revisions"
 msgstr "konverterar revisioner"
 
 #, python-format
 msgid "renamed/copied largefile %s becomes symlink"
 msgstr ""
 
 #, python-format
 msgid "largefile %s becomes symlink"
 msgstr ""
 
 #, python-format
 msgid "skipping incorrectly formatted tag %s\n"
 msgstr "hoppar över felformaterat märke %s\n"
 
 #, python-format
 msgid "skipping incorrectly formatted id %s\n"
 msgstr "hoppar över flrformaterad id %s\n"
 
 #, python-format
 msgid "no mapping for id %s\n"
 msgstr ""
 
 msgid "uploading largefiles"
 msgstr ""
 
 #, python-format
 msgid "largefile %s missing from store (needs to be uploaded)"
 msgstr ""
 
+#, python-format
+msgid "%d additional largefiles cached\n"
+msgstr "%d ytterligare largefiles cachade\n"
+
+#, python-format
+msgid "%d largefiles failed to download\n"
+msgstr "%d largefiles kunde inte hämtas\n"
+
 msgid "getting changed largefiles\n"
-msgstr ""
+msgstr "hämtar ändrade largefiles\n"
 
 #, python-format
 msgid "%d largefiles updated, %d removed\n"
+msgstr "%d largefiles uppdaterade, %d borttagna\n"
+
+#, python-format
+msgid "largefile %s is not in cache and could not be downloaded"
 msgstr ""
 
 msgid "minimum size (MB) for files to be converted as largefiles"
 msgstr ""
 
 msgid "convert from a largefiles repo to a normal repo"
 msgstr ""
 
 msgid "hg lfconvert SOURCE DEST [FILE ...]"
 msgstr ""
 
 #, python-format
 msgid "largefiles: size must be number (not %s)\n"
 msgstr ""
 
 msgid "minimum size for largefiles must be specified"
 msgstr ""
 
 #, python-format
 msgid "unknown operating system: %s\n"
 msgstr "okänt operativsystem: %s\n"
 
 #, python-format
-msgid "Found %s in store\n"
-msgstr ""
-
-#, python-format
-msgid "Found %s in system cache\n"
-msgstr ""
-
-msgid "Can't get file locally"
+msgid "found %s in store\n"
+msgstr ""
+
+#, python-format
+msgid "found %s in system cache\n"
+msgstr ""
+
+msgid "can't get file locally"
 msgstr ""
 
 #, python-format
 msgid ""
 "changeset %s: %s missing\n"
 "  (looked for hash %s)\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "changeset %s: %s: contents differ\n"
 "  (%s:\n"
 "  expected hash %s,\n"
 "  but got %s)\n"
 msgstr ""
 
 #, python-format
 msgid "%s already a largefile\n"
 msgstr "%s är redan en largefile\n"
 
 #, python-format
 msgid "adding %s as a largefile\n"
 msgstr "lägger till %s som en largefile\n"
 
 msgid "no files specified"
 msgstr "inga filer angivna"
 
 #, python-format
 msgid "not removing %s: %s (use forget to undo)\n"
 msgstr "raderar inte %s: %s (använd forget för att ångra)\n"
 
 msgid "file still exists"
 msgstr "filen existerar fortfarande"
 
 msgid "file is modified"
 msgstr "filen är modifierad"
 
 msgid "file has been marked for add"
 msgstr "filen har markerats för addering"
 
 #, python-format
 msgid "removing %s\n"
 msgstr "tar bort %s\n"
 
 msgid "--normal cannot be used with --large"
 msgstr "--normal kan inte användas med --large"
 
 msgid "uncommitted local changes"
 msgstr "oarkiverade lokala ändringar"
 
 msgid "&Largefile"
 msgstr "&Largefile"
 
 msgid "&Normal file"
 msgstr "&Normal fil"
 
 #, python-format
 msgid ""
 "%s has been turned into a largefile\n"
 "use (l)argefile or keep as (n)ormal file?"
 msgstr ""
 
 #, python-format
 msgid ""
 "%s has been turned into a normal file\n"
 "keep as (l)argefile or use (n)ormal file?"
 msgstr ""
 
 #, python-format
 msgid "merging %s and %s to %s\n"
 msgstr ""
 
 #, python-format
 msgid "merging %s\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "largefile %s has a merge conflict\n"
 "keep (l)ocal or take (o)ther?"
 msgstr ""
 
 msgid "&Local"
 msgstr ""
 
 msgid "&Other"
 msgstr ""
 
 msgid "destination largefile already exists"
 msgstr ""
 
 msgid "no files to copy"
 msgstr "inga filer att kopiera"
 
 msgid "caching new largefiles\n"
 msgstr "cachar nya largefiles\n"
 
 #, python-format
 msgid "%d largefiles cached\n"
 msgstr "%d largefiles cachade\n"
 
 #, python-format
+msgid "--all-largefiles is incompatible with non-local destination %s"
+msgstr "--all-largefiles är inkompatibel med icke-lokal destination %s"
+
+#, python-format
 msgid "unknown archive type '%s'"
 msgstr "okänd arkivtyp '%s'"
 
 msgid "cannot give prefix when archiving to files"
 msgstr ""
 
 #, python-format
 msgid "largefile %s not found in repo store or system cache"
 msgstr ""
 
 #, python-format
 msgid "not removing %s: file is already untracked\n"
 msgstr ""
 
 msgid "largefiles: No remote repo\n"
 msgstr ""
 
 msgid "largefiles to upload:\n"
 msgstr ""
 
 #, python-format
 msgid "largefiles: %d to upload\n"
 msgstr ""
 
 msgid "largefile contents do not match hash"
 msgstr ""
 
 #, python-format
 msgid "largefiles: failed to put %s into store: %s"
 msgstr ""
 
 #, python-format
 msgid "requested largefile %s not present in cache"
 msgstr ""
 
 msgid "remote: "
 msgstr "fjärr: "
 
 #, python-format
 msgid "unexpected putlfile response: %s"
 msgstr "oväntat putlfile-svar: %s"
 
 msgid "putlfile failed:"
 msgstr "putlfile misslyckades:"
 
 msgid "putlfile failed (unexpected response):"
 msgstr "putlfile misslyckades (oväntat svar):"
 
 msgid "unexpected response:"
 msgstr "oväntat svar:"
 
 #, python-format
 msgid "remotestore: could not put %s to remote store %s"
 msgstr ""
 
 #, python-format
 msgid "remotestore: put %s to remote store %s"
 msgstr ""
 
 #, python-format
 msgid "remotestore: could not open file %s: %s"
 msgstr ""
 
 #, python-format
 msgid "remotestore: largefile %s is invalid"
 msgstr ""
 
 #, python-format
 msgid "remotestore: largefile %s is missing"
 msgstr ""
 
 #, python-format
 msgid "changeset %s: %s: contents differ\n"
 msgstr ""
 
 #, python-format
 msgid "changeset %s: %s missing\n"
 msgstr "ändring %s: %s saknas\n"
 
 #, python-format
 msgid ""
 "largefiles: repo method %r appears to have already been wrapped by another "
 "extension: largefiles may behave incorrectly\n"
 msgstr ""
 
 #, python-format
 msgid "file \"%s\" is a largefile standin"
 msgstr ""
 
 msgid "add as largefile"
 msgstr "lägg till som largefile"
 
 msgid "add as normal file"
 msgstr "lägg till som normal fil"
 
 msgid ""
 "add all files above this size (in megabytes) as largefiles (default: 10)"
 msgstr ""
 
 msgid "verify largefiles"
 msgstr ""
 
 msgid "verify all revisions of largefiles not just current"
 msgstr ""
 
 msgid "verify largefile contents not just existence"
 msgstr ""
 
 msgid "display outgoing largefiles"
 msgstr "visa utgående largefiles"
 
+msgid "download all pulled versions of largefiles"
+msgstr ""
+
+msgid "download all versions of all largefiles"
+msgstr ""
+
 msgid "manage a stack of patches"
 msgstr "hantera en uppsättning patchar"
 
 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 ""
 "Denna utökning låter dej arbeta med en uppsättning patchar inuti ett\n"
 "Mercurial-arkiv. Den hantera två uppsättningar med patchar - alla kända\n"
 "patchar, och applicerade patchar (delmängd av kända patchar)."
 
 msgid ""
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets."
 msgstr ""
 "Kända patchar representeras av patchfiler i katalogen .hg/patches.\n"
 "Applicerade patchar är både patchfiler och ändringar."
 
 msgid "Common tasks (use :hg:`help command` for more details)::"
 msgstr "Vanliga kommandon (använd :hg:`help command` för mer detaljer):"
 
 msgid ""
 "  create new patch                          qnew\n"
 "  import existing patch                     qimport"
 msgstr ""
 "  skapa ny patch                            qnew\n"
 "  importera existerande patch               qimport"
 
 msgid ""
 "  print patch series                        qseries\n"
 "  print applied patches                     qapplied"
 msgstr ""
 "  skriv ut patchserie                       qseries\n"
 "  skriv ut applicerade patchar              qapplied"
 
 msgid ""
 "  add known patch to applied stack          qpush\n"
 "  remove patch from applied stack           qpop\n"
 "  refresh contents of top applied patch     qrefresh"
 msgstr ""
 "  applicera en redan känd patch             qpush\n"
 "  ta port en applicerad patch               qpop\n"
 "  uppdatera innehållet i senaste patchen    qrefresh"
 
 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 ""
 "Som standard kommer mq automagiskt att använda git-patchar när det behövs\n"
 "för att inte förlora ändring av filläge, kopieringar, binära filer eller\n"
 "skapande/raderande av tomma filer. Detta beteende kan konfigureras med::"
 
 msgid ""
 "  [mq]\n"
 "  git = auto/keep/yes/no"
 msgstr ""
 "  [mq]\n"
 "  git = auto/keep/yes/no"
 
 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 ""
 "Om satt till 'keep' så kommer mq att lyda sektionen [diff] i\n"
 "konfigurationen medans existerande git-patchas bevaras vid qrefresh. Om\n"
 "satt till 'yes' eller 'no', kommer mq att ignorera sektionen [diff] och\n"
 "alltid generera git- eller vanliga patchar, även om data kan tappas i det\n"
 "andra fallet."
 
 msgid ""
-"It may be desirable for mq changesets in the secret phase (see\n"
+"It may be desirable for mq changesets to be kept in the secret phase (see\n"
 ":hg:`help phases`), which can be enabled with the following setting::"
 msgstr ""
 "Det kan vara önskvärt att hålla alla mq-ändringar i secret-fasen (se\n"
 ":hg:`help phases`), något som kan aktiveras med följande inställning::"
 
 msgid ""
 "  [mq]\n"
 "  secret = True"
 msgstr ""
 "  [mq]\n"
 "  secret = True"
 
 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"
+"create other, independent patch queues with the :hg:`qqueue` command."
 msgstr ""
 "Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n"
-"kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`.\n"
+"kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`."
+
+msgid ""
+"If the working directory contains uncommitted files, qpush, qpop and\n"
+"qgoto abort immediately. If -f/--force is used, the changes are\n"
+"discarded. Setting::"
+msgstr ""
+"Om arbetskatalogen innehåller oarkiverade filer så kommer qpush, qpop\n"
+"och qgoto omedelbart att avslutas. Om -f/--force används, så kommer\n"
+"ändringarna att kastas bort. Inställningen::"
+
+msgid ""
+"  [mq]\n"
+"  keepchanges = True"
+msgstr ""
+"  [mq]\n"
+"  keepchanges = True"
+
+msgid ""
+"make them behave as if --keep-changes were passed, and non-conflicting\n"
+"local changes will be tolerated and preserved. If incompatible options\n"
+"such as -f/--force or --exact are passed, this setting is ignored.\n"
+msgstr ""
+"får dom att uppföra sig som om --keep-changes angetts, och konfliktfria\n"
+"lokala ändringar tolereras och bevaras. Om inkompatibla flaggor som\n"
+"-f/--force eller --exact anges, så ignoreras den här inställningen.\n"
 
 msgid "print first line of patch header"
 msgstr "skriv ut första raden i patchheadern"
 
 #, python-format
 msgid "malformated mq status line: %s\n"
 msgstr "defekt mq-statusrad: %s\n"
 
 #, python-format
 msgid "mq.git option can be auto/keep/yes/no got %s"
 msgstr "mq.git kan vara auto/keep/yes/no men läste %s"
 
 #, python-format
 msgid "%s appears more than once in %s"
 msgstr "%s finns mer än en gång i %s"
 
 msgid "guard cannot be an empty string"
 msgstr "guard kan inte vara en tom sträng"
 
 #, 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 %s\n"
 msgstr ""
 
 #, python-format
 msgid "skipping %s - guarded by %s\n"
 msgstr "hoppar över %s - skyddad av %s\n"
 
 #, python-format
 msgid "skipping %s - no matching guards\n"
 msgstr ""
 
 #, python-format
 msgid "error removing undo: %s\n"
 msgstr ""
 
 #, python-format
+msgid "saving current version of %s as %s\n"
+msgstr "sparar nuvarande revision av %s som %s\n"
+
+#, 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 ""
+msgstr "applicerar %s\n"
 
 #, python-format
 msgid "unable to read %s\n"
-msgstr ""
+msgstr "kan inte läsa %s\n"
+
+msgid "local changes found, refresh first"
+msgstr "lokala ändringar hittades, uppdatera först"
 
 #, python-format
 msgid "patch %s is empty\n"
 msgstr ""
 
+msgid "qpush exactly duplicates child changeset"
+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 %s refers to unknown patches: %s\n"
 msgstr "revision %s refererar till okända patchar: %s\n"
 
 #, python-format
 msgid "unknown patches: %s\n"
 msgstr "okända patchar: %s\n"
 
 #, 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 ""
 
 #, python-format
 msgid "uncommitted changes in subrepository %s"
 msgstr "oarkiverade ändringar i underarkivet %s"
 
-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 "patch name cannot begin with \"%s\""
 msgstr ""
 
 #, python-format
 msgid "\"%s\" cannot be used in 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 use both --force and --keep-changes"
+msgstr "kan inte ange både --force och --keep-changes"
+
 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 "qpush: %s is already at the top\n"
 msgstr "qpush: %s är redan på toppen\n"
 
 #, python-format
 msgid "cannot push to a previous patch: %s"
 msgstr ""
 
 #, python-format
 msgid "guarded by %s"
 msgstr "skyddad av %s"
 
 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 "cannot use --exact and --keep-changes together"
+msgstr "kan inte använda --exact och --keep-changes tillsammans"
+
 msgid "cannot use --exact and --move together"
 msgstr "kan inte använda --exact och --move tillsammans"
 
 msgid "cannot push --exact with applied patches"
 msgstr "kan inte trycka --exakt med applicerade patchar"
 
 #, python-format
 msgid "%s does not have a parent recorded"
 msgstr "%s har inte en angiven förälder"
 
 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 "popping would remove an immutable revision"
+msgstr ""
+
+msgid "see \"hg help phases\" for details"
+msgstr "se \"hg help phases\" för detaljer"
+
 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 "cannot refresh immutable revision"
+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 ""
+msgid "no saved patch data found\n"
+msgstr "ingen sparad patchdata hittades\n"
 
 #, 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 "unable to load queue repository\n"
+msgstr "kan inte öppna köarkiv\n"
 
 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 "no files or revisions specified"
+msgstr "inga filer eller revisioner angivna"
+
 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 "revision %d is not mutable"
 msgstr ""
 
-msgid "see \"hg help phases\" for details"
-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 "keep patch file"
 msgstr ""
 
 msgid "stop managing a revision (DEPRECATED)"
 msgstr ""
 
 msgid "hg qdelete [-k] [PATCH]..."
 msgstr "hg qdelete [-k] [PATCH]..."
 
 msgid "remove patches from queue"
 msgstr ""
 
 msgid ""
 "    The patches must not be applied, and at least one patch is required. "
 "Exact\n"
 "    patch identifiers must be given. With -k/--keep, the patch files are\n"
 "    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 "show only the last patch"
-msgstr "visa bara den sista patchen"
+msgid "show only the preceding applied patch"
+msgstr "visa bara den föregående applicerade patchen"
 
 msgid "hg qapplied [-1] [-s] [PATCH]"
 msgstr "hg qapplied [-1] [-s] [PATCH]"
 
 msgid "print the patches already applied"
 msgstr "skriv ut redan applicerade patchar"
 
 msgid "    Returns 0 on success."
 msgstr "    Returnerar 0 om kommandot lyckades."
 
 msgid "only one patch applied\n"
 msgstr "bara en patch applicerad\n"
 
 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 "print the patches not yet applied"
 msgstr "skriv ut oapplicerade patchar"
 
 msgid "all patches applied\n"
 msgstr "alla patchar applicerade\n"
 
 msgid "import file in patch directory"
 msgstr ""
 
 msgid "NAME"
 msgstr "NAMN"
 
 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 "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..."
-
-msgid "import a patch"
-msgstr "importera en patch"
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]..."
+msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... [FIL]..."
+
+msgid "import a patch or existing changeset"
+msgstr "importera en patch eller existerande ändring"
 
 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. Use :hg:`qfinish` to remove changesets from mq control."
 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 "create queue repository"
 msgstr "skapa köarkiv"
 
 msgid "hg qinit [-c]"
 msgstr "hg qinit [-c]"
 
 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 "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 "uppdatera inte de nya arbetskatalogerna"
 
 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 "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 "hg qcommit [OPTION]... [FILE]..."
 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 patches not in series"
 msgstr ""
 
 msgid "hg qseries [-ms]"
 msgstr ""
 
 msgid "print the entire series file"
 msgstr ""
 
 msgid "hg qtop [-s]"
 msgstr "hg qtop [-s]"
 
 msgid "print the name of the current patch"
-msgstr ""
+msgstr "visa namnet på den nuvarande patchen"
 
 msgid "hg qnext [-s]"
 msgstr "hg qnext [-s]"
 
-msgid "print the name of the next patch"
-msgstr ""
+msgid "print the name of the next pushable patch"
+msgstr "visa namnet på den nästkommande patchen"
 
 msgid "hg qprev [-s]"
 msgstr "hg qprev [-s]"
 
-msgid "print the name of the previous patch"
-msgstr ""
+msgid "print the name of the preceding applied patch"
+msgstr "skriv ut namnet på föregående applicerade patch"
 
 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 "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 "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 "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 "hg qdiff [OPTION]... [FILE]..."
 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 "edit patch header"
 msgstr ""
 
 msgid "keep folded patch files"
 msgstr ""
 
 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
 msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..."
 
 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"
+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 "tolerate non-conflicting local changes"
+msgstr ""
+
 msgid "overwrite any local changes"
 msgstr ""
 
+msgid "do not save backup copies of files"
+msgstr "spara inte backup-kopior av filer"
+
 msgid "hg qgoto [OPTION]... PATCH"
 msgstr ""
 
 msgid "push or pop patches until named patch is at top of stack"
 msgstr ""
 
 msgid "list all patches and guards"
 msgstr ""
 
 msgid "drop all guards"
 msgstr ""
 
 msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
 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 "hg qheader [PATCH]"
 msgstr "hg qheader [PATCH]"
 
 msgid "print the header of the topmost or specified patch"
 msgstr ""
 
 msgid "apply on top of local changes"
 msgstr ""
 
 msgid "apply the target patch to its recorded parent"
 msgstr "applicera patchen på dess angivna förälder"
 
 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 "push the next patch onto the stack"
 msgstr ""
 
 msgid ""
-"    When -f/--force is applied, all local changes in patched files\n"
-"    will be lost."
+"    By default, abort if the working directory contains uncommitted\n"
+"    changes. With --keep-changes, abort only if the uncommitted files\n"
+"    overlap with patched files. With -f/--force, backup and patch over\n"
+"    uncommitted changes."
 msgstr ""
 
 msgid "no saved queues found, please use -n\n"
 msgstr ""
 
 #, python-format
 msgid "merging with queue at: %s\n"
 msgstr ""
 
 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 "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."
+"    Without argument, pops off the top of the patch stack. If given a\n"
+"    patch name, keeps popping off patches until the named patch is at\n"
+"    the top of the stack."
+msgstr ""
+
+msgid ""
+"    By default, abort if the working directory contains uncommitted\n"
+"    changes. With --keep-changes, abort only if the uncommitted files\n"
+"    overlap with patched files. With -f/--force, backup and discard\n"
+"    changes made to such files."
 msgstr ""
 
 #, python-format
 msgid "using patch queue: %s\n"
 msgstr ""
 
 msgid "hg qrename PATCH1 [PATCH2]"
 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 ""
 
 msgid "delete save entry"
 msgstr ""
 
 msgid "update queue working directory"
 msgstr ""
 
 msgid "hg qrestore [-d] [-u] REV"
 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 "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 "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 specified revision (optional, can specify revisions without this "
 "option)"
 msgstr ""
 
 msgid "force removal of changesets, discard uncommitted changes (no backup)"
 msgstr ""
 "tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)"
 
 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 "ignored  (DEPRECATED)"
+msgstr "ignorerad  (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 "remove revs only reachable from given bookmark"
+msgstr "radera revisioner som bara nås från givet bokmärke"
+
+msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..."
+msgstr "hg strip [-k] [-f] [-n] [-B bokmärke] [-r] REV..."
 
 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, the\n"
 "    operation is aborted unless the --force flag is supplied, in which\n"
 "    case changes will be discarded."
 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 ""
+"    Strip is not a history-rewriting operation and can be used on\n"
+"    changesets in the public phase. But if the stripped changesets have\n"
+"    been pushed to a remote repository you will likely pull them again."
+msgstr ""
+
+#, python-format
+msgid "bookmark '%s' not found"
+msgstr "bokmärket '%s' hittades inte"
+
+#, python-format
+msgid "bookmark '%s' deleted\n"
+msgstr "bokmärket '%s' raderad\n"
+
 msgid "empty revision set"
 msgstr "tomt revisionsset"
 
 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 "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 "finish all applied changesets"
 msgstr ""
 
 msgid "hg qfinish [-a] [REV]..."
 msgstr "hg qfinish [-a] [REV]..."
 
 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 "warning: uncommitted changes in the working directory\n"
 msgstr "varning: oarkiverade ändringar i arbetskatalogen\n"
 
 msgid "list all available queues"
 msgstr "visa alla tillgängliga köer"
 
 msgid "print name of active queue"
 msgstr "visa namnet på aktiv kö"
 
 msgid "create new queue"
 msgstr "skapa ny kö"
 
 msgid "rename active queue"
 msgstr "döp om aktiv kö"
 
 msgid "delete reference to queue"
 msgstr "radera referens till kö"
 
 msgid "delete queue, and remove patch dir"
 msgstr ""
 
 msgid "[OPTION] [QUEUE]"
 msgstr "[FLAGGA] [KÖ]"
 
 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)\". Specifying --active will "
 "print\n"
 "    only the name of the active queue."
 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 "ogiltigt könamn, kan inte innehålla tecknen \":\\/.\""
 
 #, 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"
+msgid "tag %s overrides mq patch of the same name\n"
 msgstr ""
 
 msgid "cannot import over an applied patch"
 msgstr "kan inte importera över en applicerad patch"
 
 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 ""
 "``mq()``\n"
 "    Changesets managed by MQ."
 msgstr ""
 "``mq()``\n"
 "    Ändringar hanterade av MQ."
 
 msgid "mq takes no arguments"
 msgstr "mq tar inga argument"
 
 msgid "operate on patch repository"
 msgstr "arbeta med patcharkiv"
 
 msgid "hooks for sending email push notifications"
 msgstr ""
 
 msgid ""
-"This extension let you run hooks sending email notifications when\n"
-"changesets are being pushed, from the sending or receiving side."
+"This extension implements hooks to send email notifications when\n"
+"changesets are sent from or received by the local repository."
 msgstr ""
 
 msgid ""
 "First, enable the extension as explained in :hg:`help extensions`, and\n"
-"register the hook you want to run. ``incoming`` and ``outgoing`` hooks\n"
-"are run by the changesets receiver while the ``outgoing`` one is for\n"
-"the sender::"
+"register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n"
+"are run when changesets are received, while ``outgoing`` hooks are for\n"
+"changesets sent to another repository::"
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  # one email for each incoming changeset\n"
 "  incoming.notify = python:hgext.notify.hook\n"
 "  # one email for all incoming changesets\n"
 "  changegroup.notify = python:hgext.notify.hook"
 msgstr ""
 
 msgid ""
 "  # one email for all outgoing changesets\n"
 "  outgoing.notify = python:hgext.notify.hook"
 msgstr ""
 
 msgid ""
-"Now the hooks are running, subscribers must be assigned to\n"
-"repositories. Use the ``[usersubs]`` section to map repositories to a\n"
-"given email or the ``[reposubs]`` section to map emails to a single\n"
-"repository::"
+"This registers the hooks. To enable notification, subscribers must\n"
+"be assigned to repositories. The ``[usersubs]`` section maps multiple\n"
+"repositories to a given recipient. The ``[reposubs]`` section maps\n"
+"multiple recipients to a single repository::"
 msgstr ""
 
 msgid ""
 "  [usersubs]\n"
-"  # key is subscriber email, value is a comma-separated list of glob\n"
+"  # key is subscriber email, value is a comma-separated list of repo glob\n"
 "  # patterns\n"
 "  user@host = pattern"
 msgstr ""
 
 msgid ""
 "  [reposubs]\n"
 "  # key is glob pattern, value is a comma-separated list of subscriber\n"
 "  # emails\n"
 "  pattern = user@host"
 msgstr ""
 
 msgid ""
 "Glob patterns are matched against absolute path to repository\n"
-"root. The subscriptions can be defined in their own file and\n"
-"referenced with::"
+"root."
+msgstr ""
+
+msgid ""
+"In order to place them under direct user management, ``[usersubs]`` and\n"
+"``[reposubs]`` sections may be placed in a separate ``hgrc`` file and\n"
+"incorporated by reference::"
 msgstr ""
 
 msgid ""
 "  [notify]\n"
 "  config = /path/to/subscriptionsfile"
 msgstr ""
 
 msgid ""
-"Alternatively, they can be added to Mercurial configuration files by\n"
-"setting the previous entry to an empty value."
-msgstr ""
-
-msgid ""
-"At this point, notifications should be generated but will not be sent until "
-"you\n"
-"set the ``notify.test`` entry to ``False``."
+"Notifications will not be sent until the ``notify.test`` value is set\n"
+"to ``False``; see below."
 msgstr ""
 
 msgid ""
 "Notifications content can be tweaked with the following configuration "
 "entries:"
 msgstr ""
 
 msgid ""
 "notify.test\n"
 "  If ``True``, print messages to stdout instead of sending them. Default: "
 "True."
 msgstr ""
 
 msgid ""
 "notify.sources\n"
-"  Space separated list of change sources. Notifications are sent only\n"
-"  if it includes the incoming or outgoing changes source. Incoming\n"
-"  sources can be ``serve`` for changes coming from http or ssh,\n"
-"  ``pull`` for pulled changes, ``unbundle`` for changes added by\n"
-"  :hg:`unbundle` or ``push`` for changes being pushed\n"
-"  locally. Outgoing sources are the same except for ``unbundle`` which\n"
-"  is replaced by ``bundle``. Default: serve."
-msgstr ""
+"  Space-separated list of change sources. Notifications are activated only\n"
+"  when a changeset's source is in this list. Sources may be:"
+msgstr ""
+
+msgid ""
+"  :``serve``: changesets received via http or ssh\n"
+"  :``pull``: changesets received via ``hg pull``\n"
+"  :``unbundle``: changesets received via ``hg unbundle``\n"
+"  :``push``: changesets sent or received via ``hg push``\n"
+"  :``bundle``: changesets sent via ``hg unbundle``"
+msgstr ""
+
+msgid "  Default: serve."
+msgstr "  Standard: serve"
 
 msgid ""
 "notify.strip\n"
 "  Number of leading slashes to strip from url paths. By default, "
 "notifications\n"
-"  references repositories with their absolute path. ``notify.strip`` let "
+"  reference repositories with their absolute path. ``notify.strip`` lets "
 "you\n"
 "  turn them into relative paths. For example, ``notify.strip=3`` will "
 "change\n"
 "  ``/long/path/repository`` into ``repository``. Default: 0."
 msgstr ""
 
 msgid ""
 "notify.domain\n"
-"  If subscribers emails or the from email have no domain set, complete them\n"
-"  with this value."
+"  Default email domain for sender or recipients with no explicit domain."
 msgstr ""
 
 msgid ""
 "notify.style\n"
 "  Style file to use when formatting emails."
 msgstr ""
 
 msgid ""
 "notify.template\n"
 "  Template to use when formatting emails."
 msgstr ""
 
 msgid ""
 "notify.incoming\n"
-"  Template to use when run as incoming hook, override ``notify.template``."
+"  Template to use when run as an incoming hook, overriding ``notify."
+"template``."
 msgstr ""
 
 msgid ""
 "notify.outgoing\n"
-"  Template to use when run as outgoing hook, override ``notify.template``."
+"  Template to use when run as an outgoing hook, overriding ``notify."
+"template``."
 msgstr ""
 
 msgid ""
 "notify.changegroup\n"
-"  Template to use when running as changegroup hook, override\n"
+"  Template to use when running as a changegroup hook, overriding\n"
 "  ``notify.template``."
 msgstr ""
 
 msgid ""
 "notify.maxdiff\n"
 "  Maximum number of diff lines to include in notification email. Set to 0\n"
-"  to disable the diff, -1 to include all of it. Default: 300."
+"  to disable the diff, or -1 to include all of it. Default: 300."
 msgstr ""
 
 msgid ""
 "notify.maxsubject\n"
-"  Maximum number of characters in emails subject line. Default: 67."
+"  Maximum number of characters in email's subject line. Default: 67."
 msgstr ""
 
 msgid ""
 "notify.diffstat\n"
 "  Set to True to include a diffstat before diff content. Default: True."
 msgstr ""
 
 msgid ""
 "notify.merge\n"
 "  If True, send notifications for merge changesets. Default: True."
 msgstr ""
 
 msgid ""
 "notify.mbox\n"
 "  If set, append mails to this mbox file instead of sending. Default: None."
 msgstr ""
 
 msgid ""
 "notify.fromauthor\n"
-"  If set, use the first committer of the changegroup for the \"From\" field "
-"of\n"
-"  the notification mail. If not set, take the user from the pushing repo.\n"
-"  Default: False."
-msgstr ""
-
-msgid ""
-"If set, the following entries will also be used to customize the "
+"  If set, use the committer of the first changeset in a changegroup for\n"
+"  the \"From\" field of the notification mail. If not set, take the user\n"
+"  from the pushing repo.  Default: False."
+msgstr ""
+
+msgid ""
+"If set, the following entries will also be used to customize the\n"
 "notifications:"
 msgstr ""
 
 msgid ""
 "email.from\n"
-"  Email ``From`` address to use if none can be found in generated email "
-"content."
+"  Email ``From`` address to use if none can be found in the generated\n"
+"  email content."
 msgstr ""
 
 msgid ""
 "web.baseurl\n"
-"  Root repository browsing URL to combine with repository paths when making\n"
+"  Root repository URL to combine with repository paths when making\n"
 "  references. See also ``notify.strip``."
 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 "command to send changesets as (a series of) patch emails"
 msgstr "kommando för att sända ändringar som (en uppsättning) mail"
 
 msgid ""
 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
 "describes the series as a whole."
 msgstr ""
 "Serien startas med en \"[PATCH 0 of N]\"-introduktion, som beskriver\n"
 "innehållet i serien."
 
 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 ""
 "Varje patchmail har en ämnesraden \"[PATCH M of N] ...\", där den första\n"
 "raden i ändringsbeskrivningen används som ämnestext. Meddelandet innehåller\n"
 "två eller tre delar:"
 
 msgid ""
 "- The changeset description.\n"
 "- [Optional] The result of running diffstat on the patch.\n"
 "- The patch itself, as generated by :hg:`export`."
 msgstr ""
 "- Ändringsbeskrivningen.\n"
 "- [Valfritt] Resultatet av diffstat på patchen.\n"
 "- Patchen, som genererad av :hg:`export`."
 
 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 ""
 "Varje meddelande refererar till den första i serien med hjälp av\n"
 "In-Reply-To och References, så de kommer att visas upp som en sekvens i\n"
 "trådade mail- och news-läsare, och i mailarkiv."
 
 msgid ""
 "To configure other defaults, add a section like this to your\n"
 "configuration file::"
 msgstr ""
 "För att konfigurera andra inställningar, lägg till en sådan här sektion\n"
 "till din konfigurationsfil::"
 
 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 ""
 "  [email]\n"
 "  from = Mitt Namn <min@email>\n"
 "  to = mottagare1, mottagare2, ...\n"
 "  cc = cc1, cc2, ...\n"
 "  bcc = bcc1, bcc2, ...\n"
 "  reply-to = adress1, adress2, ..."
 
 msgid ""
 "Use ``[patchbomb]`` as configuration section name if you need to\n"
 "override global ``[email]`` address settings."
 msgstr ""
 "Använd ``[patchbomb]`` som namn på konfigurationssektionen om du behöver\n"
 "ändra globala adressinställningar i ``[email]``."
 
 msgid ""
 "Then you can use the :hg:`email` command to mail a series of\n"
 "changesets as a patchbomb."
 msgstr ""
 "Därefter kan du använda kommandot :hg:`email` för att maila en serie\n"
 "ändringar som en patchbomb."
 
 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 ""
 "Du kan också endera konfigurera alternativet method i email-sektionen att\n"
 "vara en sendmail-kompatibel sändare eller fylla i sektionen [smtp] så att\n"
 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n"
 "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n"
 
+msgid "send patches as inline message text (default)"
+msgstr ""
+
 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 "bekräfta innan sändning"
 
 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 "hg email [FLAGGA]... [DEST]..."
 
 msgid "send changesets by email"
 msgstr "sänd ändringar via email"
 
 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 ""
 "    Som standard skickas diffar i samma format som :hg:`export` genererar,\n"
 "    ett per meddelande. Serien börjar med en introduktion med rubriken\n"
 "    \"[PATCH 0 of N]\", som beskriver serien i helhet."
 
 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 ""
 "    Varje patchmail har en ämnesrad med texten \"[PATCH M of N] ...\", och\n"
 "    använder den första raden i ändringsbeskrivningen som ämnestext.\n"
 "    Meddelandet innehåller två eller tre delar. Först, beskrivningen av\n"
 "    ändringen."
 
 msgid ""
 "    With the -d/--diffstat option, if the diffstat program is\n"
 "    installed, the result of running diffstat on the patch is inserted."
 msgstr ""
 "    Med flaggan -d/--diffstat, om programmet diffstat är installerat,\n"
 "    läggs resultatet av att köra diffstat på patchen in."
 
 msgid "    Finally, the patch itself, as generated by :hg:`export`."
 msgstr "    Till slut, patchen, som genererad av :hg:`export`."
 
 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."
+"    will be created. You can include a patch both as text in the email\n"
+"    body and as a regular or an inline attachment by combining the\n"
+"    -a/--attach or -i/--inline with the --body option."
 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 ""
 "    In case email sending fails, you will find a backup of your series\n"
 "    introductory message in ``.hg/last-email.txt``."
 msgstr ""
 "    Om sändning av mailet misslyckas, kommer du att hitta en backup av\n"
 "    introduktionsmeddelandet i ``.hg/last-email.txt``."
 
 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 ""
 
-#, python-format
-msgid "comparing with %s\n"
-msgstr "jämför med %s\n"
-
 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."
+msgid "this patch series consists of %d patches."
 msgstr ""
 
 msgid "no recipient addresses provided"
 msgstr "inga mottagaradresser angavs"
 
 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 "Sending "
-msgstr "Sänder "
+msgid "displaying "
+msgstr "visar "
+
+msgid "sending "
+msgstr "sänder "
 
 msgid "sending"
 msgstr "sänder"
 
 msgid "writing"
 msgstr "skriver"
 
 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"
 "  changedelay = 1 # changedelay: minimum delay before showing a new topic.\n"
 "                  # If set to less than 3 * refresh, that value will\n"
 "                  # be used instead.\n"
 "  refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
 "  format = topic bar number estimate # 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,\n"
 "estimate, speed, and item. item defaults to the last 20 characters of\n"
 "the item, but this can be changed by adding either ``-<num>`` which\n"
 "would take the last num characters, or ``+<num>`` for the first num\n"
 "characters.\n"
 msgstr ""
 
 #. i18n: format XX seconds as "XXs"
 #, python-format
 msgid "%02ds"
 msgstr "%02ds"
 
 #. i18n: format X minutes and YY seconds as "XmYYs"
 #, python-format
 msgid "%dm%02ds"
 msgstr "%dm%02ds"
 
 #. i18n: format X hours and YY minutes as "XhYYm"
 #, python-format
 msgid "%dh%02dm"
 msgstr "%dt%02dm"
 
 #. i18n: format X days and YY hours as "XdYYh"
 #, python-format
 msgid "%dd%02dh"
 msgstr "%dd%02dt"
 
 #. i18n: format X weeks and YY days as "XwYYd"
 #, python-format
 msgid "%dw%02dd"
 msgstr "%dv%02dd"
 
 #. i18n: format X years and YY weeks as "XyYYw"
 #, python-format
 msgid "%dy%02dw"
 msgstr "%då%02dv"
 
 #, python-format
 msgid "%d %s/sec"
 msgstr "%d %s/sek"
 
 msgid "command to delete untracked files from the working directory"
 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 "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 "removing file %s\n"
+msgstr "tar bort file %s\n"
+
+#, python-format
+msgid "removing directory %s\n"
+msgstr "tar bort katalogen %s\n"
 
 msgid "command to move sets of revisions to a different ancestor"
 msgstr ""
 
 msgid ""
 "This extension lets you rebase changesets in an existing Mercurial\n"
 "repository."
 msgstr ""
 
 msgid ""
 "For more information:\n"
 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
 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 these revisions"
 msgstr ""
 
 msgid "rebase onto the specified changeset"
 msgstr ""
 
 msgid "collapse the rebased changesets"
 msgstr ""
 
 msgid "use text as collapse commit message"
 msgstr "använd text som kollapsarkiveringsmeddelande"
 
 msgid "invoke editor on commit messages"
 msgstr "starta editor för arkiveringsmeddelande"
 
 msgid "read collapse commit message from file"
 msgstr "läs kollapsarkiveringsmeddelandet från fil"
 
 msgid "keep original changesets"
 msgstr ""
 
 msgid "keep original branch names"
 msgstr ""
 
-msgid "force detaching of source from its original branch"
-msgstr ""
+msgid "(DEPRECATED)"
+msgstr "(FÖRLEGAD)"
 
 msgid "specify merge tool"
 msgstr "ange sammanfogningsverktyg"
 
 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 "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 "message can only be specified with collapse"
 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 "tool option will be ignored\n"
 msgstr ""
 
 msgid "cannot specify both a source and a base"
 msgstr "kan inte ange både en källa och en bas"
 
 msgid "cannot specify both a revision and a base"
 msgstr ""
 
 msgid "cannot specify both a revision and a source"
 msgstr "kan inte ange både en revision och en källa"
 
-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 "can't remove original changesets with unrebased descendants"
 msgstr ""
 
 msgid "use --keep to keep original changesets"
 msgstr "använd --keep för att bevara originaländringarna"
 
 #, python-format
 msgid "can't rebase immutable changeset %s"
 msgstr ""
 
 msgid "see hg help phases for details"
 msgstr ""
 
 msgid "nothing to rebase\n"
 msgstr ""
 
 msgid "cannot collapse multiple named branches"
 msgstr "kan inte kollapsa flera namngivna grenar"
 
 msgid "rebasing"
 msgstr ""
 
 msgid "changesets"
 msgstr "ändringar"
 
 msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
 msgstr "olösta konflikter (se hg resolve, 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: immutable rebased changeset detected, can't abort\n"
+#, python-format
+msgid "can't abort rebase due to immutable changesets %s"
 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 "no matching revisions"
 msgstr ""
 
 msgid "can't rebase multiple roots"
 msgstr ""
 
 msgid "source is ancestor of destination"
 msgstr ""
 
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "uppdaterar bokmärket %s\n"
+
 msgid "--tool can only be used with --rebase"
 msgstr ""
 
 msgid "rebase working directory to branch head"
 msgstr ""
 
 msgid "specify merge tool for rebase"
 msgstr "ange sammanfogningsverktyg för ombasering"
 
 msgid "commands to interactively select changes for commit/qrefresh"
 msgstr ""
 
 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 "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?]"
+msgid "[Ynesfdaq?]"
 msgstr ""
 
 msgid "&Yes, record this change"
 msgstr ""
 
 msgid "&No, skip this change"
 msgstr ""
 
+msgid "&Edit the change manually"
+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 "cannot edit patch for whole file"
+msgstr ""
+
+msgid "cannot edit patch for binary file"
+msgstr ""
+
+msgid ""
+"\n"
+"To remove '-' lines, make them ' ' lines (context).\n"
+"To remove '+' lines, delete them.\n"
+"Lines starting with # will be removed from the patch."
+msgstr ""
+
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"added to the record list. If it does not apply cleanly, a rejects\n"
+"file will be generated: you can use that when you try again. If\n"
+"all lines of the hunk are removed, then the edit is aborted and\n"
+"the hunk is left unchanged.\n"
+msgstr ""
+
+msgid "edit failed"
+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 "hg record [OPTION]... [FILE]..."
 msgstr "hg record [FLAGGA]... [FIL]..."
 
 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"
+"      n - skip this change\n"
+"      e - edit this change manually"
 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 "interactively record a new patch"
 msgstr ""
 
 msgid ""
 "    See :hg:`help qnew` & :hg:`help record` for more information and\n"
 "    usage.\n"
 "    "
 msgstr ""
 "    Se :hg:`help qnew` & :hg:`help record` för mer information och\n"
 "    användning.\n"
 "    "
 
 msgid "'mq' extension not loaded"
 msgstr ""
 
 #, python-format
 msgid "running non-interactively, use %s instead"
 msgstr ""
 
 msgid "cannot partially commit a merge (use \"hg commit\" instead)"
 msgstr ""
 "kan inte delvis arkivera en sammanfogning (använd \"hg commit\" istället)"
 
 msgid "no changes to record\n"
 msgstr ""
 
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr ""
 
 msgid "interactively select changes to refresh"
 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"
 
-msgid "must specify local origin repository"
-msgstr "måste ange lokalt utgångsarkiv"
-
 #, python-format
 msgid "relinking %s to %s\n"
 msgstr "länkar om %s till %s\n"
 
 msgid "there is nothing to relink\n"
 msgstr "det finns inget att länka om\n"
 
 #, 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 ""
 
 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 (%s 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://[e-mail]/\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 ""
 
 #, python-format
 msgid "custom scheme %s:// conflicts with drive letter %s:\\\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 "convert a shared repository to a normal one"
 msgstr "konvertera ett delat arkiv till ett normalt"
 
 msgid ""
 "    Copy the store data to the repo and remove the sharedpath data.\n"
 "    "
 msgstr ""
 
 msgid "this is not a shared repo"
 msgstr "det här är inte ett delat arkiv"
 
 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 is not a parent of %s"
+msgstr "%s är inte en förälder till %s"
+
+#, 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 "filter corrupted changeset (no user or date)"
 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 "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 "parent to choose when transplanting merge"
+msgstr "förälder att välja när sammanfogning transplanteras"
+
 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 "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. The changesets\n"
 "    are copied and will thus appear twice in the history. Use the\n"
 "    rebase extension instead if you want to move a whole branch of\n"
 "    unpublished changesets."
 msgstr ""
 
 msgid ""
 "    If --log is specified, log messages will have a comment appended\n"
 "    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 transplant the\n"
+"    :hg:`transplant --branch REV --all` will transplant the\n"
 "    selected branch (up to the named revision) onto your current\n"
 "    working 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 ""
+"    Merge changesets may be transplanted directly by specifying the\n"
+"    proper parent changeset by calling :hg:`transplant --parent`."
+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, or all transplanted changesets."
 msgstr ""
 
 msgid ""
 ":transplanted: String. The node identifier of the transplanted\n"
 "    changeset if any."
 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.\n"
 "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n"
 "- win32mbcs is not compatible with fixutf8 extension."
 msgstr ""
 
 msgid ""
 "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"
+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 "archiving"
 msgstr "arkiverar"
 
 #, python-format
 msgid "malformed line in .hg/bookmarks: %r\n"
 msgstr "defekt rad i .hg/bookmarks: %r\n"
 
 #, python-format
 msgid "bookmark '%s' contains illegal character"
 msgstr "bokmärket '%s' innehåller ogiltiga tecken"
 
 #, python-format
 msgid "branch %s not found"
 msgstr "grenen %s hittades inte"
 
 #, python-format
-msgid "updating bookmark %s\n"
-msgstr "uppdaterar bokmärket %s\n"
-
-#, python-format
 msgid "divergent bookmark %s stored as %s\n"
 msgstr "divergent bokmärke %s lagrat som %s\n"
 
+#, python-format
+msgid "adding remote bookmark %s\n"
+msgstr "lägger till fjärrbokmärket %s\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"
 
 msgid "unknown parent"
-msgstr ""
+msgstr "okänd förälder"
 
 #, python-format
 msgid "integrity check failed on %s:%d"
 msgstr ""
 
 msgid "cannot create new bundle repository"
 msgstr ""
 
 #, python-format
 msgid "stream ended unexpectedly (got %d bytes, expected %d)"
 msgstr "strömmen slutade abrupt (fick %d bytes av förväntade %d)"
 
 # python-format
 #, python-format
 msgid "invalid chunk length %d"
 msgstr "ogiltig styckelängd %d"
 
 #, 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"
 
 #, python-format
 msgid "uncommitted changes in subrepo %s"
 msgstr "oarkiverade ändringar i underarkivet %s"
 
 msgid "options --message and --logfile are mutually exclusive"
 msgstr "du kan bara ange en av --message och --logfile"
 
 #, python-format
 msgid "can't read commit message '%s': %s"
 msgstr "kan inte läsa arkiveringsmeddelande '%s': %s"
 
 msgid "limit must be a positive integer"
 msgstr "limit måste vara ett positivt heltal"
 
 msgid "limit must be positive"
 msgstr "limit måste vara positivt"
 
 #, python-format
 msgid "invalid format spec '%%%s' in output filename"
 msgstr ""
 
 msgid "cannot specify --changelog and --manifest at the same time"
 msgstr "kan inte ange --changelog och --manifest samtidigt"
 
 msgid "cannot specify filename with --changelog or --manifest"
 msgstr ""
 
 msgid "cannot specify --changelog or --manifest without a repository"
 msgstr ""
 
 msgid "invalid arguments"
 msgstr ""
 
 #, python-format
 msgid "revlog '%s' not found"
 msgstr "revlog '%s' hittades inte"
 
 #, 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: can't copy - same file\n"
+msgstr "%s: kan inte kopiera - samma fil\n"
+
+#, 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 "(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 "bookmark:    %s\n"
 msgstr "bokmärke:    %s\n"
 
 #, python-format
 msgid "tag:         %s\n"
 msgstr "märke:       %s\n"
 
 #, python-format
 msgid "phase:       %s\n"
 msgstr "fas:         %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 "filer+:"
 
 msgid "files-:"
 msgstr "filer-:"
 
 msgid "files:"
 msgstr "filer:"
 
 #, 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 "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 file not in parent revision: \"%s\""
+msgstr "kan inte följa fil som inte finns i förälderrevision: \"%s\""
+
+#, python-format
 msgid "cannot follow nonexistent file: \"%s\""
-msgstr ""
+msgstr "kan inte följa icke-existerande fil: \"%s\""
 
 msgid "can only follow copies/renames for explicit filenames"
-msgstr ""
+msgstr "kan bara följa kopior/namnbyten för explicita filnamn"
+
+#, python-format
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "flaggan -G/--graph är inkompatibel med --%s"
 
 #, python-format
 msgid "adding %s\n"
 msgstr "lägger till %s\n"
 
 #, python-format
 msgid "skipping missing subrepository: %s\n"
 msgstr ""
 
+#, python-format
+msgid "amending changeset %s\n"
+msgstr "förändrar ändringen %s\n"
+
+#, python-format
+msgid "copying changeset %s to %s\n"
+msgstr "kopierar ändringen %s till %s\n"
+
+#, python-format
+msgid "stripping intermediate changeset %s\n"
+msgstr "avlägsnar mellanliggande ändring %s\n"
+
+#, python-format
+msgid "stripping amended changeset %s\n"
+msgstr "avlägsnar förändrad ändring %s\n"
+
 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 "HG: användare: %s"
 
 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 "HG: lade till %s"
 
 #, python-format
 msgid "HG: changed %s"
 msgstr "HG: ändrade %s"
 
 #, python-format
 msgid "HG: removed %s"
 msgstr "HG: raderade %s"
 
 msgid "HG: no files changed"
 msgstr "HG: inga ändrade filer"
 
 msgid "empty commit message"
 msgstr "tomt arkiveringsmeddelande"
 
+#, 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 "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 "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, automatically pick the first choice for all prompts"
 msgstr "fråga inte, välj automatiskt det första valet för 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 "do not verify server certificate (ignoring web.cacerts config)"
 msgstr ""
 "verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)"
 
 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 the specified date as commit date"
 msgstr "lagra det angivna datumet som arkiveringsdatumet"
 
 msgid "record the specified user as committer"
 msgstr "lagra den angivna 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 "show patch"
+msgstr "visa patch"
+
 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 "show the revision DAG"
+msgstr "visa revisionsdiagram"
+
 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 "number of lines of context to show"
 msgstr "antal sammanhangsrader att visa"
 
 msgid "SIMILARITY"
 msgstr "LIKHET"
 
 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 "add the specified files on the next commit"
 msgstr "lägg till de angivna 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\n"
 "     vid 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."
+"    used to check which files were identified as moved or renamed.\n"
+"    If this option is not specified, only renames of identical files\n"
+"    are detected."
 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."
+"    identifierades som flyttade eller omdöpta. Om den flaggan inte anges,\n"
+"    upptäcks bara namnbyten för identiska filer."
 
 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 "annotate the specified revision"
 msgstr "annotera den angivna 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 "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 "minst ett filnamn eller mönster krävs"
 
 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 "do not pass files through decoders"
 msgstr "passera inte filer genom dekoders"
 
 msgid "directory prefix for files in archive"
 msgstr "katalogprefix för filer i arkiv"
 
 msgid "PREFIX"
 msgstr "PREFIX"
 
 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 "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 angivna 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 "      Examples:"
 msgstr "      Exempel:"
 
 msgid "      - create a zip file containing the 1.0 release::"
 msgstr "      - skapa en zip-fil som innehåller 1.0-releasen::"
 
 msgid "          hg archive -r 1.0 project-1.0.zip"
 msgstr "          hg archive -r 1.0 project-1.0.zip"
 
 msgid "      - create a tarball excluding .hg files::"
 msgstr "      - skapa en tarboll utan .hg-filer::"
 
 msgid "          hg archive project.tar.gz -X \".hg*\""
 msgstr "          hg archive project.tar.gz -X \".hg*\""
 
 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 ange en formatsträng för prefixet. Som standard\n"
 "    används basnamnet för arkivet, med suffix borttagna."
 
 msgid "no working directory: please specify a revision"
 msgstr "ingen arbetskatalog: ange 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 "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 (DEPRECATED)"
 msgstr "förälder att välja när en sammanfogning återkallas (FÖRLEGAD)"
 
 msgid "revision to backout"
 msgstr "revision att återkalla"
 
 msgid "[OPTION]... [-r] REV"
 msgstr "[FLAGGA]... [-r] REV"
 
 msgid "reverse effect of earlier changeset"
 msgstr "omvänd effekten från en tidigare ändring"
 
 msgid ""
 "    Prepare a new changeset with the effect of REV undone in the\n"
 "    current working directory."
 msgstr ""
 "    Förbered en ny ändring där effekterna av REV ogörs i arbetskatalogen."
 
 msgid ""
 "    If REV is the parent of the working directory, then this new changeset\n"
 "    is committed automatically. Otherwise, hg needs to merge the\n"
 "    changes and the merged result is left uncommitted."
 msgstr ""
 "    Om REV är förälder till arbetskatalogen, så arkiveras denna ändring\n"
 "    automatiskt. Annars krävs att hg sammanfogar ändringarna och det\n"
 "    sammanfogade resultatet lämnas oarkiverat."
 
 msgid ""
 "    .. note::\n"
 "      backout cannot be used to fix either an unwanted or\n"
 "      incorrect merge."
 msgstr ""
 "    .. note::\n"
 "      backout kan inte användas för att fixa en oönskad eller felaktig\n"
 "      sammanfogning."
 
 msgid ""
 "      By default, the pending changeset will have one parent,\n"
 "      maintaining a linear history. With --merge, the pending\n"
 "      changeset will instead have two parents: the old parent of the\n"
 "      working directory and a new child of REV that simply undoes REV."
 msgstr ""
 "      Som standard kommer ändringen att ha en förälder, för att bibehålla\n"
 "      en linjär historik. Med --merge kommer ändringen istället att ha två\n"
 "      föräldrar: den gamla föräldern från arbetskatalogen och ett nytt\n"
 "      barn av REV som helt enkelt ogör REV."
 
 msgid ""
 "      Before version 1.7, the behavior without --merge was equivalent\n"
 "      to specifying --merge followed by :hg:`update --clean .` to\n"
 "      cancel the merge and leave the child of REV as a head to be\n"
 "      merged separately."
 msgstr ""
 "      Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n"
 "      ange --merge följt av :hg:`update --clean .` för att ångra\n"
 "      sammanfogningen och lämna barnet till REV som ett huvud att\n"
 "      sammanfogas separat."
 
 msgid "please specify just one revision"
 msgstr "ange bara en revision"
 
 msgid "please specify a revision to backout"
 msgstr "ange 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"
 msgstr "kan inte återkalla en sammanfogning"
 
-#, 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 "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 "extend the bisect range"
 msgstr "utöka bisect-område"
 
 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 "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."
+"    The environment variable HG_NODE will contain the ID of the\n"
+"    changeset being tested. The exit status of the command will be\n"
+"    used to mark revisions as good or bad: status 0 means good, 125\n"
+"    means to skip the revision, 127 (command not found) will abort the\n"
+"    bisection, and any other non-zero exit status means the revision\n"
+"    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."
+"    automatisk genomsökning. Miljövariabeln HG_NODE kommer att innehålla\n"
+"    ID för den ändring som testas. Returkoden från kommandot kommer att\n"
+"    användas för att markera en revision som bra eller dålig: 0 betyer\n"
+"    bra, 125 betyder hoppa över revionen, 127 (kommandot hittades inte)\n"
+"    kommer att avbryta genomsökningen, och alla andra värden betyder att\n"
+"    revisionen är dålig."
 
 msgid "      Some examples:"
 msgstr "      Några exempel:"
 
 msgid ""
 "      - start a bisection with known bad revision 12, and good revision 34::"
 msgstr ""
 "      - starta en sökning med känd dålig revision 12, och bra revision 34::"
 
 msgid ""
 "          hg bisect --bad 34\n"
 "          hg bisect --good 12"
 msgstr ""
 "          hg bisect --bad 34\n"
 "          hg bisect --good 12"
 
 msgid ""
 "      - advance the current bisection by marking current revision as good "
 "or\n"
 "        bad::"
 msgstr ""
 "      - stega den nuvarande sökningen genom att markera nuvarande revision\n"
 "        som bra eller dålig::"
 
 msgid ""
 "          hg bisect --good\n"
 "          hg bisect --bad"
 msgstr ""
 "          hg bisect --good\n"
 "          hg bisect --bad"
 
 msgid ""
 "      - mark the current revision, or a known revision, to be skipped (eg. "
 "if\n"
 "        that revision is not usable because of another issue)::"
 msgstr ""
 "      - markera att den nuvarande revisionen, eller en känd revision, ska\n"
 "        hoppas över (ex. om den revisionen är oanvändbar på grund av annat\n"
 "        fel)::"
 
 msgid ""
 "          hg bisect --skip\n"
 "          hg bisect --skip 23"
 msgstr ""
 "          hg bisect --skip\n"
 "          hg bisect --skip 23"
 
 msgid "      - forget the current bisection::"
 msgstr "      - glöm den aktuella genomsökningen::"
 
 msgid "          hg bisect --reset"
 msgstr "          hg bisect --reset"
 
 msgid ""
 "      - use 'make && make tests' to automatically find the first broken\n"
 "        revision::"
 msgstr ""
 "      - använd 'make && make tests' för att automatiskt hitta den första\n"
 "        defekta revisionen::"
 
 msgid ""
 "          hg bisect --reset\n"
 "          hg bisect --bad 34\n"
 "          hg bisect --good 12\n"
 "          hg bisect --command 'make && make tests'"
 msgstr ""
 "          hg bisect --reset\n"
 "          hg bisect --bad 34\n"
 "          hg bisect --good 12\n"
 "          hg bisect --command 'make && make tests'"
 
 msgid ""
 "      - see all changesets whose states are already known in the current\n"
 "        bisection::"
 msgstr ""
 "      - visa alla ändringar vars status redan är kända i den nuvarande\n"
 "        genomsökningen::"
 
 msgid "          hg log -r \"bisect(pruned)\""
 msgstr "          hg log -r \"bisect(pruned)\""
 
+msgid ""
+"      - see the changeset currently being bisected (especially useful\n"
+"        if running with -U/--noupdate)::"
+msgstr ""
+"      - se ändringen som genomsöks (mest användbart med -U/--no-update)::"
+
+msgid "          hg log -r \"bisect(current)\""
+msgstr "          hg log -r \"bisect(current)\""
+
 msgid "      - see all changesets that took part in the current bisection::"
 msgstr "      - se alla ändringar som var med i den nuvarande genomsökningen::"
 
 msgid "          hg log -r \"bisect(range)\""
 msgstr "          hg log -r \"bisect(range)\""
 
 msgid "      - with the graphlog extension, you can even get a nice graph::"
 msgstr "      - med graphlog-utökningen så kan du få en söt graf::"
 
 msgid "          hg log --graph -r \"bisect(range)\""
 msgstr "          hg log --graph -r \"bisect(range)\""
 
 msgid "      See :hg:`help revsets` for more about the `bisect()` keyword."
 msgstr "      Se :hg:`help revsets` för mer om nyckelordet `bisect()`."
 
 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"
 "Use bisect --extend to continue the bisection from\n"
 "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"
 
+msgid "current bisect revision is unknown - start a new bisect to fix"
+msgstr ""
+
+msgid "current bisect revision is a merge"
+msgstr ""
+
 #, 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"
+msgid "changeset %d:%s: %s\n"
+msgstr "ändring %d:%s: %s\n"
 
 #, python-format
 msgid "Extending search to changeset %d:%s\n"
 msgstr "Utökar sökningen till ändringen %d:%s\n"
 
 msgid "nothing to extend"
 msgstr "inget att utöka"
 
 #, 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 "force"
 msgstr "tvinga"
 
 msgid "delete a given bookmark"
 msgstr "ta bort angivet bokmärke"
 
 msgid "rename a given bookmark"
 msgstr "döp om angivet bokmärke"
 
 msgid "mark a bookmark inactive"
 msgstr "markera ett bokmärke som inaktivt"
 
 msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
 msgstr "hg bookmarks [-f] [-d] [-i] [-m NAMN] [-r REV] [NAMN]"
 
 msgid "track a line of development with movable markers"
 msgstr "spåra viss utveckling med flyttbara markörer"
 
 msgid ""
 "    Bookmarks are pointers to certain commits that move when committing.\n"
 "    Bookmarks are local. They can be renamed, copied and deleted. It is\n"
 "    possible to use :hg:`merge NAME` to merge from a given bookmark, and\n"
 "    :hg:`update NAME` to update to a given bookmark."
 msgstr ""
 "    Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
 "    arkivering. Bokmärken är lokala. De kan döpas om, kopieras och\n"
 "    raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge NAMN`\n"
 "    för att sammanfoga från ett bokmärke, och :hg:`update NAMN` för att\n"
 "    uppdatera till ett visst bokmärke."
 
 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 ""
 "    Du kan använda :hg:`bookmark NAMN` för att sätta ett bokmärke på\n"
 "    arbetskatalogens föräldrarevision med det angivna namnet. Om du anger\n"
 "    en revision med -r REV (där REV kan vara ett existerande bokmärke), så\n"
 "    tilldelas bokmärket till den revisionen."
 
 msgid ""
 "    Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
 "    push` and :hg:`help pull`). This requires both the local and remote\n"
 "    repositories to support bookmarks. For versions prior to 1.8, this "
 "means\n"
 "    the bookmarks extension must be enabled."
 msgstr ""
 "    Bokmärken kan tryckas och dras mellan arkiv (se :hg:`help push` och\n"
 "    :hg:`help pull`). Detta kräver att både det lokala och fjärrarkivet\n"
 "    stödjer bokmärken. För versioner innan 1.8, så betyder det att\n"
 "    bookmarks-utökningen måste vara aktiverad."
 
 msgid ""
 "    With -i/--inactive, the new bookmark will not be made the active\n"
 "    bookmark. If -r/--rev is given, the new bookmark will not be made\n"
 "    active even if -i/--inactive is not given. If no NAME is given, the\n"
 "    current active bookmark will be marked inactive.\n"
 "    "
 msgstr ""
 "    Med -i/--inactive blir det nya bokmärket inte det aktiva bokmärket.\n"
 "    Om -r/--rev anges så är bokmärket inte aktivt även om -i/--inactive\n"
 "    inte anges. Om inget NAMN anges, kommer det nuvarande aktiva bokmärket\n"
 "    att markeras som inaktivt.\n"
 "    "
 
 msgid "bookmark name required"
 msgstr "bokmärkesnamn krävs"
 
 #, python-format
 msgid "bookmark '%s' does not exist"
 msgstr "bokmärket '%s' existerar inte"
 
 #, python-format
 msgid "bookmark '%s' already exists (use -f to force)"
 msgstr "bokmärket '%s' existerar redan (använd -f för att tvinga)"
 
 msgid "new bookmark name required"
 msgstr "nytt bokmärkesnamn krävs"
 
 msgid "bookmark name cannot contain newlines"
 msgstr "bokmärkesnamn kan inte innehålla radbrytningar"
 
 msgid "bookmark names cannot consist entirely of whitespace"
 msgstr "bokmärkesnamn kan inte bara bestå av blanktecken"
 
 msgid "a bookmark cannot have the name of an existing branch"
 msgstr "ett bokmärket kan inte ha samma namn som en existerande gren"
 
 msgid "no bookmarks set\n"
 msgstr "inget bokmärke satt\n"
 
 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 "set or show the current branch name"
 msgstr "sätt eller visa det aktuella grennamnet"
 
 msgid ""
 "    .. note::\n"
 "       Branch names are permanent and global. Use :hg:`bookmark` to create "
 "a\n"
 "       light-weight bookmark instead. See :hg:`help glossary` for more\n"
 "       information about named branches and bookmarks."
 msgstr ""
 "    .. note::\n"
 "       Grennamn är permanenta och globala. Använd :hg:`bookmark` för att\n"
 "       skapa ett lättviktsbokmärke istället. Se :hg:`help glossary` för\n"
 "       mer information om namngivna grenar och bokmärken."
 
 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 angiven, kommer branch inte att tillåta dig att\n"
 "    sätta ett grennamn som redan existerar, även om den är 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"
 msgstr "ett grennamn med det namnet existerar redan"
 
 #. i18n: "it" refers to an existing branch
 msgid "use 'hg update' to switch to it"
 msgstr "använd '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 "(branches are permanent and global, did you want a bookmark?)\n"
 msgstr "(grenar är permanenta och globala, ville du ha ett bokmärke?)\n"
 
 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 "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 "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 "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 "unknown bundle type specified with --type"
+msgstr "okänd bunttyp angiven med --type"
+
 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 angiven med --type"
-
 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 "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 "the clone will include an empty working copy (only a repository)"
 msgstr "klonen kommer att 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 "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\n"
 "    ``.hg/hgrc``-fil som standardplats att användas för framtida dragningar."
 
 msgid ""
 "    Only local paths and ``ssh://`` URLs are supported as\n"
 "    destinations. For ``ssh://`` destinations, no working directory or\n"
 "    ``.hg/hgrc`` will be created on the remote side."
 msgstr ""
 "    Bara lokala sökvägar och ``ssh://``-URLer stödjs som destinationer. För\n"
 "    ``ssh://``-destinationer så kommer ingen arbetskatalog eller\n"
 "    ``.hg/hgrc`` att skapas på fjärrsidan."
 
 msgid ""
 "    To pull only a subset of changesets, specify one or more revisions\n"
 "    identifiers with -r/--rev or branches with -b/--branch. The\n"
 "    resulting clone will contain only the specified changesets and\n"
 "    their ancestors. These options (or 'clone src#rev dest') imply\n"
 "    --pull, even for local source repositories. Note that specifying a\n"
 "    tag will include the tagged changeset but not the changeset\n"
 "    containing the tag."
 msgstr ""
 "    För att dra bara en delmängd av ändringarna, angå en eller fler\n"
 "    revisionidentifierare med -r/--rev eller grenar med -b/--branch. Den\n"
 "    resulterande klonen kommer bara att innehålla de angivna ändringarna\n"
 "    och deras anfäder. Dessa flaggor (eller 'clone källa#rev dest') har\n"
 "    implicit --pull, även för lokala arkiv. Notera att angivandet av ett\n"
 "    märke kommer att hämta ut den märkta ändringen, men inte ändringen som\n"
 "    innehåller märket."
 
 msgid ""
 "    To check out a particular version, use -u/--update, or\n"
 "    -U/--noupdate to create a clone with no working directory."
 msgstr ""
 "    För att hämta ut en speciell version, använd -u/--update, eller\n"
 "    -U/--noupdate för att skapa en klon utan en arbetskatalog."
 
 msgid ""
 "      For efficiency, hardlinks are used for cloning whenever the\n"
 "      source and destination are on the same filesystem (note this\n"
 "      applies only to the repository data, not to the working\n"
 "      directory). Some filesystems, such as AFS, implement hardlinking\n"
 "      incorrectly, but do not report errors. In these cases, use the\n"
 "      --pull option to avoid hardlinking."
 msgstr ""
 "      Av effektivitestskäl används hårda länkar när källan och\n"
 "      destinationen är på samma filsystem (notera att detta bara gäller för\n"
 "      arkivdatat, inte arbetskopian). Vissa filsystem såsom AFS\n"
 "      implementerar hårda länkar felaktigt, men rapporterar inga fel.\n"
 "      Använd flaggan --pull för att undvika användning av hårda länkar."
 
 msgid ""
 "      In some cases, you can clone repositories and the working\n"
 "      directory 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\n"
 "      editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
 "      so). Also, this is not compatible with certain extensions that\n"
 "      place their metadata under the .hg directory, such as mq."
 msgstr ""
 "      Detta är det snabbaste sättet att klona, men det är inte alltid\n"
 "      säkert. Operationen är inte atomisk (att ARKIV inte modifieras under\n"
 "      operationen är upp till dig) och du måste se till att din editor\n"
 "      bryter hårda länkar (Emacs och de flesta Linux-kernelverktyg gör\n"
 "      det). Det är inte heller kompatibelt med vissa utökningar som\n"
 "      placerar sin metadata 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 "      - clone a remote repository to a new directory named hg/::"
 msgstr "      - klona ett fjärrarkiv till en ny katalog med namnet hg/::"
 
 msgid "          hg clone http://selenic.com/hg"
 msgstr "          hg clone http://selenic.com/hg"
 
 msgid "      - create a lightweight local clone::"
 msgstr "      - skapa en lättviktig lokal klon::"
 
 msgid "          hg clone project/ project-feature/"
 msgstr "          hg clone project/ project-feature/"
 
 msgid ""
 "      - clone from an absolute path on an ssh server (note double-slash)::"
 msgstr ""
 "      - klona från en absolut sökväg på en ssh-server (notera dubbel-slash)::"
 
 msgid "          hg clone ssh://user@server//home/projects/alpha/"
 msgstr "          hg clone ssh://user@server//home/projects/alpha/"
 
 msgid ""
 "      - do a high-speed clone over a LAN while checking out a\n"
 "        specified version::"
 msgstr ""
 "      - gör en höghastighetsklon över ett LAN samtidigt som en specificerad\n"
 "        version hämtas ut::"
 
 msgid "          hg clone --uncompressed http://server/repo -u 1.5"
 msgstr "          hg clone --uncompressed http://server/repo -u 1.5"
 
 msgid ""
 "      - create a repository without changesets after a particular revision::"
 msgstr "      - skapa ett arkiv utan ändringarna efter en viss revision::"
 
 msgid "          hg clone -r 04e544 experimental/ good/"
 msgstr "          hg clone -r 04e544 experimental/ good/"
 
 msgid "      - clone (and track) a particular named branch::"
 msgstr "      - klona (och spåra) en viss namngiven gren::"
 
 msgid "          hg clone http://selenic.com/hg#stable"
 msgstr "          hg clone http://selenic.com/hg#stable"
 
 msgid "    See :hg:`help urls` for details on specifying URLs."
 msgstr "    Se :hg:`help urls` för detaljer om att ange URLer."
 
 msgid "cannot specify both --noupdate and --updaterev"
 msgstr "kan inte ange både --noupdate och --updaterev"
 
 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 "amend the parent of the working dir"
+msgstr "förändra arbetskatalogens föräldrer"
+
 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 SCM, 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 SCM, ä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 ""
+"    The --amend flag can be used to amend the parent of the\n"
+"    working directory with a new commit that contains the changes\n"
+"    in the parent in addition to those currently reported by :hg:`status`,\n"
+"    if there are any. The old commit is stored in a backup bundle in\n"
+"    ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`\n"
+"    on how to restore it)."
+msgstr ""
+
+msgid ""
+"    Message, user and date are taken from the amended commit unless\n"
+"    specified. When a message isn't specified on the command line,\n"
+"    the editor will open with the message of the amended commit."
+msgstr ""
+
+msgid ""
+"    It is not possible to amend public changesets (see :hg:`help phases`)\n"
+"    or changesets that have children."
+msgstr ""
+
+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 "cannot amend recursively"
+msgstr "kan inte förändra rekursivt"
+
+msgid "cannot amend public changesets"
+msgstr "kan inte förändra publika ändringar"
+
+msgid "cannot amend merge changesets"
+msgstr "kan inte förändra sammanfogningar"
+
+msgid "cannot amend while merging"
+msgstr "kan inte förändra vid sammanfogning"
+
+msgid "cannot amend changeset with children"
+msgstr "kan inte förändra ändringar med barn"
+
+msgid "nothing changed\n"
+msgstr "inget ändrat\n"
+
 #, python-format
 msgid "nothing changed (%d missing files, see 'hg status')\n"
 msgstr "inget ändrat (%d saknade filer, se 'hg status')\n"
 
-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 "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 "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 "[INDEX] REV1 REV2"
 msgstr "[INDEX] REV1 REV2"
 
 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 "add single file mergeable changes"
 msgstr ""
 
 msgid "add single file all revs overwrite"
 msgstr ""
 
 msgid "add new file at each rev"
 msgstr ""
 
 msgid "[OPTION]... [TEXT]"
 msgstr "[FLAGGA]... [TEXT]"
 
 msgid "builds a repo with a given DAG from scratch in the current empty repo"
 msgstr ""
 
 msgid ""
 "    The description of the DAG is read from stdin if not given on the\n"
 "    command line."
 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"
 "     - \"#...\\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.\n"
 "    "
 msgstr ""
 
 msgid "reading DAG from stdin\n"
 msgstr "läser DAG från stdin\n"
 
 msgid "repository is not empty"
 msgstr "arkivet är inte tomt"
 
 msgid "building"
 msgstr "bygger"
 
 msgid "show all details"
 msgstr "visa alla detaljer"
 
 msgid "lists the contents of a bundle"
 msgstr "visa innehållet i en bunt"
 
 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 "[COMMAND]"
 msgstr "[KOMMANDO]"
 
 msgid "list all available commands and options"
 msgstr "visa alla tillgängliga kommandon och alternativ"
 
 msgid "show the command options"
 msgstr "visa kommandoflaggor"
 
 msgid "[-o] CMD"
 msgstr "[-o] KMD"
 
 msgid "returns the completion list associated with the given command"
 msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
 
 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 "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 "open changelog"
 msgstr "öppna ändringslogg"
 
 msgid "open manifest"
 msgstr "öppna manifest"
 
 msgid "-c|-m|FILE REV"
 msgstr "-c|-m|FIL REV"
 
 msgid "dump the contents of a data file revision"
 msgstr ""
 
 #, python-format
 msgid "invalid revision identifier %s"
 msgstr ""
 
 msgid "try extended date formats"
 msgstr "pröva utökade datumformat"
 
 msgid "[-e] DATE [RANGE]"
 msgstr "[-e] DATUM [SPANN]"
 
 msgid "parse and display a date"
 msgstr ""
 
 msgid "use old-style discovery"
 msgstr ""
 
 msgid "use old-style discovery with non-heads included"
 msgstr ""
 
 msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
 msgstr ""
 
 msgid "runs the changeset discovery protocol in isolation"
 msgstr ""
 
 msgid "parse and apply a fileset specification"
 msgstr ""
 
 msgid "[PATH]"
 msgstr "[SÖKVÄG]"
 
 msgid "show information detected about current filesystem"
 msgstr "visa information om det aktuella filsystemet"
 
 msgid "id of head node"
 msgstr ""
 
 msgid "id of common node"
 msgstr ""
 
 msgid "REPO FILE [-H|-C ID]..."
 msgstr ""
 
 msgid "retrieves a bundle from a repo"
 msgstr ""
 
 msgid ""
 "    Every ID must be a full-length hex node id string. Saves the bundle to "
 "the\n"
 "    given file.\n"
 "    "
 msgstr ""
 
 msgid "display the combined ignore pattern"
 msgstr "visa det sammansatta ignoreringsmönstret"
 
 msgid "no ignore patterns found"
 msgstr "inget ignoreringsmönster hittades"
 
 msgid "revlog format"
 msgstr "revlog-format"
 
 msgid "[-f FORMAT] -c|-m|FILE"
 msgstr ""
 
 msgid "dump the contents of an index file"
 msgstr ""
 
 #, python-format
 msgid "unknown format %d"
 msgstr "okänt format %d"
 
 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 "Kontrollerar teckenkodning (%s)...\n"
+msgid "checking encoding (%s)...\n"
+msgstr "kontrollerar teckenkodning (%s)...\n"
 
 msgid " (check that your locale is properly set)\n"
 msgstr " (kontrollera att din locale är korrekt inställd)\n"
 
 #, python-format
-msgid "Checking installed modules (%s)...\n"
-msgstr "Kontrollerar installerade moduler (%s)...\n"
+msgid "checking installed modules (%s)...\n"
+msgstr "kontrollerar installerade moduler (%s)...\n"
 
 msgid " One or more extensions could not be found"
 msgstr " En eller fler utökningar kunde inte hittas"
 
 msgid " (check that you compiled the extensions)\n"
 msgstr " (kontrollera att du kompilerade utökningarna)\n"
 
 #, python-format
-msgid "Checking templates (%s)...\n"
-msgstr "Kontrollerar mallar (%s)...\n"
+msgid "checking templates (%s)...\n"
+msgstr "kontrollerar mallar (%s)...\n"
 
 msgid " (templates seem to have been installed incorrectly)\n"
 msgstr " (mallar verkar vara inkorrekt installerade)\n"
 
-msgid "Checking commit editor...\n"
-msgstr "Kontrollerar arkiveringseditor...\n"
+msgid "checking commit editor...\n"
+msgstr "kontrollerar arkiveringseditor...\n"
 
 msgid " No commit editor set and can't find vi in PATH\n"
 msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n"
 
 msgid " (specify a commit editor in your configuration file)\n"
 msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
 
 #, python-format
 msgid " Can't find editor '%s' in PATH\n"
 msgstr " Kan inte hitta editorn '%s' i PATH\n"
 
-msgid "Checking username...\n"
-msgstr "Kontrollerar användarnamn...\n"
+msgid "checking username...\n"
+msgstr "kontrollerar användarnamn...\n"
 
 msgid " (specify a username in your configuration file)\n"
 msgstr " (ange ett användarnamn i din konfigurationsfil)\n"
 
-msgid "No problems detected\n"
-msgstr "Inga problem upptäcktes\n"
+msgid "no problems detected\n"
+msgstr "inga problem upptäcktes\n"
 
 #, python-format
 msgid "%s problems detected, please check your install!\n"
 msgstr "%s problem upptäcktes, kontrollera din installation!\n"
 
 msgid "REPO ID..."
 msgstr ""
 
 msgid "test whether node ids are known to a repo"
 msgstr ""
 
 msgid ""
-"    Every ID must be a full-length hex node id string. Returns a list of 0s "
-"and 1s\n"
-"    indicating unknown/known.\n"
-"    "
+"    Every ID must be a full-length hex node id string. Returns a list of 0s\n"
+"    and 1s indicating unknown/known.\n"
+"    "
+msgstr ""
+
+msgid "[OBSOLETED [REPLACEMENT] [REPL... ]"
+msgstr ""
+
+msgid "create arbitrary obsolete marker"
 msgstr ""
 
 msgid "REPO NAMESPACE [KEY OLD NEW]"
 msgstr ""
 
 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 "A B"
+msgstr "A B"
+
+#, python-format
+msgid "a: %s\n"
+msgstr "a: %s\n"
+
+#, python-format
+msgid "b: %s\n"
+msgstr "b: %s\n"
+
+#, python-format
+msgid "depth(a): %d depth(b): %d\n"
+msgstr ""
+
+#, python-format
+msgid "delta: %d hdist: %d distance: %d relation: %s\n"
+msgstr ""
+
 msgid "revision to rebuild to"
 msgstr "revision att bygga om till"
 
 msgid "[-r REV] [REV]"
 msgstr "[-r REV] [REV]"
 
 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 "revision to debug"
 msgstr "revision att debugga"
 
 msgid "[-r REV] FILE"
 msgstr "[-r REV] FIL"
 
 msgid "dump rename information"
 msgstr ""
 
 #, python-format
 msgid "%s renamed from %s:%s\n"
 msgstr ""
 
 #, python-format
 msgid "%s not renamed\n"
 msgstr ""
 
 msgid "dump index data"
 msgstr ""
 
 msgid "-c|-m|FILE"
 msgstr ""
 
 msgid "show data and statistics about a revlog"
 msgstr ""
 
 msgid "parse and apply a revision specification"
 msgstr ""
 
+msgid ""
+"    Use --verbose to print the parsed tree before and after aliases\n"
+"    expansion.\n"
+"    "
+msgstr ""
+
 msgid "REV1 [REV2]"
 msgstr "REV1 [REV2]"
 
 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 "do not display the saved mtime"
 msgstr "visa inte sparad mtime"
 
 msgid "sort by saved mtime"
 msgstr "sortera efter sparad mtime"
 
 msgid "[OPTION]..."
 msgstr "[FLAGGA]..."
 
 msgid "show the contents of the current dirstate"
 msgstr ""
 
 #, python-format
 msgid "copy: %s -> %s\n"
 msgstr "kopia: %s -> %s\n"
 
 msgid "revision to check"
 msgstr "revision att kontrollera"
 
 msgid "show how files match on given patterns"
 msgstr ""
 
 msgid "REPO [OPTIONS]... [ONE [TWO]]"
 msgstr "ARKIV [FLAGGA]... [ETT [TVÅ]]"
 
 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
 
 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 angivna 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 "      - compare a file in the current working directory to its parent::"
 msgstr "      - jämför en fil i arbetskatalogen med dess förälder::"
 
 msgid "          hg diff foo.c"
 msgstr "          hg diff foo.c"
 
 msgid ""
 "      - compare two historical versions of a directory, with rename info::"
 msgstr ""
 "      - jämför två historiska versioner of en katalog, med namnändringar::"
 
 msgid "          hg diff --git -r 1.0:1.2 lib/"
 msgstr "          hg diff --git -r 1.0:1.2 lib/"
 
 msgid "      - get change stats relative to the last change on some date::"
 msgstr ""
 "      - hämta ändringsstatus relativ ttill den sista ändringen på ett datum::"
 
 msgid "          hg diff --stat -r \"date('may 2')\""
 msgstr "          hg diff --stat -r \"date('may 2')\""
 
 msgid "      - diff all newly-added files that contain a keyword::"
 msgstr "      - diffa alla nytillagda filer som innehåller ett nyckelord::"
 
 msgid "          hg diff \"set:added() and grep(GNU)\""
 msgstr "          hg diff \"set:added() and grep(GNU)\""
 
 msgid "      - compare a revision and its parents::"
 msgstr "      - jämför en revision och dess föräldrar::"
 
 msgid ""
 "          hg diff -c 9353         # compare against first parent\n"
 "          hg diff -r 9353^:9353   # same using revset syntax\n"
 "          hg diff -r 9353^2:9353  # compare against the second parent"
 msgstr ""
 "          hg diff -c 9353         # jämför mot den första föräldern\n"
 "          hg diff -r 9353^:9353   # samma med revset-syntax\n"
 "          hg diff -r 9353^2:9353  # jämför mot den andra föräldern"
 
 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 "[OPTION]... [-o OUTFILESPEC] [-r] REV..."
+msgstr "[FLAGGA]... [-o UTFILSPEC] [-r] REV..."
 
 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"
 "    :``%m``: first line of the commit message (only alphanumeric "
 "characters)\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"
 "    :``%m``: första raden i arkiveringsmeddelandet (bara alfanumeriska "
 "tecken)\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 ""
 "      - use export and import to transplant a bugfix to the current\n"
 "        branch::"
 msgstr ""
 "      - använd export och import för att transplantera en buggfix på den\n"
 "        nuvarande grenen::"
 
 msgid "          hg export -r 9353 | hg import -"
 msgstr "          hg export -r 9353 | hg import -"
 
 msgid ""
 "      - export all the changesets between two revisions to a file with\n"
 "        rename information::"
 msgstr ""
 "      - exportera alla ändringar mellan två revisioner till en fil med\n"
 "        namnändringsinformation::"
 
 msgid "          hg export --git -r 123:150 > changes.txt"
 msgstr "          hg export --git -r 123:150 > changes.txt"
 
 msgid ""
 "      - split outgoing changes into a series of patches with\n"
 "        descriptive names::"
 msgstr ""
 "      - dela upp utgående ändringar till en serie patchar med beskrivande\n"
 "        namn::"
 
 msgid "          hg export -r \"outgoing()\" -o \"%n-%m.patch\""
 msgstr "          hg export -r \"outgoing()\" -o \"%n-%m.patch\""
 
 msgid "export requires at least one changeset"
 msgstr "export kräver minst en ändring"
 
 msgid "exporting patches:\n"
 msgstr "exporterar patchar:\n"
 
 msgid "exporting patch:\n"
 msgstr "exporterar patch:\n"
 
 msgid "forget the specified files on the next commit"
 msgstr "glöm de angivna 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 angivna filerna så att de inte längre kommer att spåras efter\n"
 "    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 "      - forget newly-added binary files::"
 msgstr "      - glöm bort nytillagda binärfiler::"
 
 msgid "          hg forget \"set:added() and binary()\""
 msgstr "          hg forget \"set:added() and binary()\""
 
 msgid "      - forget files that would be excluded by .hgignore::"
 msgstr "      - glöm bort filer som skulle exkluderas av .hgignore::"
 
 msgid "          hg forget \"set:hgignore()\""
 msgstr "          hg forget \"set:hgignore()\""
 
+msgid "revisions to graft"
+msgstr "revisioner att ympa"
+
 msgid "resume interrupted graft"
 msgstr "återuppta avbruten ympning"
 
+msgid "append graft info to log message"
+msgstr "lägg till ympningsinfo till loggmeddelande"
+
 msgid "record the current date as commit date"
 msgstr "lagra det nuvarande datumet som arkiveringsdatumet"
 
 msgid "record the current user as committer"
 msgstr "lagra den nuvarande användaren som arkiverare"
 
-msgid "[OPTION]... REVISION..."
-msgstr "[FLAGGA]... REVISION..."
+msgid "[OPTION]... [-r] REV..."
+msgstr "[FLAGGA]... [-r] REV..."
 
 msgid "copy changes from other branches onto the current branch"
 msgstr "kopiera ändringar från andra grenar till den nuvarande grenen"
 
 msgid ""
 "    This command uses Mercurial's merge logic to copy individual\n"
 "    changes from other branches without merging branches in the\n"
 "    history graph. This is sometimes known as 'backporting' or\n"
 "    'cherry-picking'. By default, graft will copy user, date, and\n"
 "    description from the source changesets."
 msgstr ""
 
 msgid ""
 "    Changesets that are ancestors of the current revision, that have\n"
 "    already been grafted, or that are merges will be skipped."
 msgstr ""
 
+msgid "      (grafted from CHANGESETHASH)"
+msgstr ""
+
 msgid ""
 "    If a graft merge results in conflicts, the graft process is\n"
 "    interrupted so that the current merge can be manually resolved.\n"
 "    Once all conflicts are addressed, the graft process can be\n"
 "    continued with the -c/--continue option."
 msgstr ""
 
 msgid ""
 "    .. note::\n"
 "      The -c/--continue option does not reapply earlier options."
 msgstr ""
 
 msgid ""
 "      - copy a single change to the stable branch and edit its description::"
 msgstr ""
 
 msgid ""
 "          hg update stable\n"
 "          hg graft --edit 9393"
 msgstr ""
 "          hg update stable\n"
 "          hg graft --edit 9393"
 
 msgid ""
 "      - graft a range of changesets with one exception, updating dates::"
 msgstr ""
 
 msgid "          hg graft -D \"2085::2093 and not 2091\""
 msgstr "          hg graft -D \"2085::2093 and not 2091\""
 
 msgid "      - continue a graft after resolving conflicts::"
 msgstr ""
 
 msgid "          hg graft -c"
 msgstr "          hg graft -c"
 
 msgid "      - show the source of a grafted changeset::"
 msgstr ""
 
 msgid "          hg log --debug -r tip"
 msgstr "          hg log --debug -r tip"
 
 msgid ""
 "    Returns 0 on successful completion.\n"
 "    "
 msgstr ""
 "    Returnerar 0 om kommandot lyckades.\n"
 "    "
 
 msgid "can't specify --continue and revisions"
 msgstr "kan inte specificera --continue och revisioner"
 
 msgid "no graft state found, can't continue"
 msgstr ""
 
 #, python-format
 msgid "skipping ungraftable merge revision %s\n"
 msgstr ""
 
 #, python-format
 msgid "skipping ancestor revision %s\n"
 msgstr ""
 
 #, python-format
 msgid "skipping already grafted revision %s\n"
 msgstr ""
 
 #, python-format
 msgid "skipping already grafted revision %s (same origin %d)\n"
 msgstr ""
 
 #, python-format
 msgid "skipping already grafted revision %s (was grafted from %d)\n"
 msgstr ""
 
 #, python-format
 msgid "grafting revision %s\n"
 msgstr "ympar revision %s\n"
 
 msgid "unresolved conflicts, can't continue"
 msgstr "olösta konflikter, kan inte fortsätta"
 
 msgid "use hg resolve and hg graft --continue"
 msgstr "använd hg resolve och hg graft --continue"
 
+#, python-format
+msgid "graft for revision %s is empty\n"
+msgstr ""
+
 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 "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 "STARTREV"
 msgstr "STARTREV"
 
 msgid "show only heads which are descendants of STARTREV"
 msgstr "visa bara huvuden som är ättlingar till 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 "[-ct] [-r STARTREV] [REV]..."
+msgstr "[-ct] [-r STARTREV] [REV]..."
 
 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. This means\n"
 "    that you can use :hg:`heads foo` to see the heads on a branch\n"
 "    named ``foo``."
 msgstr ""
 "    Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n"
 "    som är associerade med de angivna ändringarna att visas. Det betyder\n"
 "    att du kan använda :hg:`heads foo` för att se huvuden på en gren vid\n"
 "    namn ``foo``."
 
 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 only help for extensions"
 msgstr "visa bara hjälp för utökningar"
 
 msgid "show only help for commands"
 msgstr "visa bara hjälp för kommandon"
 
+msgid "show topics matching keyword"
+msgstr "visa ämnen för nyckelord"
+
 msgid "[-ec] [TOPIC]"
 msgstr "[-ec] [ÄMNE]"
 
 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"
-"    "
+"    Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet."
 
 msgid ""
 "    Returns 0 if successful.\n"
 "    "
 msgstr ""
 "    Returnerar 0 om kommandot lyckades.\n"
 "    "
 
-msgid "VALUE"
-msgstr "VÄRDE"
-
-msgid "DEPRECATED"
-msgstr "FÖRLEGAD"
-
-msgid ""
-"\n"
-"[+] marked option can be specified multiple times\n"
-msgstr ""
-"\n"
-"flaggor markerade med [+] kan anges flera gånger\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 help %s\" to show the full help text"
-msgstr "använd \"hg help %s\" för att visa utförlig hjälp"
-
-#, python-format
-msgid "use \"hg -v help%s\" to show builtin aliases and global options"
-msgstr ""
-"använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
-
-#, python-format
-msgid "use \"hg -v help %s\" to show more info"
-msgstr "använd \"hg -v help %s\" för att visa mer info"
-
 #, 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 "use \"hg help -e %s\" to show help for the %s extension"
 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s"
 
 msgid "options:"
 msgstr "flaggor:"
 
+msgid "global options:"
+msgstr "globala flaggor:"
+
 #, python-format
 msgid ""
 "\n"
 "use \"hg help %s\" to show the full help text\n"
 msgstr ""
 "\n"
 "använd \"hg help %s\" för att visa fullständig hjälptext\n"
 
 #, python-format
 msgid ""
 "\n"
 "use \"hg -v help %s\" to show more info\n"
 msgstr ""
 "\n"
 "använd \"hg -v help %s\" för att visa mer information\n"
 
 msgid "basic commands:"
 msgstr "grundläggande kommandon:"
 
 msgid "list of commands:"
 msgstr "kommandolista:"
 
 msgid "no commands defined\n"
 msgstr "inga kommandon definierade\n"
 
 msgid "enabled extensions:"
 msgstr "aktiverade utökningar:"
 
 msgid ""
 "\n"
 "additional help topics:"
 msgstr ""
 "\n"
 "ytterligare hjälpämnen:"
 
+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 help %s\" to show the full help text"
+msgstr "använd \"hg help %s\" för att visa utförlig hjälp"
+
+#, python-format
+msgid "use \"hg -v help%s\" to show builtin aliases and global options"
+msgstr ""
+"använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
+
 #, python-format
 msgid ""
 "\n"
 "use \"hg help -c %s\" to see help for the %s command\n"
 msgstr ""
 "\n"
 "använd \"hg help -c %s\" för att visa hjälp för kommandot %s\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 "Topics"
+msgstr "Ämnen"
+
+msgid "Extension Commands"
+msgstr "Utökningar"
+
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial Distribuerad SCM\n"
 
 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 "show bookmarks"
 msgstr "visa bokmärken"
 
 msgid "[-nibtB] [-r REV] [SOURCE]"
 msgstr "[-nibtB] [-r REV] [KÄLLA]"
 
 msgid "identify the working copy or specified revision"
 msgstr "identifiera arbetskopian eller angivna revisioner"
 
 msgid ""
 "    Print a summary identifying the repository state at REV using one or\n"
 "    two parent hash identifiers, followed by a \"+\" if the working\n"
 "    directory has uncommitted changes, the branch name (if not default),\n"
 "    a list of tags, and a list of bookmarks."
 msgstr ""
 "    Visa en sammanfattning som identifierar arkivstatusen vid REV med en\n"
 "    eller två föräldrars hash-identifierare, följt av ett \"+\" om det\n"
 "    finns oarkiverade ändringar i arbetskatalogen, grennamnet (om inte\n"
 "    default), en märkeslista, och en bokmärkeslista."
 
 msgid ""
 "    When REV is not given, 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 "      - generate a build identifier for the working directory::"
 msgstr "      - skapa en byggidentifierare för arbetskatalogen::"
 
 msgid "          hg id --id > build-id.dat"
 msgstr "          hg id --id > build-id.dat"
 
 msgid "      - find the revision corresponding to a tag::"
 msgstr "      - hitta revisionen för ett märke::"
 
 msgid "          hg id -n -r 1.3"
 msgstr "          hg id -n -r 1.3"
 
 msgid "      - check the most recent revision of a remote repository::"
 msgstr "      - kontrollera den senaste revisionen i ett fjärrarkiv::"
 
 msgid "          hg id -r tip http://selenic.com/hg/"
 msgstr "          hg id -r tip http://selenic.com/hg/"
 
 msgid "can't query remote revision number, branch, or tags"
 msgstr "kan inte efterfråga revisionsnummer, gren, eller märken"
 
 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 (DEPRECATED)"
 msgstr "grundsökväg (FÖRÅLDRAD)"
 
 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, bara uppdatera arbetskatalogen"
 
 msgid "apply patch without touching the working directory"
 msgstr "applicera patch utan att röra arbetskatalogen"
 
 msgid "apply patch to the nodes from which it was generated"
 msgstr ""
 
 msgid "use any branch information in patch (implied by --exact)"
 msgstr ""
 
 msgid "[OPTION]... PATCH..."
 msgstr "[FLAGGA]... PATCH..."
 
 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 ""
 "    Use --bypass to apply and commit patches directly to the\n"
 "    repository, not touching the working directory. Without --exact,\n"
 "    patches will be applied on top of the working directory parent\n"
 "    revision."
 msgstr ""
 
 msgid ""
 "    With -s/--similarity, hg will attempt to discover renames and\n"
 "    copies in the patch in the same way as :hg:`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 "      - import a traditional patch from a website and detect renames::"
 msgstr ""
 "      - importera en vanlig patch från en webbsida och upptäck namnbyten::"
 
 msgid "          hg import -s 80 http://example.com/bugfix.patch"
 msgstr "          hg import -s 80 http://example.com/bugfix.patch"
 
 msgid "      - import a changeset from an hgweb server::"
 msgstr "      - importera en ändring från en hgweb-server::"
 
 msgid "          hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
 msgstr "          hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
 
 msgid "      - import all the patches in an Unix-style mbox::"
 msgstr "      - importera alla patchar i en Unix-liknande mbox::"
 
 msgid "          hg import incoming-patches.mbox"
 msgstr "          hg import incoming-patches.mbox"
 
 msgid ""
 "      - attempt to exactly restore an exported changeset (not always\n"
 "        possible)::"
 msgstr ""
 "      - försök att exakt återställa en exporterad ändring (inte alltid\n"
 "        möjligt)::"
 
 msgid "          hg import --exact proposed-fix.patch"
 msgstr "          hg import --exact proposed-fix.patch"
 
 msgid "need at least one patch to import"
 msgstr "behöver minst en patch att importera"
 
 msgid "cannot use --no-commit with --bypass"
 msgstr "kan inte använda --no-commit med --bypass"
 
 msgid "cannot use --similarity with --bypass"
 msgstr "kan inte använda --similarity med --bypass"
 
 msgid "patch is damaged or loses information"
 msgstr "patchen är skadad eller tappar information"
 
 msgid "applied to working directory"
 msgstr "applicerad på arbetskatalog"
 
 msgid "not a Mercurial patch"
 msgstr "inte en Mercurial-patch"
 
 #. i18n: refers to a short changeset id
 #, python-format
 msgid "created %s"
 msgstr "skapade %s"
 
 msgid "applying patch from stdin\n"
 msgstr ""
 
 #, python-format
 msgid "%s: no diffs found"
 msgstr "%s: inga diffar hittades"
 
 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 "compare bookmarks"
 msgstr "jämför bokmärken"
 
 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 "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 "remote doesn't support bookmarks\n"
 msgstr "fjärrserver stödjer inte bokmärken\n"
 
 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
 
 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 "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 "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 "only follow the first parent of merge changesets (DEPRECATED)"
-msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)"
-
-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 (DEPRECATED)"
-msgstr "visa bara sammanfogningar (FÖRLEGAD)"
-
-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 "show hidden changesets (DEPRECATED)"
-msgstr "visa dolda ändringar (FÖRLEGAD)"
-
-msgid "[OPTION]... [FILE]"
-msgstr "[FLAGGA]... [FIL]"
-
 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 ""
 "    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."
 msgstr ""
 "    Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n"
 "    inte --follow är satt, då arbetskatalogens förälder används som första\n"
 "    revision."
 
 msgid ""
 "    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."
 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."
 
 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 ""
 "    .. note::\n"
 "       for performance reasons, log FILE may omit duplicate changes\n"
 "       made on branches and will not show deletions. To see all\n"
 "       changes including duplicates and deletions, use the --removed\n"
 "       switch."
 msgstr ""
 "    .. note::\n"
 "       av prestandaskäl så kan 'log FILE' hoppa över duplicerade ändringar\n"
 "       gjorda på grenar och kommer inte att visa raderingar. För att se\n"
 "       alla ändringar inklusive dupliceringar och raderingar, använd\n"
 "       flaggan --removed."
 
 msgid "      - changesets with full descriptions and file lists::"
 msgstr "      - ändringar med fulla beskrivningar och fillistor::"
 
 msgid "          hg log -v"
 msgstr "          hg log -v"
 
 msgid "      - changesets ancestral to the working directory::"
 msgstr "      - ändringar som är anfädrar arbetskatalogen::"
 
 msgid "          hg log -f"
 msgstr "          hg log -f"
 
 msgid "      - last 10 commits on the current branch::"
 msgstr "      - sista 10 arkiveringarna på aktuell gren::"
 
 msgid "          hg log -l 10 -b ."
 msgstr "          hg log -l 10 -b ."
 
 msgid ""
 "      - changesets showing all modifications of a file, including removals::"
 msgstr ""
 "      - alla ändringar och modifikationer för en fil, inklusive raderingar::"
 
 msgid "          hg log --removed file.c"
 msgstr "          hg log --removed file.c"
 
 msgid ""
 "      - all changesets that touch a directory, with diffs, excluding merges::"
 msgstr ""
 "      - alla ändringar som rör en katalog, med diffar, utan sammanfogningar::"
 
 msgid "          hg log -Mp lib/"
 msgstr "          hg log -Mp lib/"
 
 msgid "      - all revision numbers that match a keyword::"
 msgstr "      - alla revisionsnummer som matchar ett nyckelord::"
 
 msgid "          hg log -k bug --template \"{rev}\\n\""
 msgstr "          hg log -k bug --template \"{rev}\\n\""
 
 msgid "      - check if a given changeset is included is a tagged release::"
 msgstr "      - kontrollera om en ändring inkluderas i en märkt release::"
 
 msgid "          hg log -r \"a21ccf and ancestor(1.9)\""
 msgstr "          hg log -r \"a21ccf and ancestor(1.9)\""
 
 msgid "      - find all changesets by some user in a date range::"
 msgstr "      - hitta alla ändringar av en användare i ett datumintervall::"
 
 msgid "          hg log -k alice -d \"may 2008 to jul 2008\""
 msgstr "          hg log -k alice -d \"may 2008 to jul 2008\""
 
 msgid "      - summary of all changesets after the last tag::"
 msgstr "      - sammanfattning av alla ändringar efter det senaste märket::"
 
 msgid ""
 "          hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
 msgstr ""
 "          hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
 
 msgid ""
 "    See :hg:`help revisions` and :hg:`help revsets` for more about\n"
 "    specifying revisions."
 msgstr ""
 "    Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n"
 "    revisioner."
 
+msgid ""
+"    See :hg:`help templates` for more about pre-packaged styles and\n"
+"    specifying custom templates."
+msgstr ""
+"    Se :hg:`help templates` för information om mallar och filter.\n"
+"    "
+
 msgid "revision to display"
 msgstr "revision att visa"
 
 msgid "list files from all revisions"
 msgstr "visa filer från alla revisioner"
 
 msgid "[-r REV]"
 msgstr "[-r REV]"
 
 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 ""
 "    If option --all is specified, the list of all files from all revisions\n"
 "    is printed. This includes deleted and renamed files."
 msgstr ""
 "    Om flaggan --all är angiven, visas en lista med alla filer från alla\n"
 "    revisioner. Detta inlkuderar borttagna och omdöpta filer."
 
 msgid "can't specify a revision with --all"
 msgstr "du kan inte ange en revision med --all"
 
 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 "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. See :hg:`help merge-tools` for options."
 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. Se\n"
 "    :hg:`help merge-tools` för flaggor."
 
 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"
 "    "
 
+msgid ""
+"multiple matching bookmarks to merge - please merge with an explicit rev or "
+"bookmark"
+msgstr ""
+"flera överrensstämmande bokmärken att sammanfoga - ange en explicit revision "
+"eller ett bokmärke"
+
+msgid "run 'hg heads' to see all heads"
+msgstr "kör 'hg heads' för att se alla huvuden"
+
+msgid ""
+"no matching bookmark to merge - please merge with an explicit rev or bookmark"
+msgstr ""
+"inga överrensstämmande bokmärken att sammanfoga - ange en explicit revision "
+"eller ett bokmärke"
+
 #, python-format
 msgid "branch '%s' has %d heads - please merge with an explicit rev"
 msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev"
 
 msgid "run 'hg heads .' to see heads"
 msgstr "kör 'hg heads .' för att se huvuden"
 
+msgid "heads are bookmarked - please merge with an explicit rev"
+msgstr "huvuden är bokmärkta - sammanfoga med en explicit revision"
+
 #, python-format
 msgid "branch '%s' has one head - please merge with an explicit rev"
 msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev"
 
-msgid "run 'hg heads' to see all heads"
-msgstr "kör 'hg heads' för att se alla huvuden"
-
 msgid "nothing to merge"
 msgstr "inget att sammanfoga"
 
 msgid "use 'hg update' instead"
 msgstr "använd 'hg update' istället"
 
 msgid "working directory not at a head revision"
 msgstr "arbetskatalogen är inte vid en huvudrevision"
 
 msgid "use 'hg update' or merge with an explicit revision"
 msgstr "använd 'hg update' eller sammanfoga med en speficik 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 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 parents of the specified revision"
 msgstr "visa föräldrar för den angivna revisionen"
 
 msgid "[-r REV] [FILE]"
 msgstr "[-r REV] [FIL]"
 
 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 "[NAME]"
 msgstr "[NAMN]"
 
 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 ""
 "    Option -q/--quiet suppresses all output when searching for NAME\n"
 "    and shows only the path names when listing all definitions."
 msgstr ""
 "    Flaggan -q/--quiet stänger av all utmatning vid sökning efter NAMN\n"
 "    och visar bara sökvägarna när alla definitioner listas."
 
 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 "set changeset phase to public"
 msgstr "sätt ändringsfas till public"
 
 msgid "set changeset phase to draft"
 msgstr "sätt ändringsfas till draft"
 
 msgid "set changeset phase to secret"
 msgstr "sätt ändringsfas till secret"
 
 msgid "allow to move boundary backward"
 msgstr "tillåt att gränser flyttas bakåt"
 
 msgid "target revision"
 msgstr "målrevision"
 
 msgid "[-p|-d|-s] [-f] [-r] REV..."
 msgstr "[-p|-d|-s] [-f] [-r] REV..."
 
 msgid "set or show the current phase name"
 msgstr "sätt eller visa det aktuella fasnamnet"
 
 msgid "    With no argument, show the phase name of specified revisions."
 msgstr "    Om inga argument ges, så visas fasnamnet för angivna revisioner."
 
 msgid ""
 "    With one of -p/--public, -d/--draft or -s/--secret, change the\n"
 "    phase value of the specified revisions."
 msgstr ""
 "    Med en av -p/--public, -d/--draft eller -s/--secret, så ändras\n"
 "    fasvärdet för de angivna revisionerna."
 
 msgid ""
 "    Unless -f/--force is specified, :hg:`phase` won't move changeset from a\n"
 "    lower phase to an higher phase. Phases are ordered as follows::"
 msgstr ""
 "    Om inte -f/--force anges, så kommer inte :hg:`phase` att flytta\n"
 "    ändringar från en lägre fas till en högre fas. Faser är ordnade enligt\n"
 "    följande::"
 
 msgid "        public < draft < secret"
 msgstr "        public < draft < secret"
 
 msgid ""
-"    Return 0 on success, 1 if no phases were changed.\n"
-"    "
-msgstr ""
-"    Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades.\n"
+"    Return 0 on success, 1 if no phases were changed or some could not\n"
+"    be changed.\n"
+"    "
+msgstr ""
+"    Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades eller om\n"
+"    några inte kunde förändras.\n"
 "    "
 
 msgid "only one phase can be specified"
 msgstr "bara en fas kan vara angiven"
 
 #, python-format
-msgid "phase change for %i changesets\n"
-msgstr "fasändring för %i ändringar\n"
+msgid "cannot move %i changesets to a more permissive phase, use --force\n"
+msgstr ""
+
+#, python-format
+msgid "phase changed for %i changesets\n"
+msgstr "fas ändrad för %i ändringar\n"
 
 msgid "no phases changed\n"
 msgstr "inga faser ändrage\n"
 
 #, python-format
 msgid "not updating: %s\n"
 msgstr "uppdaterar inte: %s\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 heads .' to see heads, 'hg merge' to merge)\n"
 msgstr "(kör 'hg heads' för att se huvuden, 'hg merge' för att sammanfoga)\n"
 
 msgid "(run 'hg heads' to see heads)\n"
 msgstr "(kör 'hg heads' för att se huvuden)\n"
 
 msgid "(run 'hg update' to get a working copy)\n"
 msgstr "(kör 'hg update' för att få en arbetskopia)\n"
 
 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 "BOOKMARK"
 msgstr "BOKMÄRKE"
 
 msgid "bookmark to pull"
 msgstr "bokmärke att dra"
 
 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
 msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
 
 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"
 "    "
 
 #, python-format
 msgid "remote bookmark %s not found!"
 msgstr "fjärrbokmärket %s hittades inte!"
 
-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 "importing bookmark %s\n"
 msgstr "importerar bokmärket %s\n"
 
 msgid "force push"
 msgstr "tvinga tryckning"
 
 msgid "bookmark to push"
 msgstr "bokmärke att trycka"
 
 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 "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 ""
+"    If -B/--bookmark is used, the specified bookmarked revision, its\n"
+"    ancestors, and the bookmark will be pushed to the remote\n"
+"    repository."
+msgstr ""
+"    Om -B/--bookmarks används, kommer den angivna bokmärkta revisionen,\n"
+"    alla anfäder och bokmärket att 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"
 
 #, 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"
 
 #, python-format
 msgid "updating bookmark %s failed!\n"
 msgstr "uppdatering av bokmärket %s misslyckades!\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 "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 "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 current branch."
 msgstr "    Markera de indikerade filerna för borttagning från aktuell gren."
 
 msgid ""
 "    This command schedules the files to be removed at the next commit.\n"
 "    To undo a remove before that, see :hg:`revert`. To undo added\n"
 "    files, see :hg:`forget`."
 msgstr ""
 "    Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
 "    att ångra en remove innan dess, se :hg:`revert`. För att ångra tillagda\n"
 "    filer, se :hg:`forget`."
 
 msgid ""
 "      -A/--after can be used to remove only files that have already\n"
 "      been deleted, -f/--force can be used to force deletion, and -Af\n"
 "      can be used to remove files from the next revision without\n"
 "      deleting them from the working directory."
 msgstr ""
 "      -A/--after kan användas för att bara ta bort filer som redan\n"
 "      raderats, -f/--force kan användas för att tvinga radering, och -Af\n"
 "      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 [!]\n"
 "      (as reported by :hg:`status`). The actions are Warn, Remove\n"
 "      (from 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 ""
 "      ======= == == == ==\n"
 "              A  C  M  !\n"
 "      ======= == == == ==\n"
 "      none    W  RD W  R\n"
 "      -f      R  RD RD R\n"
 "      -A      W  W  W  R\n"
 "      -Af     R  R  R  R\n"
 "      ======= == == == =="
 msgstr ""
 "      ======= == == == ==\n"
 "              A  C  M  !\n"
 "      ======= == == == ==\n"
 "      ingen   V  RT V  R\n"
 "      -f      R  RT RT R\n"
 "      -A      V  V  V  R\n"
 "      -Af     R  R  R  R\n"
 "      ======= == == == =="
 
 msgid ""
 "      Note that remove never deletes files in Added [A] state from the\n"
 "      working directory, not even if option --force is specified."
 msgstr ""
 "      Notera att remove aldrig tar bort filer som är Adderade [A] från\n"
 "      arbetskatalogen, inte ens om --force är angivet."
 
 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 forget to undo)\n"
 msgstr "raderar inte %s: filen har lagts till (använd forget för att ångra)\n"
 
 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 "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 "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 "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). See :hg:`help\n"
 "    merge-tools` for information on configuring merge tools."
 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 select 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.  Previous file\n"
 "      contents are saved with a ``.orig`` suffix."
 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 "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 "restore files to their checkout state"
 msgstr "återställ filer till deras uthämtningstillstånd"
 
-msgid ""
-"    .. note::\n"
+msgid "    .. note::"
+msgstr "    .. note::"
+
+msgid ""
 "       To check out earlier revisions, you should use :hg:`update REV`.\n"
-"       To cancel a merge (and lose your changes), use :hg:`update --clean .`."
+"       To cancel an uncommitted merge (and lose your changes), use\n"
+"       :hg:`update --clean .`."
 msgstr ""
 "    .. note::\n"
 "       För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n"
-"       För att avbryta en sammanfogning (och bli av med alla ändringar),\n"
-"       använd :hg:`update --clean .`."
+"       För att avbryta en oarkiverad sammanfogning (och bli av med alla\n"
+"        ändringar), använd :hg:`update --clean .`."
 
 msgid ""
 "    With no revision specified, revert the specified files or directories\n"
 "    to the contents they had in the parent of the working directory.\n"
 "    This restores the contents of 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örsta förälder.\n"
 "    Det sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
 "    raderingar, kopior och namnbyten. Om arbetskatalogen har två föräldrar,\n"
 "    så måste du ange en revision."
 
 msgid ""
 "    Using the -r/--rev or -d/--date options, revert the given files or\n"
 "    directories to their states as of a specific revision. Because\n"
 "    revert does not change the working directory parents, this will\n"
 "    cause these files to appear modified. This can be helpful to \"back\n"
 "    out\" some or all of an earlier change. See :hg:`backout` for a\n"
 "    related method."
 msgstr ""
 "    Med flaggan -r/--rev eller -d/--date, återställs de givna filerna eller\n"
 "    katalogerna till läget i den specifika revisionen. Eftersom revert\n"
 "    inte ändrar arbetskatalogens föräldrar, kommer dessa filer att visas\n"
 "    som modifierade. Detta kan användas för att ångra delar av eller hela\n"
 "    tidigare ändringar. Se :hg:`backout` för en relaterad metod."
 
 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 "uncommitted merge with no revision specified"
 msgstr "oarkiverad sammanfogning utan angiven revision"
 
 msgid "use \"hg update\" or see \"hg help revert\""
 msgstr "använd \"hg update\" eller se \"hg help revert\""
 
 msgid "no files or directories specified"
 msgstr "inga filer eller kataloger angivna"
 
 msgid ""
 "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to "
 "abort the merge"
 msgstr ""
 "oarkiverad sammanfogning, använd --all för att kasta alla ändringar, eller "
 "'hg update -C .' för att avbryta sammanfogningen"
 
 #, python-format
 msgid ""
 "uncommitted changes, use --all to discard all changes, or 'hg update %s' to "
 "update"
 msgstr ""
 "oarkiverade ändringar, använd --all för att kasta alla ändringar, eller 'hg "
 "update %s' för att uppdatera"
 
 #, python-format
 msgid "use --all to revert all files, or 'hg update %s' to update"
 msgstr ""
 "använd --all för att återställa alla filer, eller 'hg update %s' för att "
 "uppdatera"
 
 msgid "uncommitted changes, use --all to discard all changes"
 msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar"
 
 msgid "use --all to revert all files"
 msgstr "använd --all för att återställa filer"
 
-#, 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 "ignore safety measures"
 msgstr "ignorera säkerhetsåtgärder"
 
 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:"
+"    repository."
 msgstr ""
 "    Transaktioner används för att kapsla in alla kommandon som skapar nya\n"
-"    ändringar eller sprider existerade ändringar till ett arkiv.\n"
+"    ändringar eller sprider existerade ändringar till ett arkiv."
+
+msgid ""
+"      For example, the following commands are transactional, and their\n"
+"      effects can be rolled back:"
+msgstr ""
 "    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 ""
 "    To avoid permanent data loss, rollback will refuse to rollback a\n"
 "    commit transaction if it isn't checked out. Use --force to\n"
 "    override this protection."
 msgstr ""
-"    För att undvika permanent dataförlust så vägrar rollback att köras på\n"
-"    en arkivering om den inte är uthämtad. Använd --force för att gå förbi\n"
-"    det här skyddet."
+"      För att undvika permanent dataförlust så vägrar rollback att köras\n"
+"      på en arkivering om den inte är uthämtad. Använd --force för att gå\n"
+"      förbi det här skyddet."
 
 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 "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 "address to listen on (default: all interfaces)"
 msgstr "adress att lyssna på (standard alla gränssnitt)"
 
 msgid "ADDR"
 msgstr "ADDR"
 
 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 "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 browsing 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 "cannot use --stdio with --cmdserver"
 msgstr "kan inte använda --stdio med --cmdserver"
 
-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 untrusted configuration options"
 msgstr "visa opålitliga konfigurationsalternativ"
 
 msgid "[-u] [NAME]..."
 msgstr "[-u] [NAMN]..."
 
 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."
 
 msgid "only one config item permitted"
 msgstr "bara ett konfigurationsalternativ tillåts"
 
 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 "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 ""
 "      - show changes in the working directory relative to a\n"
 "        changeset::"
 msgstr ""
 "      - visa modifikationer i arbetskatalogen relativt till en ändring::"
 
 msgid "          hg status --rev 9353"
 msgstr "          hg status --rev 9353"
 
 msgid "      - show all changes including copies in an existing changeset::"
 msgstr "      - visa alla ändringar inklusive kopior i en ändring::"
 
 msgid "          hg status --copies --change 9353"
 msgstr "          hg status --copies --change 9353"
 
 msgid "      - get a NUL separated list of added files, suitable for xargs::"
 msgstr ""
 "      - visa en NUL-separerad lista med tillagda filer, lämpligt för xargs::"
 
 msgid "          hg status -an0"
 msgstr "          hg status -an0"
 
 msgid "check for push and pull"
 msgstr "sök efter inkommande och utgående ändringar"
 
 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"
 
 msgid "bookmarks:"
 msgstr "bokmärken:"
 
 #, 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 "%d incoming bookmarks"
 msgstr "%d inkommande bokmärken"
 
 #, python-format
 msgid "%d outgoing bookmarks"
 msgstr "%d utgående bokmärken"
 
 #, python-format
 msgid "remote: %s\n"
 msgstr "fjärran: %s\n"
 
 msgid "remote: (synced)\n"
 msgstr "fjärran: (synkad)\n"
 
 msgid "force tag"
 msgstr "tvinga märkning"
 
 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 "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. Changing\n"
 "    an existing tag is normally disallowed; use -f/--force to override."
 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. Att ändra ett existerande märke är normalt inte\n"
 "    tillåtet; använd -f/--force för att tvinga."
 
 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 similarly\n"
 "    to other project files and can be hand-edited if necessary. This\n"
 "    also means that tagging creates a new commit. The file\n"
 "    \".hg/localtags\" is used for local tags (not shared among\n"
 "    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 ""
 "    Tag commits are usually made at the head of a branch. If the parent\n"
 "    of the working directory is not a branch head, :hg:`tag` aborts; use\n"
 "    -f/--force to force the tag commit to be based on a non-head\n"
 "    changeset."
 msgstr ""
 "    Arkivering av märken görs vanligtvis på huvudet av en gren. Om\n"
 "    föräldern till arbetskatalogen inte är ett grenhuvud, så avbryts\n"
 "    :hg:`tag`; använd -f/--force för att tvinga arkiveringen."
 
 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 ""
 "    Eftersom märkesnamn har prioritet över grennamn vid uppslagning av\n"
 "    revisioner, avråds det att använda existerande grennamn som märkesnamn."
 
 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 "uncommitted merge"
 msgstr "oarkiverad sammanfogning"
 
 msgid "not at a branch head (use -f to force)"
 msgstr "inte vid ett grenhuvud (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 "[-p] [-g]"
 msgstr "[-p] [-g]"
 
 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 "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 "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 "discard uncommitted changes (no backup)"
 msgstr "kassera oarkiverade ändringar (ingen backup)"
 
 msgid "update across branches if no uncommitted changes"
 msgstr "uppdatera över grenar om inga oarkiverade ändringar"
 
 msgid "[-c] [-C] [-d DATE] [[-r] REV]"
 msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
 
 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 and move the current bookmark (see :hg:`help\n"
 "    bookmarks`)."
 msgstr ""
 "    Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n"
 "    ändring anges, så uppdateras till toppen på den nuvarande namngivna\n"
 "    grenen och nuvarande bokmärket flyttas (se :hg:`help bookmarks`)."
 
 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 ""
 "    Update sets the working directory's parent revison to the specified\n"
 "    changeset (see :hg:`help parents`)."
 msgstr ""
 
 msgid ""
+"    If the changeset is not a descendant or ancestor of the working\n"
+"    directory's parent, the update is aborted. With the -c/--check\n"
+"    option, the working directory is checked for uncommitted changes; if\n"
+"    none are 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."
+"         begärda ändringen är en anfader eller ättling till\n"
+"         arbetskatalogens förälder, kommer oarkiverade ändringar att\n"
+"         sammanfogas med den begärda ändringen och det sammanfogade\n"
+"         resultatet lämnas oarkiverat. Om den begärda ändringen inte är en\n"
+"         anfader eller ättling (dvs är i en annan gren), avbryts\n"
+"         uppdateringen och de oarkiverade ändringarna  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."
+"      3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras\n"
+"         och arbetskatalogen uppdateras till den begärda ändringen."
+
+msgid ""
+"    To cancel an uncommitted merge (and lose your changes), use\n"
+"    :hg:`update --clean .`."
+msgstr ""
+"    För att avbryta en oarkiverad sammanfogning (och förlora dina\n"
+"    ändringar), använd :hg:`update --clean .`."
 
 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 revert just one file to an older revision, use\n"
 "    :hg:`revert [-r REV] NAME`."
 msgstr ""
 "    Om du vill uppdatera bara en fil till en äldre revision, använd\n"
 "    :hg:`revert [-r REV] NAMN`."
 
 msgid "cannot specify both -c/--check and -C/--clean"
 msgstr "kan inte både ange -c/--check och -C/--clean"
 
 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-2012 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-2012 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"
 
 #, python-format
 msgid "unknown mode %s"
 msgstr "okänt läge '%s'"
 
 #, python-format
 msgid "unknown command %s"
 msgstr "okänt kommando %s"
 
 #, python-format
 msgid "cannot include %s (%s)"
 msgstr "kan inte inkludera %s (%s)"
 
+#, python-format
+msgid "working directory has unknown parent '%s'!"
+msgstr ""
+
+#, python-format
+msgid "unknown revision '%s'"
+msgstr ""
+
 msgid "not found in manifest"
 msgstr "hittades inte i manifestet"
 
 #, python-format
 msgid "no such file in rev %s"
 msgstr "ingen sådan fil i rev %s"
 
 msgid "branch name not in UTF-8!"
 msgstr "grennamn inte i UTF-8!"
 
 #, python-format
 msgid "%s does not exist!\n"
 msgstr "%s existerar inte!\n"
 
 #, 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 "%s inte tillagd: bara filer och symlänkar stödjs\n"
 
 #, python-format
 msgid "%s already tracked!\n"
 msgstr "%s spåras redan!\n"
 
 #, python-format
 msgid "%s not tracked!\n"
 msgstr "%s spåras inte!\n"
 
 #, python-format
 msgid "%s not removed!\n"
 msgstr "%s inte borttagen!\n"
 
 #, 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 "nullid"
 msgstr ""
 
 msgid "working directory state appears damaged!"
 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 ""
 
 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 ""
 
 #, 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 head %s on branch '%s'!"
 msgstr "push skapar nytt fjärrhuvud %s på grenen '%s'!"
 
 #, python-format
 msgid "push creates new remote head %s!"
 msgstr "push skapar nya fjärrhuvudet %s!"
 
 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"
 
 #, python-format
 msgid "new remote heads on branch '%s'\n"
 msgstr "nya fjärrhuvuden på grenen '%s'!\n"
 
 #, python-format
 msgid "new remote head %s\n"
 msgstr "nytt fjärrhuvud %s\n"
 
 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 "avbryter: %s: %s\n"
 
 #, 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 ""
 
 msgid "abort: remote error:\n"
 msgstr "avbryter: fjärrfel:\n"
 
 #, python-format
 msgid "abort: %s!\n"
 msgstr "avbryter: %s!\n"
 
 #, python-format
 msgid "abort: %s"
 msgstr "avbryter: %s"
 
 msgid " empty string\n"
 msgstr " tom sträng\n"
 
 msgid "killed!\n"
 msgstr "dödad!\n"
 
 #, python-format
 msgid "hg: unknown command '%s'\n"
 msgstr "hg: okänt kommando '%s'\n"
 
 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 "avbruten!\n"
 
 msgid ""
 "\n"
 "broken pipe\n"
 msgstr ""
 
 msgid "abort: out of memory\n"
 msgstr ""
 
+msgid "the extension author."
+msgstr ""
+
+#, python-format
+msgid ""
+"** Unknown exception encountered with possibly-broken third-party extension "
+"%s\n"
+"** which supports versions %s of Mercurial.\n"
+"** Please disable %s and try your action again.\n"
+"** If that fixes the bug please report it to %s\n"
+msgstr ""
+
 msgid "** unknown exception encountered, please report by visiting\n"
 msgstr ""
 
 msgid "**  http://mercurial.selenic.com/wiki/BugTracker\n"
-msgstr ""
+msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n"
 
 #, 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 ""
 
+msgid "too few arguments for command alias"
+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"
+msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
 msgstr ""
 
 #, python-format
 msgid "repository '%s' is not local"
 msgstr "arkivet '%s' är inte lokalt"
 
 #, python-format
 msgid "no repository found in '%s' (.hg not found)"
 msgstr "inget arkiv hittades i '%s' (.hg hittades inte)"
 
 msgid "warning: --repository ignored\n"
 msgstr "varning: --repository ignorerades\n"
 
 #, 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 ""
 
+msgid "statprof not available - install using \"easy_install statprof\""
+msgstr ""
+
+#, python-format
+msgid "invalid sampling frequency '%s' - ignoring\n"
+msgstr ""
+
+#, python-format
+msgid "unrecognized profiler '%s' - ignored\n"
+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 "warning: error finding commands in %s\n"
 msgstr "varning: kunde inte hitta kommandon i %s\n"
 
 #, 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 ""
 
+msgid ""
+"``internal:prompt``\n"
+"Asks the user which of the local or the other version to keep as\n"
+"    the merged version."
+msgstr ""
+
 #, python-format
 msgid ""
 " no tool found to merge %s\n"
 "keep (l)ocal or take (o)ther?"
 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: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 ""
+
 #, python-format
 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
 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 ""
+
+#, python-format
+msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n"
+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 ""
+
+#, python-format
+msgid "merging %s failed!\n"
+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 incomplete! (edit conflicts, then use 'hg resolve --mark')\n"
-msgstr ""
-
-#, python-format
-msgid "merging %s failed!\n"
-msgstr ""
-
 msgid "unterminated string"
 msgstr ""
 
 msgid "syntax error"
 msgstr ""
 
 msgid "missing argument"
 msgstr ""
 
 msgid "can't use a list in this context"
 msgstr "kan inte använda en lista i detta sammanhang"
 
 msgid ""
 "``modified()``\n"
 "    File that is modified according to status."
 msgstr ""
 
 #. i18n: "modified" is a keyword
 msgid "modified takes no arguments"
 msgstr "modified tar inga argument"
 
 msgid ""
 "``added()``\n"
 "    File that is added according to status."
 msgstr ""
 
 #. i18n: "added" is a keyword
 msgid "added takes no arguments"
 msgstr "added tar inga argument"
 
 msgid ""
 "``removed()``\n"
 "    File that is removed according to status."
 msgstr ""
 
 #. i18n: "removed" is a keyword
 msgid "removed takes no arguments"
 msgstr "removed tar inga argument"
 
 msgid ""
 "``deleted()``\n"
 "    File that is deleted according to status."
 msgstr ""
 
 #. i18n: "deleted" is a keyword
 msgid "deleted takes no arguments"
 msgstr "deleted tar inga argument"
 
 msgid ""
 "``unknown()``\n"
 "    File that is unknown according to status. These files will only be\n"
 "    considered if this predicate is used."
 msgstr ""
 
 #. i18n: "unknown" is a keyword
 msgid "unknown takes no arguments"
 msgstr "unknown tar inga argument"
 
 msgid ""
 "``ignored()``\n"
 "    File that is ignored according to status. These files will only be\n"
 "    considered if this predicate is used."
 msgstr ""
 
 #. i18n: "ignored" is a keyword
 msgid "ignored takes no arguments"
 msgstr "ignored tar inga argument"
 
 msgid ""
 "``clean()``\n"
 "    File that is clean according to status."
 msgstr ""
 
 #. i18n: "clean" is a keyword
 msgid "clean takes no arguments"
 msgstr "clean tar inga argument"
 
 #, python-format
 msgid "not a function: %s"
 msgstr "inte en funktion: %s"
 
 msgid ""
 "``binary()``\n"
 "    File that appears to be binary (contains NUL bytes)."
 msgstr ""
 
 #. i18n: "binary" is a keyword
 msgid "binary takes no arguments"
 msgstr "binary tar inga argument"
 
 msgid ""
 "``exec()``\n"
 "    File that is marked as executable."
 msgstr ""
 
 #. i18n: "exec" is a keyword
 msgid "exec takes no arguments"
 msgstr "exec tar inga argument"
 
 msgid ""
 "``symlink()``\n"
 "    File that is marked as a symlink."
 msgstr ""
 
 #. i18n: "symlink" is a keyword
 msgid "symlink takes no arguments"
 msgstr "symlink tar inga argument"
 
 msgid ""
 "``resolved()``\n"
 "    File that is marked resolved according to the resolve state."
 msgstr ""
 
 #. i18n: "resolved" is a keyword
 msgid "resolved takes no arguments"
 msgstr "resolved tar inga argument"
 
 msgid ""
 "``unresolved()``\n"
 "    File that is marked unresolved according to the resolve state."
 msgstr ""
 
 #. i18n: "unresolved" is a keyword
 msgid "unresolved takes no arguments"
 msgstr "unresolved tar inga argument"
 
 msgid ""
 "``hgignore()``\n"
 "    File that matches the active .hgignore pattern."
 msgstr ""
 
 msgid "hgignore takes no arguments"
 msgstr "hgignore tar inga argument"
 
 msgid ""
 "``grep(regex)``\n"
 "    File contains the given regular expression."
 msgstr ""
 
 msgid "grep requires a pattern"
 msgstr "grep kräver ett mönster"
 
 #, python-format
 msgid "couldn't parse size: %s"
 msgstr ""
 
 msgid ""
 "``size(expression)``\n"
 "    File size matches the given expression. Examples:"
 msgstr ""
 
 msgid ""
 "    - 1k (files from 1024 to 2047 bytes)\n"
 "    - < 20k (files less than 20480 bytes)\n"
 "    - >= .5MB (files at least 524288 bytes)\n"
 "    - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
 msgstr ""
 
 #. i18n: "size" is a keyword
 msgid "size requires an expression"
 msgstr "size kräver ett uttryck"
 
 msgid ""
 "``encoding(name)``\n"
 "    File can be successfully decoded with the given character\n"
 "    encoding. May not be useful for encodings other than ASCII and\n"
 "    UTF-8."
 msgstr ""
 
 #. i18n: "encoding" is a keyword
 msgid "encoding requires an encoding name"
 msgstr ""
 
 #, python-format
 msgid "unknown encoding '%s'"
 msgstr ""
 
 msgid ""
 "``copied()``\n"
 "    File that is recorded as being copied."
 msgstr ""
 
 #. i18n: "copied" is a keyword
 msgid "copied takes no arguments"
 msgstr "copied tar inga argument"
 
+msgid ""
+"``subrepo([pattern])``\n"
+"    Subrepositories whose paths match the given pattern."
+msgstr ""
+
+#. i18n: "subrepo" is a keyword
+msgid "subrepo takes at most one argument"
+msgstr "subrepo tar maximalt ett argument"
+
+msgid "subrepo requires a pattern or no arguments"
+msgstr "subrepo kräver ett mönster eller inga argument"
+
 msgid "invalid token"
 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 "invalid bisect state"
 msgstr "ogiltigt bisect-tillständ"
 
 #. i18n: bisect changeset status
 msgid "good"
 msgstr "bra"
 
 #. i18n: bisect changeset status
 msgid "bad"
 msgstr "dålig"
 
 #. i18n: bisect changeset status
 msgid "skipped"
 msgstr "hoppade över"
 
 #. i18n: bisect changeset status
 msgid "untested"
 msgstr "otestad"
 
 #. i18n: bisect changeset status
 msgid "good (implicit)"
 msgstr "bra (implicit)"
 
 #. i18n: bisect changeset status
 msgid "bad (implicit)"
 msgstr "dålig (implicit)"
 
 msgid "disabled extensions:"
 msgstr "deaktiverade utökningar:"
 
+msgid "VALUE"
+msgstr "VÄRDE"
+
+msgid "DEPRECATED"
+msgstr "FÖRLEGAD"
+
+msgid ""
+"\n"
+"[+] marked option can be specified multiple times\n"
+msgstr ""
+"\n"
+"flaggor markerade med [+] kan anges flera gånger\n"
+
 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 "Specifying File Sets"
 msgstr "Ange Filset"
 
 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 "Using Additional Features"
+msgstr "Använda Ytterligare Funktioner"
 
 msgid "Subrepositories"
 msgstr "Underarkiv"
 
 msgid "Configuring hgweb"
 msgstr "Konfiguration av hgweb"
 
 msgid "Glossary"
 msgstr "Ordlista"
 
-msgid "syntax for Mercurial ignore files"
-msgstr "syntax för Mercurials ignoreringsfiler"
+msgid "Syntax for Mercurial Ignore Files"
+msgstr "Syntax för Mercurials Ignoreringsfiler"
 
 msgid "Working with Phases"
 msgstr "Arbeta med Faser"
 
 msgid ""
 "The Mercurial system uses a set of configuration files to control\n"
 "aspects of its behavior."
 msgstr ""
 "Mercurial använder ett antal konfigurationsfiler för att kontrollera hur\n"
 "vissa delar ska fungera."
 
 msgid ""
 "The configuration files use a simple ini-file format. A configuration\n"
 "file consists of sections, led by a ``[section]`` header and followed\n"
 "by ``name = value`` entries::"
 msgstr ""
 "Konfigurationsfilerna för Mercurial använder ett enkelt ini-filformat. En\n"
 "konfigurationsfil består av sektioner, som inleds av en ``[sektion]`` och\n"
 "följs av rader med ``namn = värde``::"
 
 msgid ""
 "  [ui]\n"
 "  username = Firstname Lastname <[e-mail]>\n"
 "  verbose = True"
 msgstr ""
 "  [ui]\n"
 "  username = Förnamn Efternamn <[e-mail]>\n"
 "  verbose = True"
 
 msgid ""
 "The above entries will be referred to as ``ui.username`` and\n"
 "``ui.verbose``, respectively. See the Syntax section below."
 msgstr ""
 "Raderna ovanför refereras till som ``ui.username`` och\n"
 "``ui.verbose``, respektive. Läs Syntax-sektionen nedanför:"
 
 msgid ""
 "Files\n"
 "-----"
 msgstr ""
 "Filer\n"
 "-----"
 
 msgid ""
 "Mercurial reads configuration data from several files, if they exist.\n"
 "These files do not exist by default and you will have to create the\n"
 "appropriate configuration files yourself: global configuration like\n"
 "the username setting is typically put into\n"
 "``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
 "configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
 msgstr ""
 
 msgid ""
 "The names of these files depend on the system on which Mercurial is\n"
 "installed. ``*.rc`` files from a single directory are read in\n"
 "alphabetical order, later ones overriding earlier ones. Where multiple\n"
 "paths are given below, settings from earlier paths override later\n"
 "ones."
 msgstr ""
 
-msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgid "| (All) ``<repo>/.hg/hgrc``"
 msgstr ""
 
 msgid ""
 "    Per-repository configuration options that only apply in a\n"
 "    particular repository. This file is not version-controlled, and\n"
 "    will not get transferred during a \"clone\" operation. Options in\n"
 "    this file override options in all other configuration files. On\n"
-"    Unix, most of this file will be ignored if it doesn't belong to a\n"
-"    trusted user or to a trusted group. See the documentation for the\n"
-"    ``[trusted]`` section below for more details."
-msgstr ""
-
-msgid ""
+"    Plan 9 and Unix, most of this file will be ignored if it doesn't\n"
+"    belong to a trusted user or to a trusted group. See the documentation\n"
+"    for the ``[trusted]`` section below for more details."
+msgstr ""
+
+msgid ""
+"| (Plan 9) ``$home/lib/hgrc``\n"
 "| (Unix) ``$HOME/.hgrc``\n"
 "| (Windows) ``%USERPROFILE%\\.hgrc``\n"
 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
 "| (Windows) ``%HOME%\\.hgrc``\n"
 "| (Windows) ``%HOME%\\Mercurial.ini``"
 msgstr ""
 
 msgid ""
 "    Per-user configuration file(s), for the user running Mercurial. On\n"
 "    Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
 "    files apply to all Mercurial commands executed by this user in any\n"
 "    directory. Options in these files override per-system and per-"
 "installation\n"
 "    options."
 msgstr ""
 
 msgid ""
+"| (Plan 9) ``/lib/mercurial/hgrc``\n"
+"| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc``\n"
 "| (Unix) ``/etc/mercurial/hgrc``\n"
 "| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
 msgstr ""
 
 msgid ""
 "    Per-system configuration files, for the system on which Mercurial\n"
 "    is running. Options in these files apply to all Mercurial commands\n"
 "    executed by any user in any directory. Options in these files\n"
 "    override per-installation options."
 msgstr ""
 
 msgid ""
+"| (Plan 9) ``<install-root>/lib/mercurial/hgrc``\n"
+"| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc``\n"
 "| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
 "| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
 msgstr ""
 
 msgid ""
 "    Per-installation configuration files, searched for in the\n"
 "    directory where Mercurial is installed. ``<install-root>`` is the\n"
 "    parent directory of the **hg** executable (or symlink) being run. For\n"
 "    example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
 "    in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
 "    to all Mercurial commands executed by any user in any directory."
 msgstr ""
 
 msgid ""
 "| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
 "| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
 "| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
 msgstr ""
 
 msgid ""
 "    Per-installation/system configuration files, for the system on\n"
 "    which Mercurial is running. Options in these files apply to all\n"
 "    Mercurial commands executed by any user in any directory. Registry\n"
 "    keys contain PATH-like strings, every part of which must reference\n"
 "    a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
 "    be read.  Mercurial checks each of these locations in the specified\n"
-"    order until one or more configuration files are detected.  If the\n"
-"    pywin32 extensions are not installed, Mercurial will only look for\n"
-"    site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
+"    order until one or more configuration files are detected."
 msgstr ""
 
 msgid ""
 "Syntax\n"
 "------"
 msgstr ""
 
 msgid ""
 "A configuration file consists of sections, led by a ``[section]`` header\n"
 "and followed by ``name = value`` entries (sometimes called\n"
 "``configuration keys``)::"
 msgstr ""
 
 msgid ""
 "    [spam]\n"
 "    eggs=ham\n"
 "    green=\n"
 "       eggs"
 msgstr ""
 
 msgid ""
 "Each line contains one entry. If the lines that follow are indented,\n"
 "they are treated as continuations of that entry. Leading whitespace is\n"
 "removed from values. Empty lines are skipped. Lines beginning with\n"
 "``#`` or ``;`` are ignored and may be used to provide comments."
 msgstr ""
 
 msgid ""
 "Configuration keys can be set multiple times, in which case Mercurial\n"
 "will use the value that was configured last. As an example::"
 msgstr ""
 
 msgid ""
 "    [spam]\n"
 "    eggs=large\n"
 "    ham=serrano\n"
 "    eggs=small"
 msgstr ""
 
 msgid "This would set the configuration key named ``eggs`` to ``small``."
 msgstr ""
 
 msgid ""
 "It is also possible to define a section multiple times. A section can\n"
 "be redefined on the same and/or on different configuration files. For\n"
 "example::"
 msgstr ""
 
 msgid ""
 "    [foo]\n"
 "    eggs=large\n"
 "    ham=serrano\n"
 "    eggs=small"
 msgstr ""
 
 msgid ""
 "    [bar]\n"
 "    eggs=ham\n"
 "    green=\n"
 "       eggs"
 msgstr ""
 
 msgid ""
 "    [foo]\n"
 "    ham=prosciutto\n"
 "    eggs=medium\n"
 "    bread=toasted"
 msgstr ""
 
 msgid ""
 "This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
 "of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
 "respectively. As you can see there only thing that matters is the last\n"
 "value that was set for each of the configuration keys."
 msgstr ""
 
 msgid ""
 "If a configuration key is set multiple times in different\n"
 "configuration files the final value will depend on the order in which\n"
 "the different configuration files are read, with settings from earlier\n"
 "paths overriding later ones as described on the ``Files`` section\n"
 "above."
 msgstr ""
 
 msgid ""
 "A line of the form ``%include file`` will include ``file`` into the\n"
 "current configuration file. The inclusion is recursive, which means\n"
 "that included files can include other files. Filenames are relative to\n"
 "the configuration file in which the ``%include`` directive is found.\n"
 "Environment variables and ``~user`` constructs are expanded in\n"
 "``file``. This lets you do something like::"
 msgstr ""
 
 msgid "  %include ~/.hgrc.d/$HOST.rc"
 msgstr ""
 
 msgid "to include a different configuration file on each computer you use."
 msgstr ""
 
 msgid ""
 "A line with ``%unset name`` will remove ``name`` from the current\n"
 "section, if it has been set previously."
 msgstr ""
 
 msgid ""
 "The values are either free-form text strings, lists of text strings,\n"
 "or Boolean values. Boolean values can be set to true using any of \"1\",\n"
 "\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or "
 "\"off\"\n"
 "(all case insensitive)."
 msgstr ""
 
 msgid ""
 "List values are separated by whitespace or comma, except when values are\n"
 "placed in double quotation marks::"
 msgstr ""
 
 msgid "  allow_read = \"John Doe, PhD\", brian, betty"
 msgstr ""
 
 msgid ""
 "Quotation marks can be escaped by prefixing them with a backslash. Only\n"
 "quotation marks at the beginning of a word is counted as a quotation\n"
 "(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
 msgstr ""
 
 msgid ""
 "Sections\n"
 "--------"
 msgstr ""
 
 msgid ""
 "This section describes the different sections that may appear in a\n"
 "Mercurial configuration file, the purpose of each section, its possible\n"
 "keys, and their possible values."
 msgstr ""
 
 msgid ""
 "``alias``\n"
 "\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Defines command aliases.\n"
 "Aliases allow you to define your own commands in terms of other\n"
 "commands (or aliases), optionally including arguments. Positional\n"
 "arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
 "are expanded by Mercurial before execution. Positional arguments not\n"
 "already used by ``$N`` in the definition are put at the end of the\n"
 "command to be executed."
 msgstr ""
 
 msgid "Alias definitions consist of lines of the form::"
 msgstr ""
 
 msgid "    <alias> = <command> [<argument>]..."
 msgstr ""
 
 msgid "For example, this definition::"
 msgstr ""
 
 msgid "    latest = log --limit 5"
 msgstr ""
 
 msgid ""
 "creates a new command ``latest`` that shows only the five most recent\n"
 "changesets. You can define subsequent aliases using earlier ones::"
 msgstr ""
 
 msgid "    stable5 = latest -b stable"
 msgstr ""
 
 msgid ""
 ".. note:: It is possible to create aliases with the same names as\n"
 "   existing commands, which will then override the original\n"
 "   definitions. This is almost always a bad idea!"
 msgstr ""
 
 msgid ""
 "An alias can start with an exclamation point (``!``) to make it a\n"
 "shell alias. A shell alias is executed with the shell and will let you\n"
 "run arbitrary commands. As an example, ::"
 msgstr ""
 
-msgid "   echo = !echo"
+msgid "   echo = !echo $@"
 msgstr ""
 
 msgid ""
 "will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
 "terminal. A better example might be::"
 msgstr ""
 
 msgid "   purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
 msgstr ""
 
 msgid ""
 "which will make ``hg purge`` delete all unknown files in the\n"
 "repository in the same manner as the purge extension."
 msgstr ""
 
 msgid ""
-"Shell aliases are executed in an environment where ``$HG`` expand to\n"
+"Positional arguments like ``$1``, ``$2``, etc. in the alias definition\n"
+"expand to the command arguments. Unmatched arguments are\n"
+"removed. ``$0`` expands to the alias name and ``$@`` expands to all\n"
+"arguments separated by a space. These expansions happen before the\n"
+"command is passed to the shell."
+msgstr ""
+
+msgid ""
+"Shell aliases are executed in an environment where ``$HG`` expands to\n"
 "the path of the Mercurial that was used to execute the alias. This is\n"
 "useful when you want to call further Mercurial commands in a shell\n"
 "alias, as was done above for the purge alias. In addition,\n"
-"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
+"``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg\n"
 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
 msgstr ""
 
 msgid ""
 ".. note:: Some global configuration options such as ``-R`` are\n"
 "   processed before shell aliases and will thus not be passed to\n"
 "   aliases."
 msgstr ""
 
 msgid ""
 "\n"
 "``annotate``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Settings used when displaying file annotations. All values are\n"
 "Booleans and default to False. See ``diff`` section for related\n"
 "options for the diff command."
 msgstr ""
 
 msgid ""
 "``ignorews``\n"
 "    Ignore white space when comparing lines."
 msgstr ""
 "``ignorews``\n"
 "    Ignorera blanktecken när rader jämförs."
 
 msgid ""
 "``ignorewsamount``\n"
 "    Ignore changes in the amount of white space."
 msgstr ""
 "``ignorewsamount``\n"
 "    Ignorera ändringar av antalet blanktecken."
 
 msgid ""
 "``ignoreblanklines``\n"
 "    Ignore changes whose lines are all blank."
 msgstr ""
 "``ignoreblanklines``\n"
 "    Ignorera ändringar vars rader är tomma."
 
 msgid ""
 "\n"
 "``auth``\n"
 "\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Authentication credentials for HTTP authentication. This section\n"
 "allows you to store usernames and passwords for use when logging\n"
 "*into* HTTP servers. See the ``[web]`` configuration section if\n"
 "you want to configure *who* can login to your HTTP server."
 msgstr ""
 
 msgid "Each line has the following format::"
 msgstr ""
 
 msgid "    <name>.<argument> = <value>"
 msgstr ""
 
 msgid ""
 "where ``<name>`` is used to group arguments into authentication\n"
 "entries. Example::"
 msgstr ""
 
 msgid ""
 "    foo.prefix = hg.intevation.org/mercurial\n"
 "    foo.username = foo\n"
 "    foo.password = bar\n"
 "    foo.schemes = http https"
 msgstr ""
 
 msgid ""
 "    bar.prefix = secure.example.org\n"
 "    bar.key = path/to/file.key\n"
 "    bar.cert = path/to/file.cert\n"
 "    bar.schemes = https"
 msgstr ""
 
 msgid "Supported arguments:"
 msgstr ""
 
 msgid ""
 "``prefix``\n"
 "    Either ``*`` or a URI prefix with or without the scheme part.\n"
 "    The authentication entry with the longest matching prefix is used\n"
 "    (where ``*`` matches everything and counts as a match of length\n"
 "    1). If the prefix doesn't include a scheme, the match is performed\n"
 "    against the URI with its scheme stripped as well, and the schemes\n"
 "    argument, q.v., is then subsequently consulted."
 msgstr ""
 
 msgid ""
 "``username``\n"
 "    Optional. Username to authenticate with. If not given, and the\n"
 "    remote site requires basic or digest authentication, the user will\n"
 "    be prompted for it. Environment variables are expanded in the\n"
 "    username letting you do ``foo.username = $USER``. If the URI\n"
 "    includes a username, only ``[auth]`` entries with a matching\n"
 "    username or without a username will be considered."
 msgstr ""
 
 msgid ""
 "``password``\n"
 "    Optional. Password to authenticate with. If not given, and the\n"
 "    remote site requires basic or digest authentication, the user\n"
 "    will be prompted for it."
 msgstr ""
 
 msgid ""
 "``key``\n"
 "    Optional. PEM encoded client certificate key file. Environment\n"
 "    variables are expanded in the filename."
 msgstr ""
 
 msgid ""
 "``cert``\n"
 "    Optional. PEM encoded client certificate chain file. Environment\n"
 "    variables are expanded in the filename."
 msgstr ""
 
 msgid ""
 "``schemes``\n"
 "    Optional. Space separated list of URI schemes to use this\n"
 "    authentication entry with. Only used if the prefix doesn't include\n"
 "    a scheme. Supported schemes are http and https. They will match\n"
 "    static-http and static-https respectively, as well.\n"
 "    Default: https."
 msgstr ""
 
 msgid ""
 "If no suitable authentication entry is found, the user is prompted\n"
 "for credentials as usual if required by the remote."
 msgstr ""
 
 msgid ""
 "\n"
 "``decode/encode``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Filters for transforming files on checkout/checkin. This would\n"
 "typically be used for newline processing or other\n"
 "localization/canonicalization of files."
 msgstr ""
 
 msgid ""
 "Filters consist of a filter pattern followed by a filter command.\n"
 "Filter patterns are globs by default, rooted at the repository root.\n"
 "For example, to match any file ending in ``.txt`` in the root\n"
 "directory only, use the pattern ``*.txt``. To match any file ending\n"
 "in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
 "For each file only the first matching filter applies."
 msgstr ""
 
 msgid ""
 "The filter command can start with a specifier, either ``pipe:`` or\n"
 "``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
 msgstr ""
 
 msgid ""
 "A ``pipe:`` command must accept data on stdin and return the transformed\n"
 "data on stdout."
 msgstr ""
 
 msgid "Pipe example::"
 msgstr "Pipe-exempel::"
 
 msgid ""
 "  [encode]\n"
 "  # uncompress gzip files on checkin to improve delta compression\n"
 "  # note: not necessarily a good idea, just an example\n"
 "  *.gz = pipe: gunzip"
 msgstr ""
 
 msgid ""
 "  [decode]\n"
 "  # recompress gzip files when writing them to the working dir (we\n"
 "  # can safely omit \"pipe:\", because it's the default)\n"
 "  *.gz = gzip"
 msgstr ""
 
 msgid ""
 "A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
 "with the name of a temporary file that contains the data to be\n"
 "filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
 "of an empty temporary file, where the filtered data must be written by\n"
 "the command."
 msgstr ""
 
 msgid ""
 ".. note:: The tempfile mechanism is recommended for Windows systems,\n"
 "   where the standard shell I/O redirection operators often have\n"
 "   strange effects and may corrupt the contents of your files."
 msgstr ""
 
 msgid ""
 "This filter mechanism is used internally by the ``eol`` extension to\n"
 "translate line ending characters between Windows (CRLF) and Unix (LF)\n"
 "format. We suggest you use the ``eol`` extension for convenience."
 msgstr ""
 
 msgid ""
 "\n"
 "``defaults``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
 msgstr ""
 
 msgid ""
 "Use the ``[defaults]`` section to define command defaults, i.e. the\n"
 "default options/arguments to pass to the specified commands."
 msgstr ""
 
 msgid ""
 "The following example makes :hg:`log` run in verbose mode, and\n"
 ":hg:`status` show only the modified files, by default::"
 msgstr ""
 
 msgid ""
 "  [defaults]\n"
 "  log = -v\n"
 "  status = -m"
 msgstr ""
 
 msgid ""
 "The actual commands, instead of their aliases, must be used when\n"
 "defining command defaults. The command defaults will also be applied\n"
 "to the aliases of the commands defined."
 msgstr ""
 
 msgid ""
 "\n"
 "``diff``\n"
 "\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Settings used when displaying diffs. Everything except for ``unified``\n"
 "is a Boolean and defaults to False. See ``annotate`` section for\n"
 "related options for the annotate command."
 msgstr ""
 
 msgid ""
 "``git``\n"
 "    Use git extended diff format."
 msgstr ""
 "``git``\n"
 "    Använd gits utökade diff-format."
 
 msgid ""
 "``nodates``\n"
 "    Don't include dates in diff headers."
 msgstr ""
 
 msgid ""
 "``showfunc``\n"
 "    Show which function each change is in."
 msgstr ""
 "``showfunc``\n"
 "    Visa vilken funktion varje ändring är i."
 
 msgid ""
 "``unified``\n"
 "    Number of lines of context to show."
 msgstr ""
 "``unified``\n"
 "Antal sammanhangsrader att visa."
 
 msgid ""
 "``email``\n"
 "\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid "Settings for extensions that send email messages."
 msgstr ""
 
 msgid ""
 "``from``\n"
 "    Optional. Email address to use in \"From\" header and SMTP envelope\n"
 "    of outgoing messages."
 msgstr ""
 
 msgid ""
 "``to``\n"
 "    Optional. Comma-separated list of recipients' email addresses."
 msgstr ""
 
 msgid ""
 "``cc``\n"
 "    Optional. Comma-separated list of carbon copy recipients'\n"
 "    email addresses."
 msgstr ""
 
 msgid ""
 "``bcc``\n"
 "    Optional. Comma-separated list of blind carbon copy recipients'\n"
 "    email addresses."
 msgstr ""
 
 msgid ""
 "``method``\n"
 "    Optional. Method to use to send email messages. If value is ``smtp``\n"
 "    (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
 "    Otherwise, use as name of program to run that acts like sendmail\n"
 "    (takes ``-f`` option for sender, list of recipients on command line,\n"
 "    message on stdin). Normally, setting this to ``sendmail`` or\n"
 "    ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
 msgstr ""
 
 msgid ""
 "``charsets``\n"
 "    Optional. Comma-separated list of character sets considered\n"
 "    convenient for recipients. Addresses, headers, and parts not\n"
 "    containing patches of outgoing messages will be encoded in the\n"
 "    first character set to which conversion from local encoding\n"
 "    (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
 "    conversion fails, the text in question is sent as is. Defaults to\n"
 "    empty (explicit) list."
 msgstr ""
 
 msgid "    Order of outgoing email character sets:"
 msgstr ""
 
 msgid ""
 "    1. ``us-ascii``: always first, regardless of settings\n"
 "    2. ``email.charsets``: in order given by user\n"
 "    3. ``ui.fallbackencoding``: if not in email.charsets\n"
 "    4. ``$HGENCODING``: if not in email.charsets\n"
 "    5. ``utf-8``: always last, regardless of settings"
 msgstr ""
 
 msgid "Email example::"
 msgstr "Email-exempel::"
 
 msgid ""
 "  [email]\n"
 "  from = Joseph User <[e-mail]>\n"
 "  method = /usr/sbin/sendmail\n"
 "  # charsets for western Europeans\n"
 "  # us-ascii, utf-8 omitted, as they are tried first and last\n"
 "  charsets = iso-8859-1, iso-8859-15, windows-1252"
 msgstr ""
 
 msgid ""
 "\n"
 "``extensions``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Mercurial has an extension mechanism for adding new features. To\n"
 "enable an extension, create an entry for it in this section."
 msgstr ""
 
 msgid ""
 "If you know that the extension is already in Python's search path,\n"
 "you can give the name of the module, followed by ``=``, with nothing\n"
 "after the ``=``."
 msgstr ""
 
 msgid ""
 "Otherwise, give a name that you choose, followed by ``=``, followed by\n"
 "the path to the ``.py`` file (including the file name extension) that\n"
 "defines the extension."
 msgstr ""
 
 msgid ""
 "To explicitly disable an extension that is enabled in an hgrc of\n"
 "broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
 "or ``foo = !`` when path is not supplied."
 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 ``!``, som i\n"
 "``foo = !/ext/path`` eller ``foo = !`` när sökvägen inte anges."
 
 msgid "Example for ``~/.hgrc``::"
 msgstr "Exempel för ``~/.hgrc``::"
 
 msgid ""
 "  [extensions]\n"
 "  # (the mq extension will get loaded from Mercurial's path)\n"
 "  mq =\n"
 "  # (this extension will get loaded from the file specified)\n"
 "  myfeature = ~/.hgext/myfeature.py"
 msgstr ""
 
 msgid ""
 "\n"
-"``hostfingerprints``\n"
-"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
-msgstr ""
-
-msgid ""
-"Fingerprints of the certificates of known HTTPS servers.\n"
-"A HTTPS connection to a server with a fingerprint configured here will\n"
-"only succeed if the servers certificate matches the fingerprint.\n"
-"This is very similar to how ssh known hosts works.\n"
-"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
-"The CA chain and web.cacerts is not used for servers with a fingerprint."
-msgstr ""
-
-msgid "For example::"
-msgstr "Exempelvis::"
-
-msgid ""
-"    [hostfingerprints]\n"
-"    hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
-"d6:4b:ee:cc"
-msgstr ""
-
-msgid "This feature is only supported when using Python 2.6 or later."
-msgstr ""
-
-msgid ""
-"\n"
 "``format``\n"
 "\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "``usestore``\n"
 "    Enable or disable the \"store\" repository format which improves\n"
 "    compatibility with systems that fold case or otherwise mangle\n"
 "    filenames. Enabled by default. Disabling this option will allow\n"
 "    you to store longer filenames in some situations at the expense of\n"
 "    compatibility and ensures that the on-disk format of newly created\n"
 "    repositories will be compatible with Mercurial before version 0.9.4."
 msgstr ""
 
 msgid ""
 "``usefncache``\n"
 "    Enable or disable the \"fncache\" repository format which enhances\n"
 "    the \"store\" repository format (which has to be enabled to use\n"
 "    fncache) to allow longer filenames and avoids using Windows\n"
 "    reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
 "    option ensures that the on-disk format of newly created\n"
 "    repositories will be compatible with Mercurial before version 1.1."
 msgstr ""
 
 msgid ""
 "``dotencode``\n"
 "    Enable or disable the \"dotencode\" repository format which enhances\n"
 "    the \"fncache\" repository format (which has to be enabled to use\n"
 "    dotencode) to avoid issues with filenames starting with ._ on\n"
 "    Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
 "    option ensures that the on-disk format of newly created\n"
 "    repositories will be compatible with Mercurial before version 1.7."
 msgstr ""
 
 msgid ""
-"``merge-patterns``\n"
-"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
-msgstr ""
-
-msgid ""
-"This section specifies merge tools to associate with particular file\n"
-"patterns. Tools matched here will take precedence over the default\n"
-"merge tool. Patterns are globs by default, rooted at the repository\n"
-"root."
-msgstr ""
-
-msgid ""
-"  [merge-patterns]\n"
-"  **.c = kdiff3\n"
-"  **.jpg = myimgmerge"
-msgstr ""
-
-msgid ""
-"``merge-tools``\n"
-"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
-msgstr ""
-
-msgid ""
-"This section configures external merge tools to use for file-level\n"
-"merges."
-msgstr ""
-
-msgid "Example ``~/.hgrc``::"
-msgstr ""
-
-msgid ""
-"  [merge-tools]\n"
-"  # Override stock tool location\n"
-"  kdiff3.executable = ~/bin/kdiff3\n"
-"  # Specify command line\n"
-"  kdiff3.args = $base $local $other -o $output\n"
-"  # Give higher priority\n"
-"  kdiff3.priority = 1"
-msgstr ""
-
-msgid ""
-"  # Define new tool\n"
-"  myHtmlTool.args = -m $local $other $base $output\n"
-"  myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
-"  myHtmlTool.priority = 1"
-msgstr ""
-
-msgid ""
-"``priority``\n"
-"  The priority in which to evaluate this tool.\n"
-"  Default: 0."
-msgstr ""
-
-msgid ""
-"``executable``\n"
-"  Either just the name of the executable or its pathname.  On Windows,\n"
-"  the path can use environment variables with ${ProgramFiles} syntax.\n"
-"  Default: the tool name."
-msgstr ""
-
-msgid ""
-"``args``\n"
-"  The arguments to pass to the tool executable. You can refer to the\n"
-"  files being merged as well as the output file through these\n"
-"  variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
-"  Default: ``$local $base $other``"
-msgstr ""
-
-msgid ""
-"``premerge``\n"
-"  Attempt to run internal non-interactive 3-way merge tool before\n"
-"  launching external tool.  Options are ``true``, ``false``, or ``keep``\n"
-"  to leave markers in the file if the premerge fails.\n"
-"  Default: True"
-msgstr ""
-
-msgid ""
-"``binary``\n"
-"  This tool can merge binary files. Defaults to False, unless tool\n"
-"  was selected by file pattern match."
-msgstr ""
-
-msgid ""
-"``symlink``\n"
-"  This tool can merge symlinks. Defaults to False, even if tool was\n"
-"  selected by file pattern match."
-msgstr ""
-
-msgid ""
-"``check``\n"
-"  A list of merge success-checking options:"
-msgstr ""
-
-msgid ""
-"  ``changed``\n"
-"    Ask whether merge was successful when the merged file shows no changes.\n"
-"  ``conflicts``\n"
-"    Check whether there are conflicts even though the tool reported "
-"success.\n"
-"  ``prompt``\n"
-"    Always prompt for merge success, regardless of success reported by tool."
-msgstr ""
-
-msgid ""
-"``checkchanged``\n"
-"  True is equivalent to ``check = changed``.\n"
-"  Default: False"
-msgstr ""
-
-msgid ""
-"``checkconflicts``\n"
-"  True is equivalent to ``check = conflicts``.\n"
-"  Default: False"
-msgstr ""
-
-msgid ""
-"``fixeol``\n"
-"  Attempt to fix up EOL changes caused by the merge tool.\n"
-"  Default: False"
-msgstr ""
-
-msgid ""
-"``gui``\n"
-"  This tool requires a graphical interface to run. Default: False"
-msgstr ""
-
-msgid ""
-"``regkey``\n"
-"  Windows registry key which describes install location of this\n"
-"  tool. Mercurial will search for this key first under\n"
-"  ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
-"  Default: None"
-msgstr ""
-
-msgid ""
-"``regkeyalt``\n"
-"  An alternate Windows registry key to try if the first key is not\n"
-"  found.  The alternate key uses the same ``regname`` and ``regappend``\n"
-"  semantics of the primary key.  The most common use for this key\n"
-"  is to search for 32bit applications on 64bit operating systems.\n"
-"  Default: None"
-msgstr ""
-
-msgid ""
-"``regname``\n"
-"  Name of value to read from specified registry key. Defaults to the\n"
-"  unnamed (default) value."
-msgstr ""
-
-msgid ""
-"``regappend``\n"
-"  String to append to the value read from the registry, typically\n"
-"  the executable name of the tool.\n"
-"  Default: None"
-msgstr ""
-
-msgid ""
-"\n"
+"``graph``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Web graph view configuration. This section let you change graph\n"
+"elements display properties by branches, for instance to make the\n"
+"``default`` branch stand out."
+msgstr ""
+
+msgid "    <branch>.<argument> = <value>"
+msgstr ""
+
+msgid ""
+"where ``<branch>`` is the name of the branch being\n"
+"customized. Example::"
+msgstr ""
+
+msgid ""
+"    [graph]\n"
+"    # 2px width\n"
+"    default.width = 2\n"
+"    # red color\n"
+"    default.color = FF0000"
+msgstr ""
+
+msgid ""
+"``width``\n"
+"    Set branch edges width in pixels."
+msgstr ""
+
+msgid ""
+"``color``\n"
+"    Set branch edges color in hexadecimal RGB notation."
+msgstr ""
+
+msgid ""
 "``hooks``\n"
 "\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Commands or Python functions that get automatically executed by\n"
 "various actions such as starting or finishing a commit. Multiple\n"
 "hooks can be run for the same action by appending a suffix to the\n"
 "action. Overriding a site-wide hook can be done by changing its\n"
 "value or setting it to an empty string.  Hooks can be prioritized\n"
 "by adding a prefix of ``priority`` to the hook name on a new line\n"
 "and setting the priority.  The default priority is 0 if\n"
 "not specified."
 msgstr ""
 
 msgid "Example ``.hg/hgrc``::"
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  # update working directory after adding changesets\n"
 "  changegroup.update = hg update\n"
 "  # do not use the site-wide hook\n"
 "  incoming =\n"
 "  incoming.email = /my/email/hook\n"
 "  incoming.autobuild = /my/build/hook\n"
 "  # force autobuild hook to run before other incoming hooks\n"
 "  priority.incoming.autobuild = 1"
 msgstr ""
 
 msgid ""
 "Most hooks are run with environment variables set that give useful\n"
 "additional information. For each hook below, the environment\n"
 "variables it is passed are listed with names of the form ``$HG_foo``."
 msgstr ""
 
 msgid ""
 "``changegroup``\n"
 "  Run after a changegroup has been added via push, pull or unbundle.\n"
 "  ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
 "  changes came is in ``$HG_URL``."
 msgstr ""
 
 msgid ""
 "``commit``\n"
 "  Run after a changeset has been created in the local repository. ID\n"
 "  of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
 "  IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
 
 msgid ""
 "``incoming``\n"
 "  Run after a changeset has been pulled, pushed, or unbundled into\n"
 "  the local repository. The ID of the newly arrived changeset is in\n"
 "  ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
 msgstr ""
 
 msgid ""
 "``outgoing``\n"
 "  Run after sending changes from local repository to another. ID of\n"
 "  first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
 "  ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
 msgstr ""
 
 msgid ""
 "``post-<command>``\n"
 "  Run after successful invocations of the associated command. The\n"
 "  contents of the command line are passed as ``$HG_ARGS`` and the result\n"
 "  code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
 "  ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
 "  the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
 "  dictionary of options (with unspecified options set to their defaults).\n"
 "  ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
 msgstr ""
 
 msgid ""
 "``pre-<command>``\n"
 "  Run before executing the associated command. The contents of the\n"
 "  command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
 "  are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
 "  representations of the data internally passed to <command>. ``$HG_OPTS``\n"
 "  is a  dictionary of options (with unspecified options set to their\n"
 "  defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
 "  failure, the command doesn't execute and Mercurial returns the failure\n"
 "  code."
 msgstr ""
 
 msgid ""
 "``prechangegroup``\n"
 "  Run before a changegroup is added via push, pull or unbundle. Exit\n"
 "  status 0 allows the changegroup to proceed. Non-zero status will\n"
 "  cause the push, pull or unbundle to fail. URL from which changes\n"
 "  will come is in ``$HG_URL``."
 msgstr ""
 
 msgid ""
 "``precommit``\n"
 "  Run before starting a local commit. Exit status 0 allows the\n"
 "  commit to proceed. Non-zero status will cause the commit to fail.\n"
 "  Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
 
 msgid ""
 "``prelistkeys``\n"
 "  Run before listing pushkeys (like bookmarks) in the\n"
 "  repository. Non-zero status will cause failure. The key namespace is\n"
 "  in ``$HG_NAMESPACE``."
 msgstr ""
 
 msgid ""
 "``preoutgoing``\n"
 "  Run before collecting changes to send from the local repository to\n"
 "  another. Non-zero status will cause failure. This lets you prevent\n"
 "  pull over HTTP or SSH. Also prevents against local pull, push\n"
 "  (outbound) or bundle commands, but not effective, since you can\n"
 "  just copy files instead then. Source of operation is in\n"
 "  ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
 "  SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
 "  is happening on behalf of repository on same system."
 msgstr ""
 
 msgid ""
 "``prepushkey``\n"
 "  Run before a pushkey (like a bookmark) is added to the\n"
 "  repository. Non-zero status will cause the key to be rejected. The\n"
 "  key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
 "  the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
 "  ``$HG_NEW``."
 msgstr ""
 
 msgid ""
 "``pretag``\n"
 "  Run before creating a tag. Exit status 0 allows the tag to be\n"
 "  created. Non-zero status will cause the tag to fail. ID of\n"
 "  changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
 "is\n"
 "  local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
 msgstr ""
 
 msgid ""
 "``pretxnchangegroup``\n"
 "  Run after a changegroup has been added via push, pull or unbundle,\n"
 "  but before the transaction has been committed. Changegroup is\n"
 "  visible to hook program. This lets you validate incoming changes\n"
 "  before accepting them. Passed the ID of the first new changeset in\n"
 "  ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
 "  status will cause the transaction to be rolled back and the push,\n"
 "  pull or unbundle will fail. URL that was source of changes is in\n"
 "  ``$HG_URL``."
 msgstr ""
 
 msgid ""
 "``pretxncommit``\n"
 "  Run after a changeset has been created but the transaction not yet\n"
 "  committed. Changeset is visible to hook program. This lets you\n"
 "  validate commit message and changes. Exit status 0 allows the\n"
 "  commit to proceed. Non-zero status will cause the transaction to\n"
 "  be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
 "  IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
 
 msgid ""
 "``preupdate``\n"
 "  Run before updating the working directory. Exit status 0 allows\n"
 "  the update to proceed. Non-zero status will prevent the update.\n"
 "  Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
 "  of second new parent is in ``$HG_PARENT2``."
 msgstr ""
 
 msgid ""
 "``listkeys``\n"
 "  Run after listing pushkeys (like bookmarks) in the repository. The\n"
 "  key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
 "  dictionary containing the keys and values."
 msgstr ""
 
 msgid ""
 "``pushkey``\n"
 "  Run after a pushkey (like a bookmark) is added to the\n"
 "  repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
 "  ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
 "  value is in ``$HG_NEW``."
 msgstr ""
 
 msgid ""
 "``tag``\n"
 "  Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
 "  Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
 "  repository if ``$HG_LOCAL=0``."
 msgstr ""
 
 msgid ""
 "``update``\n"
 "  Run after updating the working directory. Changeset ID of first\n"
 "  new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
 "  in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
 "  update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
 msgstr ""
 
 msgid ""
 ".. note:: It is generally better to use standard hooks rather than the\n"
 "   generic pre- and post- command hooks as they are guaranteed to be\n"
 "   called in the appropriate contexts for influencing transactions.\n"
 "   Also, hooks like \"commit\" will be called in all contexts that\n"
 "   generate a commit (e.g. tag) and not just the commit command."
 msgstr ""
 
 msgid ""
 ".. note:: Environment variables with empty values may not be passed to\n"
 "   hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
 "   will have an empty value under Unix-like platforms for non-merge\n"
 "   changesets, while it will not be available at all under Windows."
 msgstr ""
 
 msgid "The syntax for Python hooks is as follows::"
 msgstr ""
 
 msgid ""
 "  hookname = python:modulename.submodule.callable\n"
 "  hookname = python:/path/to/python/module.py:callable"
 msgstr ""
 
 msgid ""
 "Python hooks are run within the Mercurial process. Each hook is\n"
 "called with at least three keyword arguments: a ui object (keyword\n"
 "``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
 "keyword that tells what kind of hook is used. Arguments listed as\n"
 "environment variables above are passed as keyword arguments, with no\n"
 "``HG_`` prefix, and names in lower case."
 msgstr ""
 
 msgid ""
 "If a Python hook returns a \"true\" value or raises an exception, this\n"
 "is treated as a failure."
 msgstr ""
 
 msgid ""
 "\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Fingerprints of the certificates of known HTTPS servers.\n"
+"A HTTPS connection to a server with a fingerprint configured here will\n"
+"only succeed if the servers certificate matches the fingerprint.\n"
+"This is very similar to how ssh known hosts works.\n"
+"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
+"The CA chain and web.cacerts is not used for servers with a fingerprint."
+msgstr ""
+
+msgid "For example::"
+msgstr "Exempelvis::"
+
+msgid ""
+"    [hostfingerprints]\n"
+"    hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
+"d6:4b:ee:cc"
+msgstr ""
+
+msgid "This feature is only supported when using Python 2.6 or later."
+msgstr ""
+
+msgid ""
+"\n"
 "``http_proxy``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Used to access web-based Mercurial repositories through a HTTP\n"
 "proxy."
 msgstr ""
 
 msgid ""
 "``host``\n"
 "    Host name and (optional) port of the proxy server, for example\n"
 "    \"myproxy:8000\"."
 msgstr ""
 
 msgid ""
 "``no``\n"
 "    Optional. Comma-separated list of host names that should bypass\n"
 "    the proxy."
 msgstr ""
 
 msgid ""
 "``passwd``\n"
 "    Optional. Password to authenticate with at the proxy server."
 msgstr ""
 
 msgid ""
 "``user``\n"
 "    Optional. User name to authenticate with at the proxy server."
 msgstr ""
 
 msgid ""
 "``always``\n"
 "    Optional. Always use the proxy, even for localhost and any entries\n"
 "    in ``http_proxy.no``. True or False. Default: False."
 msgstr ""
 
 msgid ""
-"``smtp``\n"
-"\"\"\"\"\"\"\"\""
-msgstr ""
-
-msgid "Configuration for extensions that need to send email messages."
-msgstr ""
-
-msgid ""
-"``host``\n"
-"    Host name of mail server, e.g. \"mail.example.com\"."
-msgstr ""
-
-msgid ""
-"``port``\n"
-"    Optional. Port to connect to on mail server. Default: 25."
-msgstr ""
-
-msgid ""
-"``tls``\n"
-"    Optional. Method to enable TLS when connecting to mail server: "
-"starttls,\n"
-"    smtps or none. Default: none."
-msgstr ""
-
-msgid ""
-"``username``\n"
-"    Optional. User name for authenticating with the SMTP server.\n"
-"    Default: none."
-msgstr ""
-
-msgid ""
-"``password``\n"
-"    Optional. Password for authenticating with the SMTP server. If not\n"
-"    specified, interactive sessions will prompt the user for a\n"
-"    password; non-interactive sessions will fail. Default: none."
-msgstr ""
-
-msgid ""
-"``local_hostname``\n"
-"    Optional. It's the hostname that the sender can use to identify\n"
-"    itself to the MTA."
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section specifies merge tools to associate with particular file\n"
+"patterns. Tools matched here will take precedence over the default\n"
+"merge tool. Patterns are globs by default, rooted at the repository\n"
+"root."
+msgstr ""
+
+msgid ""
+"  [merge-patterns]\n"
+"  **.c = kdiff3\n"
+"  **.jpg = myimgmerge"
+msgstr ""
+
+msgid ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section configures external merge tools to use for file-level\n"
+"merges."
+msgstr ""
+
+msgid "Example ``~/.hgrc``::"
+msgstr ""
+
+msgid ""
+"  [merge-tools]\n"
+"  # Override stock tool location\n"
+"  kdiff3.executable = ~/bin/kdiff3\n"
+"  # Specify command line\n"
+"  kdiff3.args = $base $local $other -o $output\n"
+"  # Give higher priority\n"
+"  kdiff3.priority = 1"
+msgstr ""
+
+msgid ""
+"  # Define new tool\n"
+"  myHtmlTool.args = -m $local $other $base $output\n"
+"  myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+"  myHtmlTool.priority = 1"
+msgstr ""
+
+msgid ""
+"``priority``\n"
+"  The priority in which to evaluate this tool.\n"
+"  Default: 0."
+msgstr ""
+
+msgid ""
+"``executable``\n"
+"  Either just the name of the executable or its pathname.  On Windows,\n"
+"  the path can use environment variables with ${ProgramFiles} syntax.\n"
+"  Default: the tool name."
+msgstr ""
+
+msgid ""
+"``args``\n"
+"  The arguments to pass to the tool executable. You can refer to the\n"
+"  files being merged as well as the output file through these\n"
+"  variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
+"  Default: ``$local $base $other``"
+msgstr ""
+
+msgid ""
+"``premerge``\n"
+"  Attempt to run internal non-interactive 3-way merge tool before\n"
+"  launching external tool.  Options are ``true``, ``false``, or ``keep``\n"
+"  to leave markers in the file if the premerge fails.\n"
+"  Default: True"
+msgstr ""
+
+msgid ""
+"``binary``\n"
+"  This tool can merge binary files. Defaults to False, unless tool\n"
+"  was selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``symlink``\n"
+"  This tool can merge symlinks. Defaults to False, even if tool was\n"
+"  selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``check``\n"
+"  A list of merge success-checking options:"
+msgstr ""
+
+msgid ""
+"  ``changed``\n"
+"    Ask whether merge was successful when the merged file shows no changes.\n"
+"  ``conflicts``\n"
+"    Check whether there are conflicts even though the tool reported "
+"success.\n"
+"  ``prompt``\n"
+"    Always prompt for merge success, regardless of success reported by tool."
+msgstr ""
+
+msgid ""
+"``checkchanged``\n"
+"  True is equivalent to ``check = changed``.\n"
+"  Default: False"
+msgstr ""
+
+msgid ""
+"``checkconflicts``\n"
+"  True is equivalent to ``check = conflicts``.\n"
+"  Default: False"
+msgstr ""
+
+msgid ""
+"``fixeol``\n"
+"  Attempt to fix up EOL changes caused by the merge tool.\n"
+"  Default: False"
+msgstr ""
+
+msgid ""
+"``gui``\n"
+"  This tool requires a graphical interface to run. Default: False"
+msgstr ""
+
+msgid ""
+"``regkey``\n"
+"  Windows registry key which describes install location of this\n"
+"  tool. Mercurial will search for this key first under\n"
+"  ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
+"  Default: None"
+msgstr ""
+
+msgid ""
+"``regkeyalt``\n"
+"  An alternate Windows registry key to try if the first key is not\n"
+"  found.  The alternate key uses the same ``regname`` and ``regappend``\n"
+"  semantics of the primary key.  The most common use for this key\n"
+"  is to search for 32bit applications on 64bit operating systems.\n"
+"  Default: None"
+msgstr ""
+
+msgid ""
+"``regname``\n"
+"  Name of value to read from specified registry key. Defaults to the\n"
+"  unnamed (default) value."
+msgstr ""
+
+msgid ""
+"``regappend``\n"
+"  String to append to the value read from the registry, typically\n"
+"  the executable name of the tool.\n"
+"  Default: None"
 msgstr ""
 
 msgid ""
 "\n"
 "``patch``\n"
 "\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Settings used when applying patches, for instance through the 'import'\n"
 "command or with Mercurial Queues extension."
 msgstr ""
 
 msgid ""
 "``eol``\n"
 "    When set to 'strict' patch content and patched files end of lines\n"
 "    are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
 "    lines are ignored when patching and the result line endings are\n"
 "    normalized to either LF (Unix) or CRLF (Windows). When set to\n"
 "    ``auto``, end of lines are again ignored while patching but line\n"
 "    endings in patched files are normalized to their original setting\n"
 "    on a per-file basis. If target file does not exist or has no end\n"
 "    of line, patch line endings are preserved.\n"
 "    Default: strict."
 msgstr ""
 
 msgid ""
 "\n"
 "``paths``\n"
 "\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Assigns symbolic names to repositories. The left side is the\n"
 "symbolic name, and the right gives the directory or URL that is the\n"
 "location of the repository. Default paths can be declared by setting\n"
 "the following entries."
 msgstr ""
 
 msgid ""
 "``default``\n"
 "    Directory or URL to use when pulling if no source is specified.\n"
 "    Default is set to repository from which the current repository was\n"
 "    cloned."
 msgstr ""
 
 msgid ""
 "``default-push``\n"
 "    Optional. Directory or URL to use when pushing if no destination\n"
 "    is specified."
 msgstr ""
 
 msgid ""
 "``phases``\n"
 "\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Specifies default handling of phases. See :hg:`help phases` for more\n"
 "information about working with phases."
 msgstr ""
 
 msgid ""
 "``publish``\n"
 "    Controls draft phase behavior when working as a server. When true,\n"
 "    pushed changesets are set to public in both client and server and\n"
 "    pulled or cloned changesets are set to public in the client.\n"
 "    Default: True"
 msgstr ""
 
 msgid ""
 "``new-commit``\n"
 "    Phase of newly-created commits.\n"
 "    Default: draft"
 msgstr ""
 
 msgid ""
 "``profiling``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
-"Specifies profiling format and file output. In this section\n"
-"description, 'profiling data' stands for the raw data collected\n"
-"during profiling, while 'profiling report' stands for a statistical\n"
-"text report generated from the profiling data. The profiling is done\n"
-"using lsprof."
+"Specifies profiling type, format, and file output. Two profilers are\n"
+"supported: an instrumenting profiler (named ``ls``), and a sampling\n"
+"profiler (named ``stat``)."
+msgstr ""
+
+msgid ""
+"In this section description, 'profiling data' stands for the raw data\n"
+"collected during profiling, while 'profiling report' stands for a\n"
+"statistical text report generated from the profiling data. The\n"
+"profiling is done using lsprof."
+msgstr ""
+
+msgid ""
+"``type``\n"
+"    The type of profiler to use.\n"
+"    Default: ls."
+msgstr ""
+
+msgid ""
+"    ``ls``\n"
+"      Use Python's built-in instrumenting profiler. This profiler\n"
+"      works on all platforms, but each line number it reports is the\n"
+"      first line of a function. This restriction makes it difficult to\n"
+"      identify the expensive parts of a non-trivial function.\n"
+"    ``stat``\n"
+"      Use a third-party statistical profiler, statprof. This profiler\n"
+"      currently runs only on Unix systems, and is most useful for\n"
+"      profiling commands that run for longer than about 0.1 seconds."
 msgstr ""
 
 msgid ""
 "``format``\n"
-"    Profiling format.\n"
+"    Profiling format.  Specific to the ``ls`` instrumenting profiler.\n"
 "    Default: text."
 msgstr ""
 
 msgid ""
 "    ``text``\n"
 "      Generate a profiling report. When saving to a file, it should be\n"
 "      noted that only the report is saved, and the profiling data is\n"
 "      not kept.\n"
 "    ``kcachegrind``\n"
 "      Format profiling data for kcachegrind use: when saving to a\n"
 "      file, the generated file can directly be loaded into\n"
 "      kcachegrind."
 msgstr ""
 
 msgid ""
+"``frequency``\n"
+"    Sampling frequency.  Specific to the ``stat`` sampling profiler.\n"
+"    Default: 1000."
+msgstr ""
+
+msgid ""
 "``output``\n"
 "    File path where profiling data or report should be saved. If the\n"
 "    file exists, it is replaced. Default: None, data is printed on\n"
 "    stderr"
 msgstr ""
 
 msgid ""
 "``revsetalias``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
 msgstr ""
 
 msgid ""
 "``server``\n"
 "\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid "Controls generic server settings."
 msgstr ""
 
 msgid ""
 "``uncompressed``\n"
 "    Whether to allow clients to clone a repository using the\n"
 "    uncompressed streaming protocol. This transfers about 40% more\n"
 "    data than a regular clone, but uses less memory and CPU on both\n"
 "    server and client. Over a LAN (100 Mbps or better) or a very fast\n"
 "    WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
 "    regular clone. Over most WAN connections (anything slower than\n"
 "    about 6 Mbps), uncompressed streaming is slower, because of the\n"
 "    extra data transfer overhead. This mode will also temporarily hold\n"
 "    the write lock while determining what data to transfer.\n"
 "    Default is True."
 msgstr ""
 
 msgid ""
+"``preferuncompressed``\n"
+"    When set, clients will try to use the uncompressed streaming\n"
+"    protocol. Default is False."
+msgstr ""
+
+msgid ""
 "``validate``\n"
 "    Whether to validate the completeness of pushed changesets by\n"
 "    checking that all new file revisions specified in manifests are\n"
 "    present. Default is False."
 msgstr ""
 
 msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Configuration for extensions that need to send email messages."
+msgstr ""
+
+msgid ""
+"``host``\n"
+"    Host name of mail server, e.g. \"mail.example.com\"."
+msgstr ""
+
+msgid ""
+"``port``\n"
+"    Optional. Port to connect to on mail server. Default: 25."
+msgstr ""
+
+msgid ""
+"``tls``\n"
+"    Optional. Method to enable TLS when connecting to mail server: "
+"starttls,\n"
+"    smtps or none. Default: none."
+msgstr ""
+
+msgid ""
+"``username``\n"
+"    Optional. User name for authenticating with the SMTP server.\n"
+"    Default: none."
+msgstr ""
+
+msgid ""
+"``password``\n"
+"    Optional. Password for authenticating with the SMTP server. If not\n"
+"    specified, interactive sessions will prompt the user for a\n"
+"    password; non-interactive sessions will fail. Default: none."
+msgstr ""
+
+msgid ""
+"``local_hostname``\n"
+"    Optional. It's the hostname that the sender can use to identify\n"
+"    itself to the MTA."
+msgstr ""
+
+msgid ""
+"\n"
 "``subpaths``\n"
 "\"\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
-msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgid ""
+"Subrepository source URLs can go stale if a remote server changes name\n"
+"or becomes temporarily unavailable. This section lets you define\n"
+"rewrite rules of the form::"
 msgstr ""
 
 msgid "    <pattern> = <replacement>"
 msgstr ""
 
 msgid ""
-"Where ``pattern`` is a regular expression matching the source and\n"
-"``replacement`` is the replacement string used to rewrite it. Groups\n"
-"can be matched in ``pattern`` and referenced in ``replacements``. For\n"
-"instance::"
+"where ``pattern`` is a regular expression matching a subrepository\n"
+"source URL and ``replacement`` is the replacement string used to\n"
+"rewrite it. Groups can be matched in ``pattern`` and referenced in\n"
+"``replacements``. For instance::"
 msgstr ""
 
 msgid "    http://server/(.*)-hg/ = http://hg.server/\\1/"
 msgstr ""
 
 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
 msgstr ""
 
-msgid "All patterns are applied in definition order."
+msgid ""
+"Relative subrepository paths are first made absolute, and the the\n"
+"rewrite rules are then applied on the full (absolute) path. The rules\n"
+"are applied in definition order."
 msgstr ""
 
 msgid ""
 "``trusted``\n"
 "\"\"\"\"\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Mercurial will not use the settings in the\n"
 "``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
 "user or to a trusted group, as various hgrc features allow arbitrary\n"
 "commands to be run. This issue is often encountered when configuring\n"
 "hooks or extensions for shared repositories or servers. However,\n"
 "the web interface will use some safe settings from the ``[web]``\n"
 "section."
 msgstr ""
 
 msgid ""
 "This section specifies what users and groups are trusted. The\n"
 "current user is always trusted. To trust everybody, list a user or a\n"
 "group with name ``*``. These settings must be placed in an\n"
 "*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
 "user or service running Mercurial."
 msgstr ""
 
 msgid ""
 "``users``\n"
 "  Comma-separated list of trusted users."
 msgstr ""
 
 msgid ""
 "``groups``\n"
 "  Comma-separated list of trusted groups."
 msgstr ""
 
 msgid ""
 "\n"
 "``ui``\n"
 "\"\"\"\"\"\""
 msgstr ""
 
 msgid "User interface controls."
 msgstr ""
 
 msgid ""
 "``archivemeta``\n"
 "    Whether to include the .hg_archival.txt file containing meta data\n"
 "    (hashes for the repository base and for tip) in archives created\n"
 "    by the :hg:`archive` command or downloaded via hgweb.\n"
 "    Default is True."
 msgstr ""
 
 msgid ""
 "``askusername``\n"
 "    Whether to prompt for a username when committing. If True, and\n"
 "    neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user "
 "will\n"
 "    be prompted to enter a username. If no username is entered, the\n"
 "    default ``USER@HOST`` is used instead.\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``commitsubrepos``\n"
 "    Whether to commit modified subrepositories when committing the\n"
 "    parent repository. If False and one subrepository has uncommitted\n"
 "    changes, abort the commit.\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``debug``\n"
 "    Print debugging information. True or False. Default is False."
 msgstr ""
 
 msgid ""
 "``editor``\n"
 "    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
 msgstr ""
 
 msgid ""
 "``fallbackencoding``\n"
 "    Encoding to try if it's not possible to decode the changelog using\n"
 "    UTF-8. Default is ISO-8859-1."
 msgstr ""
 
 msgid ""
 "``ignore``\n"
 "    A file to read per-user ignore patterns from. This file should be\n"
 "    in the same format as a repository-wide .hgignore file. This\n"
 "    option supports hook syntax, so if you want to specify multiple\n"
 "    ignore files, you can do so by setting something like\n"
 "    ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
 "    format, see the ``hgignore(5)`` man page."
 msgstr ""
 
 msgid ""
 "``interactive``\n"
 "    Allow to prompt the user. True or False. Default is True."
 msgstr ""
 
 msgid ""
 "``logtemplate``\n"
 "    Template string for commands that print changesets."
 msgstr ""
 
 msgid ""
 "``merge``\n"
 "    The conflict resolution program to use during a manual merge.\n"
 "    For more information on merge tools see :hg:`help merge-tools`.\n"
 "    For configuring merge tools see the ``[merge-tools]`` section."
 msgstr ""
 
 msgid ""
 "``portablefilenames``\n"
 "    Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
 "    Default is ``warn``.\n"
 "    If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
 "    platforms, if a file with a non-portable filename is added (e.g. a file\n"
 "    with a name that can't be created on Windows because it contains "
 "reserved\n"
 "    parts like ``AUX``, reserved characters like ``:``, or would cause a "
 "case\n"
 "    collision with an existing file).\n"
 "    If set to ``ignore`` (or ``false``), no warning is printed.\n"
 "    If set to ``abort``, the command is aborted.\n"
 "    On Windows, this configuration option is ignored and the command aborted."
 msgstr ""
 
 msgid ""
 "``quiet``\n"
 "    Reduce the amount of output printed. True or False. Default is False."
 msgstr ""
 
 msgid ""
 "``remotecmd``\n"
 "    remote command to use for clone/push/pull operations. Default is ``hg``."
 msgstr ""
 
 msgid ""
+"``reportoldssl``\n"
+"    Warn if an SSL certificate is unable to be due to using Python\n"
+"    2.5 or earlier. True or False. Default is True."
+msgstr ""
+
+msgid ""
 "``report_untrusted``\n"
 "    Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
 "    trusted user or group. True or False. Default is True."
 msgstr ""
 
 msgid ""
 "``slash``\n"
 "    Display paths using a slash (``/``) as the path separator. This\n"
 "    only makes a difference on systems where the default path\n"
 "    separator is not the slash character (e.g. Windows uses the\n"
 "    backslash character (``\\``)).\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``ssh``\n"
 "    command to use for SSH connections. Default is ``ssh``."
 msgstr ""
 
 msgid ""
 "``strict``\n"
 "    Require exact command names, instead of allowing unambiguous\n"
 "    abbreviations. True or False. Default is False."
 msgstr ""
 
 msgid ""
 "``style``\n"
 "    Name of style to use for command output."
 msgstr ""
 
 msgid ""
 "``timeout``\n"
 "    The timeout used when a lock is held (in seconds), a negative value\n"
 "    means no timeout. Default is 600."
 msgstr ""
 
 msgid ""
 "``traceback``\n"
 "    Mercurial always prints a traceback when an unknown exception\n"
 "    occurs. Setting this to True will make Mercurial print a traceback\n"
 "    on all exceptions, even those recognized by Mercurial (such as\n"
 "    IOError or MemoryError). Default is False."
 msgstr ""
 
 msgid ""
 "``username``\n"
 "    The committer of a changeset created when running \"commit\".\n"
 "    Typically a person's name and email address, e.g. ``Fred Widget\n"
 "    <[e-mail]>``. Default is ``$EMAIL`` or ``username@hostname``. "
 "If\n"
 "    the username in hgrc is empty, it has to be specified manually or\n"
 "    in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
 "    ``username =``  in the system hgrc). Environment variables in the\n"
 "    username are expanded."
 msgstr ""
 
 msgid ""
 "``verbose``\n"
 "    Increase the amount of output printed. True or False. Default is False."
 msgstr ""
 
 msgid ""
 "\n"
 "``web``\n"
 "\"\"\"\"\"\"\""
 msgstr ""
 
 msgid ""
 "Web interface configuration. The settings in this section apply to\n"
 "both the builtin webserver (started by :hg:`serve`) and the script you\n"
 "run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
 "and WSGI)."
 msgstr ""
 
 msgid ""
 "The Mercurial webserver does no authentication (it does not prompt for\n"
 "usernames and passwords to validate *who* users are), but it does do\n"
 "authorization (it grants or denies access for *authenticated users*\n"
 "based on settings in this section). You must either configure your\n"
 "webserver to do authentication for you, or disable the authorization\n"
 "checks."
 msgstr ""
 
 msgid ""
 "For a quick setup in a trusted environment, e.g., a private LAN, where\n"
 "you want it to accept pushes from anybody, you can use the following\n"
 "command line::"
 msgstr ""
 
 msgid "    $ hg --config web.allow_push=* --config web.push_ssl=False serve"
 msgstr ""
 
 msgid ""
 "Note that this will allow anybody to push anything to the server and\n"
 "that this should not be used for public servers."
 msgstr ""
 
 msgid "The full set of options is:"
 msgstr "Fullständig inställningslista:"
 
 msgid ""
 "``accesslog``\n"
 "    Where to output the access log. Default is stdout."
 msgstr ""
 
 msgid ""
 "``address``\n"
 "    Interface address to bind to. Default is all."
 msgstr ""
 
 msgid ""
 "``allow_archive``\n"
 "    List of archive format (bz2, gz, zip) allowed for downloading.\n"
 "    Default is empty."
 msgstr ""
 
 msgid ""
 "``allowbz2``\n"
 "    (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
 "    revisions.\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``allowgz``\n"
 "    (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
 "    revisions.\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``allowpull``\n"
 "    Whether to allow pulling from the repository. Default is True."
 msgstr ""
 
 msgid ""
 "``allow_push``\n"
 "    Whether to allow pushing to the repository. If empty or not set,\n"
 "    push is not allowed. If the special value ``*``, any remote user can\n"
 "    push, including unauthenticated users. Otherwise, the remote user\n"
 "    must have been authenticated, and the authenticated user name must\n"
 "    be present in this list. The contents of the allow_push list are\n"
 "    examined after the deny_push list."
 msgstr ""
 
 msgid ""
 "``guessmime``\n"
 "    Control MIME types for raw download of file content.\n"
 "    Set to True to let hgweb guess the content type from the file\n"
 "    extension. This will serve HTML files as ``text/html`` and might\n"
 "    allow cross-site scripting attacks when serving untrusted\n"
 "    repositories. Default is False."
 msgstr ""
 
 msgid ""
 "``allow_read``\n"
 "    If the user has not already been denied repository access due to\n"
 "    the contents of deny_read, this list determines whether to grant\n"
 "    repository access to the user. If this list is not empty, and the\n"
 "    user is unauthenticated or not present in the list, then access is\n"
 "    denied for the user. If the list is empty or not set, then access\n"
 "    is permitted to all users by default. Setting allow_read to the\n"
 "    special value ``*`` is equivalent to it not being set (i.e. access\n"
 "    is permitted to all users). The contents of the allow_read list are\n"
 "    examined after the deny_read list."
 msgstr ""
 
 msgid ""
 "``allowzip``\n"
 "    (DEPRECATED) Whether to allow .zip downloading of repository\n"
 "    revisions. Default is False. This feature creates temporary files."
 msgstr ""
 
 msgid ""
 "``baseurl``\n"
 "    Base URL to use when publishing URLs in other locations, so\n"
 "    third-party tools like email notification hooks can construct\n"
 "    URLs. Example: ``http://hgserver/repos/``."
 msgstr ""
 
 msgid ""
 "``cacerts``\n"
 "    Path to file containing a list of PEM encoded certificate\n"
 "    authority certificates. Environment variables and ``~user``\n"
 "    constructs are expanded in the filename. If specified on the\n"
 "    client, then it will verify the identity of remote HTTPS servers\n"
-"    with these certificates. The form must be as follows::"
+"    with these certificates."
+msgstr ""
+
+msgid ""
+"    This feature is only supported when using Python 2.6 or later. If you "
+"wish\n"
+"    to use it with earlier versions of Python, install the backported\n"
+"    version of the ssl library that is available from\n"
+"    ``http://pypi.python.org``."
+msgstr ""
+
+msgid ""
+"    To disable SSL verification temporarily, specify ``--insecure`` from\n"
+"    command line."
+msgstr ""
+
+msgid ""
+"    You can use OpenSSL's CA certificate file if your platform has\n"
+"    one. On most Linux systems this will be\n"
+"    ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to\n"
+"    generate this file manually. The form must be as follows::"
 msgstr ""
 
 msgid ""
 "        -----BEGIN CERTIFICATE-----\n"
 "        ... (certificate in base64 PEM encoding) ...\n"
 "        -----END CERTIFICATE-----\n"
 "        -----BEGIN CERTIFICATE-----\n"
 "        ... (certificate in base64 PEM encoding) ...\n"
 "        -----END CERTIFICATE-----"
 msgstr ""
 
 msgid ""
-"    This feature is only supported when using Python 2.6 or later. If you "
-"wish\n"
-"    to use it with earlier versions of Python, install the backported\n"
-"    version of the ssl library that is available from\n"
-"    ``http://pypi.python.org``."
-msgstr ""
-
-msgid ""
-"    You can use OpenSSL's CA certificate file if your platform has one.\n"
-"    On most Linux systems this will be ``/etc/ssl/certs/ca-certificates."
-"crt``.\n"
-"    Otherwise you will have to generate this file manually."
-msgstr ""
-
-msgid ""
-"    To disable SSL verification temporarily, specify ``--insecure`` from\n"
-"    command line."
-msgstr ""
-
-msgid ""
 "``cache``\n"
 "    Whether to support caching in hgweb. Defaults to True."
 msgstr ""
 
 msgid ""
+"``collapse``\n"
+"    With ``descend`` enabled, repositories in subdirectories are shown at\n"
+"    a single level alongside repositories in the current path. With\n"
+"    ``collapse`` also enabled, repositories residing at a deeper level than\n"
+"    the current path are grouped behind navigable directory entries that\n"
+"    lead to the locations of these repositories. In effect, this setting\n"
+"    collapses each collection of repositories found within a subdirectory\n"
+"    into a single entry for that subdirectory. Default is False."
+msgstr ""
+
+msgid ""
 "``contact``\n"
 "    Name or email address of the person in charge of the repository.\n"
 "    Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
 msgstr ""
 
 msgid ""
 "``deny_push``\n"
 "    Whether to deny pushing to the repository. If empty or not set,\n"
 "    push is not denied. If the special value ``*``, all remote users are\n"
 "    denied push. Otherwise, unauthenticated users are all denied, and\n"
 "    any authenticated user name present in this list is also denied. The\n"
 "    contents of the deny_push list are examined before the allow_push list."
 msgstr ""
 
 msgid ""
 "``deny_read``\n"
 "    Whether to deny reading/viewing of the repository. If this list is\n"
 "    not empty, unauthenticated users are all denied, and any\n"
 "    authenticated user name present in this list is also denied access to\n"
 "    the repository. If set to the special value ``*``, all remote users\n"
 "    are denied access (rarely needed ;). If deny_read is empty or not set,\n"
 "    the determination of repository access depends on the presence and\n"
 "    content of the allow_read list (see description). If both\n"
 "    deny_read and allow_read are empty or not set, then access is\n"
 "    permitted to all users by default. If the repository is being\n"
 "    served via hgwebdir, denied users will not be able to see it in\n"
 "    the list of repositories. The contents of the deny_read list have\n"
 "    priority over (are examined before) the contents of the allow_read\n"
 "    list."
 msgstr ""
 
 msgid ""
 "``descend``\n"
 "    hgwebdir indexes will not descend into subdirectories. Only "
 "repositories\n"
 "    directly in the current path will be shown (other repositories are "
 "still\n"
 "    available from the index corresponding to their containing path)."
 msgstr ""
 
 msgid ""
 "``description``\n"
 "    Textual description of the repository's purpose or contents.\n"
 "    Default is \"unknown\"."
 msgstr ""
 
 msgid ""
 "``encoding``\n"
 "    Character encoding name. Default is the current locale charset.\n"
 "    Example: \"UTF-8\""
 msgstr ""
 
 msgid ""
 "``errorlog``\n"
 "    Where to output the error log. Default is stderr."
 msgstr ""
 
 msgid ""
+"``comparisoncontext``\n"
+"    Number of lines of context to show in side-by-side file comparison. If\n"
+"    negative or the value ``full``, whole files are shown. Default is 5.\n"
+"    This setting can be overridden by a ``context`` request parameter to "
+"the\n"
+"    ``comparison`` command, taking the same values."
+msgstr ""
+
+msgid ""
 "``hidden``\n"
 "    Whether to hide the repository in the hgwebdir index.\n"
 "    Default is False."
 msgstr ""
 
 msgid ""
 "``ipv6``\n"
 "    Whether to use IPv6. Default is False."
 msgstr ""
 
 msgid ""
 "``logoimg``\n"
 "    File name of the logo image that some templates display on each page.\n"
 "    The file name is relative to ``staticurl``. That is, the full path to\n"
 "    the logo image is \"staticurl/logoimg\".\n"
 "    If unset, ``hglogo.png`` will be used."
 msgstr ""
 
 msgid ""
 "``logourl``\n"
 "    Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
 "    will be used."
 msgstr ""
 
 msgid ""
 "``name``\n"
 "    Repository name to use in the web interface. Default is current\n"
 "    working directory."
 msgstr ""
 
 msgid ""
 "``maxchanges``\n"
 "    Maximum number of changes to list on the changelog. Default is 10."
 msgstr ""
 
 msgid ""
 "``maxfiles``\n"
 "    Maximum number of files to list per changeset. Default is 10."
 msgstr ""
 
 msgid ""
 "``port``\n"
 "    Port to listen on. Default is 8000."
 msgstr ""
 "``port``\n"
 "Port att lyssna på. Standard är 8000."
 
 msgid ""
 "``prefix``\n"
 "    Prefix path to serve from. Default is '' (server root)."
 msgstr ""
 "``prefix``\n"
 "Sökvägsprefix att dela ut från. Standard är '' (serverrot)."
 
 msgid ""
 "``push_ssl``\n"
 "    Whether to require that inbound pushes be transported over SSL to\n"
 "    prevent password sniffing. Default is True."
 msgstr ""
 
 msgid ""
 "``staticurl``\n"
 "    Base URL to use for static files. If unset, static files (e.g. the\n"
 "    hgicon.png favicon) will be served by the CGI script itself. Use\n"
 "    this setting to serve them directly with the HTTP server.\n"
 "    Example: ``http://hgserver/static/``."
 msgstr ""
 
 msgid ""
 "``stripes``\n"
 "    How many lines a \"zebra stripe\" should span in multiline output.\n"
 "    Default is 1; set to 0 to disable."
 msgstr ""
 
 msgid ""
 "``style``\n"
 "    Which template map style to use."
 msgstr ""
 "``style``\n"
 "    Mallstil att använda."
 
 msgid ""
 "``templates``\n"
 "    Where to find the HTML templates. Default is install path.\n"
 msgstr ""
 
 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. The first number\n"
 "is the number of seconds since the epoch (1970-01-01 00:00 UTC). The\n"
 "second is the offset of the local timezone, in seconds west of UTC\n"
 "(negative if the timezone is east of UTC)."
 msgstr ""
 "Detta är det interna representationsformatet för datum. Det första numret\n"
 "är antalet sekunder sedan epoken(1970-01-01 00:00 UTC). Det andra är\n"
 "offseten för den lokala tidszonen, i sekunder väst om UTC (negativ om\n"
 "tidszonen är öst om UTC)."
 
 msgid "The log command also accepts date ranges:"
 msgstr "Kommandot log accepterar också datumintervall:"
 
 msgid ""
 "- ``<DATE`` - at or before a given date/time\n"
 "- ``>DATE`` - on or after a given date/time\n"
 "- ``DATE to DATE`` - a date range, inclusive\n"
 "- ``-DAYS`` - within a given number of days of today\n"
 msgstr ""
 "- ``<DATUM`` - på eller innan datum/tid\n"
 "- ``>DATUM`` - på eller efter datum/tid\n"
 "- ``DATUM to DATUM`` - 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 ""
 "HGPLAINEXCEPT\n"
 "    This is a comma-separated list of features to preserve when\n"
 "    HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
 "    which preserves internationalization in plain mode."
 msgstr ""
 
 msgid ""
 "    Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
 "    enable plain mode."
 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 ""
 "Mercurial supports a functional language for selecting a set of\n"
 "files. "
 msgstr ""
 "Mercurial stöder ett funktionellt språk för att välja en uppsättning filer. "
 
 msgid ""
 "Like other file patterns, this pattern type is indicated by a prefix,\n"
 "'set:'. The language supports a number of predicates which are joined\n"
 "by infix operators. Parenthesis can be used for grouping."
 msgstr ""
 
 msgid ""
 "Identifiers such as filenames or patterns must be quoted with single\n"
 "or double quotes if they contain characters outside of\n"
 "``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
 "predefined predicates. This generally applies to file patterns other\n"
 "than globs and arguments for 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"
 "  Files not in x. Short form is ``! x``."
 msgstr ""
 
 msgid "These are the supported infix operators:"
 msgstr ""
 
 msgid ""
 "``x and y``\n"
 "  The intersection of files in x and y. Short form is ``x & y``."
 msgstr ""
 
 msgid ""
 "``x or y``\n"
 "  The union of files in x and y. There are two alternative short\n"
 "  forms: ``x | y`` and ``x + y``."
 msgstr ""
 
 msgid ""
 "``x - y``\n"
 "  Files in x but not in y."
 msgstr ""
 
 msgid "The following predicates are supported:"
 msgstr ""
 
 msgid ".. predicatesmarker"
 msgstr ""
 
 msgid "Some sample queries:"
 msgstr ""
 
 msgid ""
 "- Show status of files that appear to be binary in the working directory::"
 msgstr ""
 
 msgid "    hg status -A \"set:binary()\""
 msgstr ""
 
 msgid "- Forget files that are in .hgignore but are already tracked::"
 msgstr ""
 
 msgid "    hg forget \"set:hgignore() and not ignored()\""
 msgstr ""
 
 msgid "- Find text files that contain a string::"
 msgstr ""
 
 msgid "    hg locate \"set:grep(magic) and not binary()\""
 msgstr ""
 
 msgid "- Find C files in a non-standard encoding::"
 msgstr ""
 
 msgid "    hg locate \"set:**.c and not encoding('UTF-8')\""
 msgstr ""
 
 msgid "- Revert copies of large binary files::"
 msgstr ""
 
 msgid "    hg revert \"set:copied() and binary() and size('>1M')\""
 msgstr ""
 
 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
 msgstr ""
 
 msgid "    hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
 msgstr ""
 
 msgid "See also :hg:`help patterns`.\n"
 msgstr ""
 
 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 ""
 "Bookmark\n"
 "    Bookmarks are pointers to certain commits that move when\n"
 "    committing. They are similar to tags in that it is possible to use\n"
 "    bookmark names in all places where Mercurial expects a changeset\n"
 "    ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
 "    when you make a commit."
 msgstr ""
 "    Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
 "    arkivering. De liknar märken på det sättet att du kan använda\n"
 "    bokmärkesnamn på alla platser där Mercurial förväntar sig ett\n"
 "    ändrings-ID, exexempelvis med :hg:`update`. Till skillnad från märken,\n"
 "    så förflyttas bokmärken när du arkiverar."
 
 msgid ""
 "    Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
 "    unless they are explicitly pushed or pulled between repositories.\n"
 "    Pushing and pulling bookmarks allow you to collaborate with others\n"
 "    on a branch without creating a named branch."
 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'."
+"    See 'Head, closed branch'"
 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 ""
+"Draft\n"
+"    Changesets in the draft phase have not been shared with publishing\n"
+"    repositories and may thus be safely changed by history-modifying\n"
+"    extensions. See :hg:`help phases`."
+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 ""
+"    Closed heads can be re-opened by committing new changeset as the\n"
+"    child of the changeset that marks a head as closed."
+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 ""
+"Phase\n"
+"    A per-changeset state tracking how the changeset has been or\n"
+"    should be shared. See :hg:`help phases`."
+msgstr ""
+
+msgid ""
+"Public\n"
+"    Changesets in the public phase have been shared with publishing\n"
+"    repositories and are therefore considered immutable. See :hg:`help\n"
+"    phases`."
+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 ""
+"Secret\n"
+"    Changesets in the secret phase may not be shared via push, pull,\n"
+"    or clone. See :hg:`help phases`."
+msgstr ""
+
+msgid ""
 "Tag\n"
 "    An alternative name given to a changeset. Tags can be used in all\n"
 "    places where Mercurial expects a changeset ID, e.g., with\n"
 "    :hg:`update`. The creation of a tag is stored in the history and\n"
 "    will thus automatically be shared with other using push and pull."
 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 ""
 "Synopsis\n"
 "--------"
 msgstr ""
 
 msgid ""
 "The Mercurial system uses a file called ``.hgignore`` in the root\n"
 "directory of a repository to control its behavior when it searches\n"
 "for files that it is not currently tracking."
 msgstr ""
 
 msgid ""
 "Description\n"
 "-----------"
 msgstr ""
 "Beskrivning\n"
 "-----------"
 
 msgid ""
 "The working directory of a Mercurial repository will often contain\n"
 "files that should not be tracked by Mercurial. These include backup\n"
 "files created by editors and build products created by compilers.\n"
 "These files can be ignored by listing them in a ``.hgignore`` file in\n"
 "the root of the working directory. The ``.hgignore`` file must be\n"
 "created manually. It is typically put under version control, so that\n"
 "the settings will propagate to other repositories with push and pull."
 msgstr ""
 
 msgid ""
 "An untracked file is ignored if its path relative to the repository\n"
 "root directory, or any prefix path of that path, is matched against\n"
 "any pattern in ``.hgignore``."
 msgstr ""
 
 msgid ""
 "For example, say we have an untracked file, ``file.c``, at\n"
 "``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
 "if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
 msgstr ""
 
 msgid ""
 "In addition, a Mercurial configuration file can reference a set of\n"
 "per-user or global ignore files. See the ``ignore`` configuration\n"
 "key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
 "configure these files."
 msgstr ""
 
 msgid ""
 "To control Mercurial's handling of files that it manages, many\n"
 "commands support the ``-I`` and ``-X`` options; see\n"
 ":hg:`help <command>` and :hg:`help patterns` for details."
 msgstr ""
 
 msgid ""
+"Files that are already tracked are not affected by .hgignore, even\n"
+"if they appear in .hgignore. An untracked file X can be explicitly\n"
+"added with :hg:`add X`, even if X would be excluded by a pattern\n"
+"in .hgignore."
+msgstr ""
+
+msgid ""
 "An ignore file is a plain text file consisting of a list of patterns,\n"
 "with one pattern per line. Empty lines are skipped. The ``#``\n"
 "character is treated as a comment character, and the ``\\`` character\n"
 "is treated as an escape character."
 msgstr ""
 
 msgid ""
 "Mercurial supports several pattern syntaxes. The default syntax used\n"
 "is Python/Perl-style regular expressions."
 msgstr ""
 
 msgid "To change the syntax used, use a line of the following form::"
 msgstr ""
 
 msgid "  syntax: NAME"
 msgstr ""
 
 msgid "where ``NAME`` is one of the following:"
 msgstr ""
 
 msgid ""
 "``regexp``\n"
 "  Regular expression, Python/Perl syntax.\n"
 "``glob``\n"
 "  Shell-style glob."
 msgstr ""
 
 msgid ""
 "The chosen syntax stays in effect when parsing all patterns that\n"
 "follow, until another syntax is selected."
 msgstr ""
 
 msgid ""
 "Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
 "the form ``*.c`` will match a file ending in ``.c`` in any directory,\n"
 "and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
 "regexp pattern, start it with ``^``."
 msgstr ""
 
 msgid ""
+".. note::\n"
+"  Patterns specified in other than ``.hgignore`` are always rooted.\n"
+"  Please see :hg:`help patterns` for details."
+msgstr ""
+
+msgid ""
 "Example\n"
 "-------"
 msgstr ""
 
 msgid "Here is an example ignore file. ::"
 msgstr ""
 
 msgid ""
 "  # use glob syntax.\n"
 "  syntax: glob"
 msgstr ""
 
 msgid ""
 "  *.elc\n"
 "  *.pyc\n"
 "  *~"
 msgstr ""
 
 msgid ""
 "  # switch to regexp syntax.\n"
 "  syntax: regexp\n"
 "  ^\\.pc/\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."
+"repository, or a tree of repositories. In the second case, repository\n"
+"paths and global options can be defined using a dedicated\n"
+"configuration file common to :hg:`serve`, ``hgweb.wsgi``,\n"
+"``hgweb.cgi`` and ``hgweb.fcgi``."
 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 other Mercurial configuration files,\n"
-"but only the following sections are recognized:"
+"en trädstruktur med arkiv. I det andra fallet kan arkivsökvägar och\n"
+"globala flaggor definieras med en dedikerad konfigurationsfil som delas\n"
+"av :hg:`serve`, ``hgweb.wsgi``, ``hgweb.cgi`` och ``hgweb.fcgi``."
+
+msgid ""
+"This file uses the same syntax as other Mercurial configuration files\n"
+"but recognizes only the following sections:"
 msgstr ""
 "Denna fil använder samma syntax som Mercurials övriga konfigurationsfiler,\n"
-"men bara de följande sektionerna används:"
+"men använder bara de följande sektionerna:"
 
 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(5) documentation. See :hg:`help config` for\n"
-"information on where to find the manual page."
-msgstr ""
-"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n"
-"i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n"
-"manualsidan hittas."
-
-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 "The ``web`` options are thorougly described in :hg:`help config`."
+msgstr "Flaggorna för ``web`` finns utförligt beskrivna i :hg:`help config`."
+
+msgid ""
+"The ``paths`` section maps URL paths to paths of repositories in the\n"
+"filesystem. hgweb will not expose the filesystem directly - only\n"
+"Mercurial repositories can be published and only according to the\n"
+"configuration."
+msgstr ""
+"Sektionen ``paths`` matchar URL-sökvägar till arkivsökvägar i filsystemet.\n"
+"hgweb kommer inte att exponera filsystemet direkt - bara Mercurial-arkiv\n"
+"kan publiceras och bara som konfigurationen medger."
+
+msgid ""
+"The left hand side is the path in the URL. Note that hgweb reserves\n"
+"subpaths like ``rev`` or ``file``, try using different names for\n"
+"nested repositories to avoid confusing effects."
+msgstr ""
+"Den vänstra sidan är sökvägen i URL:en. Notera att hgweb reserverar\n"
+"undersökvägar som ``rev`` eller ``file``, försök att anvädna andra namn\n"
+"för nästlade arkiv för att undvika förbryllande fenomen."
+
+msgid ""
+"The right hand side is the path in the filesystem. If the specified\n"
+"path ends with ``*`` or ``**`` the filesystem will be searched\n"
+"recursively for repositories below that point.\n"
+"With ``*`` it will not recurse into the repositories it finds (except for\n"
+"``.hg/patches``).\n"
+"With ``**`` it will also search inside repository working directories\n"
+"and possibly find subrepositories."
+msgstr ""
+"Den högra sidan är sökvägen i filsystemet. Om den angivna sökvägen slutar\n"
+"med ``*`` eller ``**`` så kommer filsystemet att genomsökas rekursivt\n"
+"efter arkiv från den punkten.\n"
+"Med ``*`` så kommer sökningen inte att fortsätta in i funna arkiv (med\n"
+"undantag för ``.hg/patches``).\n"
+"Med ``**`` så kommer sökningen att fortsätta i arkivets arbetskopia och\n"
+"möjligen hitta underarkiv."
+
+msgid "In this example::"
+msgstr "I det här exemplet::"
 
 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/**"
+"  /projects/a = /srv/tmprepos/a\n"
+"  /projects/b = c:/repos/b\n"
+"  / = /srv/repos/*\n"
+"  /user/bob = /home/bob/repos/**"
 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/**"
+"  /projects/a = /srv/tmprepos/a\n"
+"  /projects/b = c:/repos/b\n"
+"  / = /srv/repos/*\n"
+"  /user/bob = /home/bob/repos/**"
 
 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"
+"- The third entry will publish every Mercurial repository found in\n"
+"  ``/srv/repos/``, for instance the repository ``/srv/repos/quux/``\n"
+"  will appear as ``http://server/quux/``\n"
+"- The fourth entry will publish both ``http://server/user/bob/quux/``\n"
+"  and ``http://server/user/bob/quux/testsubrepo/``"
+msgstr ""
+"- De första två posterna gör att två arkiv i olika kataloger dyker upp\n"
+"  under samma katalog i webbgränssnittet\n"
+"- Den tredje posten publicerar alla Mercurial-arkiv som hittas i\n"
+"  ``/srv/repos/``, exempelvis kommer arkivet ``/srv/repos/quux/``\n"
+"  att dyka upp som ``http://server/quux/``\n"
+"- Den fjärde posten publicerar både ``http://server/user/bob/quux/``\n"
+"  och ``http://server/user/bob/quux/testsubrepo/``"
+
+msgid ""
+"The ``collections`` section is deprecated and has been superseeded by\n"
+"``paths``.\n"
+msgstr "Sektionen ``collections`` är föråldrad och har ersatts av ``paths``.\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``."
+msgid ".. internaltoolsmarker"
 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 ""
+".. note::\n"
+"  Patterns specified in ``.hgignore`` are not rooted. \n"
+"  Please see :hg:`help hgignore` for details."
+msgstr ""
+
+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 ""
 "To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n"
 "The latter expects null delimited patterns while the former expects line\n"
 "feeds. Each string read from the file is itself treated as a file\n"
 "pattern."
 msgstr ""
 
 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"
 msgstr ""
 "  re:.*\\.c$      alla namn som slutar med \".c\", var som helst i arkivet"
 
 msgid "File examples::"
 msgstr "Filexempel::"
 
 msgid ""
 "  listfile:list.txt  read list from list.txt with one file pattern per line\n"
 "  listfile0:list.txt read list from list.txt with null byte delimiters"
 msgstr ""
 
 msgid "See also :hg:`help filesets`.\n"
 msgstr ""
 
 msgid ""
 "What are phases?\n"
 "----------------"
 msgstr ""
 
 msgid ""
 "Phases are a system for tracking which changesets have been or should\n"
 "be shared. This helps prevent common mistakes when modifying history\n"
 "(for instance, with the mq or rebase extensions)."
 msgstr ""
 
 msgid "Each changeset in a repository is in one of the following phases:"
 msgstr ""
 
 msgid ""
 " - public : changeset is visible on a public server\n"
 " - draft : changeset is not yet published\n"
 " - secret : changeset should not be pushed, pulled, or cloned"
 msgstr ""
 
 msgid ""
 "These phases are ordered (public < draft < secret) and no changeset\n"
 "can be in a lower phase than its ancestors. For instance, if a\n"
 "changeset is public, all its ancestors are also public. Lastly,\n"
-"changeset phases only be changed towards the public phase."
+"changeset phases should only be changed towards the public phase."
 msgstr ""
 
 msgid ""
 "How are phases managed?\n"
 "-----------------------"
 msgstr ""
 
 msgid ""
 "For the most part, phases should work transparently. By default, a\n"
 "changeset is created in the draft phase and is moved into the public\n"
 "phase when it is pushed to another repository."
 msgstr ""
 
 msgid ""
 "Once changesets become public, extensions like mq and rebase will\n"
 "refuse to operate on them to prevent creating duplicate changesets.\n"
 "Phases can also be manually manipulated with the :hg:`phase` command\n"
 "if needed. See :hg:`help -v phase` for examples."
 msgstr ""
 
 msgid ""
 "Phases and servers\n"
 "------------------"
 msgstr ""
 
 msgid "Normally, all servers are ``publishing`` by default. This means::"
 msgstr ""
 
 msgid ""
 " - all draft changesets that are pulled or cloned appear in phase\n"
 " public on the client"
 msgstr ""
 
 msgid ""
 " - all draft changesets that are pushed appear as public on both\n"
 " client and server"
 msgstr ""
 
 msgid " - secret changesets are neither pushed, pulled, or cloned"
 msgstr ""
 
 msgid ""
 ".. note::\n"
 "  Pulling a draft changeset from a publishing server does not mark it\n"
 "  as public on the server side due to the read-only nature of pull."
 msgstr ""
 
 msgid ""
 "Sometimes it may be desirable to push and pull changesets in the draft\n"
 "phase to share unfinished work. This can be done by setting a\n"
 "repository to disable publishing in its configuration file::"
 msgstr ""
 
 msgid ""
 "  [phases]\n"
 "  publish = False"
 msgstr ""
 "  [phases]\n"
 "  publish = False"
 
 msgid "See :hg:`help config` for more information on config files."
 msgstr "Se :hg:`help config` för mer information om konfigurationsfiler."
 
 msgid ""
 ".. note::\n"
 "  Servers running older versions of Mercurial are treated as\n"
 "  publishing."
 msgstr ""
 
 msgid ""
 "Examples\n"
 "--------"
 msgstr ""
 "Exempel\n"
 "-------"
 
 msgid " - list changesets in draft or secret phase::"
 msgstr " - visa ändringar i draft- eller secret-fasen::"
 
 msgid "     hg log -r \"not public()\""
 msgstr "     hg log -r \"not public()\""
 
 msgid " - change all secret changesets to draft::"
 msgstr " - ändra alla secret-ändringar till draft::"
 
 msgid "     hg phase --draft \"secret()\""
 msgstr "     hg phase --draft \"secret()\""
 
 msgid ""
 " - forcibly move the current changeset and descendants from public to draft::"
 msgstr " - tvinga nuvarande ändring och ättlingar från public till draft::"
 
 msgid "     hg phase --force --draft ."
 msgstr "     hg phase --force --draft ."
 
 msgid " - show a list of changeset revision and phase::"
 msgstr " - visa en lista med ändringsrevision och fas::"
 
 msgid "     hg log --template \"{rev} {phase}\\n\""
 msgstr "     hg log --template \"{rev} {phase}\\n\""
 
+msgid " - resynchronize draft changesets relative to a remote repository::"
+msgstr ""
+
+msgid "     hg phase -fd 'outgoing(URL)' "
+msgstr "     hg phase -fd 'outgoing(URL)' "
+
 msgid ""
 "See :hg:`help phase` for more information on manually manipulating phases.\n"
 msgstr ""
 "Se :hg:`help phase` för mer information om att manuellt änddra faser.\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."
+"Any other string is treated as a bookmark, tag, or branch name. A\n"
+"bookmark is a movable pointer to a revision. A tag is a permanent name\n"
+"associated with a revision. A branch name denotes the tipmost revision\n"
+"of that branch. Bookmark, tag, and branch names must not contain the \":\"\n"
+"character."
+msgstr ""
+"Alla andra strängar behandlas som bokmärken, märken eller grennamn. Ett\n"
+"bokmärke är en flyttbar pekare till en revision. Ett märkesnamn är ett\n"
+"permanent namn associerad med en revisionsidentifierare. Ett grennamn\n"
+"anger den högsta revisionen på den grenen. Bokmärken, märken och\n"
+"grennamn kan inte innehålla tecknet \":\"."
+
+msgid "The reserved name \"tip\" always identifies the most recent revision."
+msgstr ""
+"Det reserverade namnet \"tip\" identifierar alltid 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 may need quoting with single or\n"
 "double quotes if they contain characters like ``-`` or if they match\n"
 "one of the predefined predicates."
 msgstr ""
 
 msgid ""
 "``not x``\n"
 "  Changesets not in x. Short form is ``! x``."
 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 ""
 "``x^n``\n"
 "  The nth parent of x, n == 0, 1, or 2.\n"
 "  For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
 "  for n == 2, the second parent of changeset in x."
 msgstr ""
 
 msgid ""
 "``x~n``\n"
 "  The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
 msgstr ""
 
 msgid "There is a single postfix operator:"
 msgstr ""
 
 msgid ""
 "``x^``\n"
 "  Equivalent to ``x^1``, the first parent of each changeset in x."
 msgstr ""
 
 msgid ""
 "\n"
 "The following predicates are supported:"
 msgstr ""
 
 msgid ""
 "New predicates (known as \"aliases\") can be defined, using any combination "
 "of\n"
 "existing predicates or other aliases. An alias definition looks like::"
 msgstr ""
 
 msgid "  <alias> = <definition>"
 msgstr ""
 
 msgid ""
 "in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
 "of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
 "definition."
 msgstr ""
 
 msgid "For example,"
 msgstr "Exempelvis,"
 
 msgid ""
 "  [revsetalias]\n"
 "  h = heads()\n"
 "  d($1) = sort($1, date)\n"
 "  rs($1, $2) = reverse(sort($1, $2))"
 msgstr ""
 
 msgid ""
 "defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
 "exactly equivalent to ``reverse(sort(0:tip, author))``."
 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 "- 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 committed in 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."
 msgstr ""
 
 msgid ""
 "Mercurial currently supports Mercurial, Git, and Subversion\n"
 "subrepositories."
 msgstr ""
 
 msgid "Subrepositories are made of three components:"
 msgstr ""
 
 msgid ""
 "1. Nested repository checkouts. They can appear anywhere in the\n"
 "   parent working directory."
 msgstr ""
 
 msgid ""
-"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+"2. Nested repository references. They are defined in ``.hgsub``, which\n"
+"   should be placed in the root of working directory, 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 "   Git and Subversion subrepos are also supported:"
 msgstr ""
 
 msgid ""
 "     path/to/nested = [git]git://example.com/nested/repo/path\n"
 "     path/to/nested = [svn]https://example.com/nested/trunk/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."
 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"
+"3. Nested repository states. They are defined in ``.hgsubstate``, which\n"
+"   is placed in the root of working directory, 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.  However, if you specify the full path of a file in a\n"
 "    subrepo, it will be added even without -S/--subrepos specified.\n"
 "    Git and 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. If any subrepositories\n"
 "    have been modified, Mercurial will abort.  Mercurial can be made\n"
 "    to instead commit all modified subrepositories by specifying\n"
 "    -S/--subrepos, or setting \"ui.commitsubrepos=True\" in a\n"
 "    configuration file (see :hg:`help config`).  After there are no\n"
 "    longer any modified subrepositories, it records their state and\n"
 "    finally commits 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. Git and Subversion subrepositories are currently\n"
 "    silently ignored."
 msgstr ""
 
 msgid ""
 ":forget: forget currently only handles exact file matches in subrepos.\n"
 "    Git and Subversion subrepositories are currently silently ignored."
 msgstr ""
 
 msgid ""
 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
 "    is specified. Git and Subversion subrepositories are currently\n"
 "    silently ignored."
 msgstr ""
 
 msgid ""
 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
 "    is specified. Git and Subversion subrepositories are currently\n"
 "    silently 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.  Push is a no-op for Subversion subrepositories."
 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 ".. keywordsmarker"
 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 ".. filtersmarker\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@]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`). See also :hg:`help paths`."
 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"
 
+msgid "empty destination path is not valid"
+msgstr "en tom destinationssökväg är inte giltig"
+
 #, 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 "config file %s not found!"
 msgstr "konfigurationsfilen %s hittades inte!"
 
 #, 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 "(binary file %s, hash: %s)"
+msgstr "(binär fil %s, hash: %s)"
+
+#, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr ""
+msgstr "%d filer ändrade, %d tillägg(+), %d raderingar(-)\n"
 
 #, 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 ""
 
+#, python-format
+msgid "loading %s hook failed:\n"
+msgstr ""
+
 msgid "kb"
 msgstr "kb"
 
 #, python-format
 msgid "ignoring invalid [auth] key '%s'\n"
 msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
 
 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 ".hg/sharedpath points to nonexistent directory %s"
 msgstr ""
 
 #, python-format
 msgid "warning: ignoring unknown working parent %s!\n"
 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 ""
 
 msgid "no rollback information available\n"
 msgstr ""
 
 #, python-format
 msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
 msgstr "arkivtopp tillbakadragen till revision %s (ångra %s: %s)\n"
 
 #, python-format
 msgid "repository tip rolled back to revision %s (undo %s)\n"
 msgstr "arkivtopp tillbakadragen till revision %s (ångra %s)\n"
 
 msgid "rolling back unknown transaction\n"
 msgstr "återkallar okänd transaktion\n"
 
 msgid "rollback of last commit while not checked out may lose data"
 msgstr ""
 
 msgid "use -f to force"
 msgstr ""
 
 #, python-format
 msgid "named branch could not be reset: current branch is still '%s'\n"
 msgstr ""
 
 #, python-format
 msgid "working directory now based on revisions %d and %d\n"
 msgstr "arbetskatalogen är nu baserad på revisionerna %d och %d\n"
 
 #, python-format
 msgid "working directory now based on revision %d\n"
 msgstr "arbetskatalogen är nu baserad på revision %d\n"
 
 #, 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 ""
 
 #, python-format
 msgid "warning: can't find ancestor for '%s' copied from '%s'!\n"
 msgstr "varning: kan inte hitta anfader för '%s', kopierad från '%s'!\n"
 
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr ""
 "kan inte delvis arkivera en sammanfogning (ange inte filer eller mönster"
 
+#, python-format
+msgid "commit with new subrepo %s excluded"
+msgstr ""
+
+msgid "use --subrepos for recursive commit"
+msgstr ""
+
 msgid "can't commit subrepos without .hgsub"
 msgstr "kan inte arkivera underarkiv utan .hgsub"
 
-msgid "use --subrepos for recursive commit"
-msgstr ""
-
 msgid "file not found!"
 msgstr "filen hittades inte!"
 
 msgid "no match under directory!"
 msgstr ""
 
 msgid "file not tracked!"
 msgstr "filen spåras inte!"
 
+msgid "cannot commit merge with missing files"
+msgstr "kan inte arkivera sammanfogning när filer saknas"
+
 msgid "unresolved merge conflicts (see hg help resolve)"
 msgstr "olösta sammanfogningskonflikter (se hg help resolve)"
 
 #, python-format
 msgid "committing subrepository %s\n"
-msgstr ""
+msgstr "arkiverar underarkiv %s\n"
 
 #, 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."
 
+msgid "destination does not support push"
+msgstr "destinationen stödjer inte tryckning"
+
+#, python-format
+msgid "push includes an obsolete changeset: %s!"
+msgstr "tryckningen innehåller en förlegad ändring: %s!"
+
+#, python-format
+msgid "push includes an unstable changeset: %s!"
+msgstr "tryckningen innehåller en instabil ändring: %s!"
+
 #, python-format
 msgid "updating %s to public failed!\n"
 msgstr "uppdatera %s till publik misslyckades!\n"
 
+msgid "failed to push obsolete markers!\n"
+msgstr "kunde inte trycka förlegad-markörerna!\n"
+
 #, python-format
 msgid "%d changesets found\n"
 msgstr "%d ändringar hittades\n"
 
 msgid "bundling"
 msgstr "buntar"
 
 msgid "manifests"
 msgstr "manifest"
 
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "tom eller ingen revlog för %s"
 
 msgid "adding changesets\n"
 msgstr "lägger till ändringar\n"
 
 msgid "chunks"
 msgstr "stycken"
 
 msgid "received changelog group is empty"
 msgstr "mottagen ändringsgrupp är tom"
 
 msgid "adding manifests\n"
 msgstr "lägger till manifest\n"
 
 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 "unexpected response from remote server:"
+msgstr "oväntat svar från server:"
 
 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"
 
+msgid "clone"
+msgstr ""
+
 #, python-format
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "överförde %s på %.1f sekunder (%s/sek)\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 smtps)\n"
 msgstr "(använder smtps)\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 "(using starttls)\n"
 msgstr "(använder starttls)\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 "'\\n' and '\\r' disallowed in filenames: %r"
 msgstr ""
 
 #, 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 "unable to read file list (%s)"
 msgstr "kan inte läsa fillistan (%s)"
 
 #, python-format
 msgid "diff context lines count must be an integer, not %r"
 msgstr ""
 
 #, python-format
 msgid "%s: untracked file differs\n"
 msgstr ""
 
 msgid ""
 "untracked files in working directory differ from files in requested revision"
 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 "note: possible conflict - %s was deleted and renamed to:\n"
+msgstr "notera: möjlig konflikt - %s raderades och döptes om till:\n"
+
 msgid "merging with a working directory ancestor has no effect"
 msgstr ""
 
 msgid "use 'hg update' or check 'hg heads'"
 msgstr "använd 'hg update' eller kontrollera 'hg heads'"
 
 msgid "use 'hg status' to list changes"
 msgstr "använd 'hg status' för att visa modifikationer"
 
 #, python-format
 msgid "outstanding uncommitted changes in subrepository '%s'"
 msgstr "kvarvarande oarkiverade ändringar i underarkivet '%s'"
 
 msgid "crosses branches (merge branches or use --clean to discard changes)"
 msgstr ""
 
 msgid "crosses branches (merge branches or update --check to force update)"
 msgstr ""
 
 msgid "Attention:"
 msgstr ""
 
 msgid "Caution:"
 msgstr ""
 
 msgid "!Danger!"
 msgstr "!Fara!"
 
 msgid "Error:"
 msgstr "Fel:"
 
 msgid "Hint:"
 msgstr "Tips:"
 
 msgid "Important:"
 msgstr "Viktigt:"
 
 msgid "Note:"
 msgstr "Notera:"
 
 msgid "Tip:"
 msgstr "Tips:"
 
 msgid "Warning!"
 msgstr "Varning!"
 
 #, python-format
+msgid "parsing obsolete marker: unknown version %r"
+msgstr "tolkar förlegad-markering: okänd version %r"
+
+#, python-format
+msgid ""
+"parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
+msgstr ""
+"tolkar förlegad-markering: metadata är för kort, %d bytes förväntades, fick "
+"%d"
+
+#, python-format
+msgid "unknown key: %r"
+msgstr "okänd nyckel: %r"
+
+msgid "unexpected old value"
+msgstr "oväntat gammalt värde"
+
+#, python-format
 msgid "unexpected token: %s"
 msgstr ""
 
 #, python-format
 msgid "not a prefix: %s"
 msgstr "inte ett prefix: %s"
 
 #, python-format
 msgid "not an infix: %s"
 msgstr "inte en infix: %s"
 
 #, python-format
 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
 msgstr ""
 
 #, python-format
 msgid "cannot patch %s: file is not tracked"
 msgstr "kan inte patcha %s: filen är inte hanterad"
 
 #, python-format
 msgid "unable to find '%s' for patching\n"
 msgstr ""
 
 #, python-format
 msgid "patching file %s\n"
 msgstr ""
 
 #, python-format
 msgid "bad hunk #%d %s (%d %d %d %d)"
 msgstr ""
 
 #, python-format
 msgid "cannot create %s: destination already exists\n"
 msgstr "kan inte skapa %s: destinationen finns redan\n"
 
 #, 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"
+#, python-format
+msgid "could not extract \"%s\" binary data"
+msgstr ""
+
+#, python-format
+msgid "could not decode \"%s\" binary patch: %s"
+msgstr ""
+
+#, python-format
+msgid "\"%s\" length is %d bytes, should be %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 "failed to synchronize metadata for \"%s\""
+msgstr ""
+
+#, python-format
 msgid "cannot create %s: destination already exists"
 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 "cannot %s; remote repository does not support the %r capability"
+msgstr "kan inte %s; fjärrarkivet har inte %r-förmågan"
+
+msgid "cannot change null revision phase"
+msgstr "kan inte ändra fas för null-revisionen"
+
+#, python-format
 msgid "ignoring inconsistent public root from remote: %s\n"
 msgstr ""
 
 #, python-format
 msgid "ignoring unexpected root from remote: %i %s\n"
 msgstr ""
 
 #, python-format
+msgid "phases.new-commit: not a valid phase name ('%s')"
+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 "error removing %s: %s\n"
+msgstr "fel vid radering av %s: %s\n"
+
+#, 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"
+msgid "revlog decompress error: %s"
 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 delta base"
 msgstr "okänd deltabas"
 
 #, python-format
 msgid "can't use %s here"
 msgstr "kan inte använda %s här"
 
 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 ""
 "``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 revisioner"
 
 msgid ""
 "``ancestors(set)``\n"
 "    Changesets that are ancestors of a changeset in set."
 msgstr ""
 
 msgid "~ expects a number"
 msgstr "~ förväntar sig ett nummer"
 
 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 ""
 "``bisect(string)``\n"
 "    Changesets marked in the specified bisect status:"
 msgstr ""
 
 msgid ""
 "    - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n"
 "    - ``goods``, ``bads``      : csets topologicaly good/bad\n"
 "    - ``range``              : csets taking part in the bisection\n"
 "    - ``pruned``             : csets that are goods, bads or skipped\n"
 "    - ``untested``           : csets whose fate is yet unknown\n"
-"    - ``ignored``            : csets ignored due to DAG topology"
+"    - ``ignored``            : csets ignored due to DAG topology\n"
+"    - ``current``            : the cset currently being bisected"
 msgstr ""
 
 msgid "bisect requires a string"
 msgstr "bisect kräver en sträng"
 
 msgid ""
 "``bookmark([name])``\n"
 "    The named bookmark or all bookmarks."
 msgstr ""
 
+msgid ""
+"    If `name` starts with `re:`, the remainder of the name is treated as\n"
+"    a regular expression. To match a bookmark that actually starts with `re:"
+"`,\n"
+"    use the prefix `literal:`."
+msgstr ""
+
 #. 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"
 
+#, python-format
+msgid "no bookmarks exist that match '%s'"
+msgstr ""
+
 msgid ""
 "``branch(string or set)``\n"
 "    All changesets belonging to the given branch or the branches of the "
 "given\n"
 "    changesets."
 msgstr ""
 
 msgid ""
+"    If `string` starts with `re:`, the remainder of the name is treated as\n"
+"    a regular expression. To match a branch that actually starts with `re:"
+"`,\n"
+"    use the prefix `literal:`."
+msgstr ""
+
+msgid ""
 "``children(set)``\n"
 "    Child changesets of changesets in set."
 msgstr ""
 
 msgid ""
 "``closed()``\n"
 "    Changeset is closed."
 msgstr ""
 
 #. i18n: "closed" is a keyword
 msgid "closed takes no arguments"
 msgstr "closed tar inga argument"
 
 msgid ""
 "``contains(pattern)``\n"
 "    Revision contains a file matching pattern. See :hg:`help patterns`\n"
 "    for information about file patterns."
 msgstr ""
 
 #. i18n: "contains" is a keyword
 msgid "contains requires a pattern"
-msgstr "contain kräver ett mönster"
+msgstr "contains kräver ett mönster"
+
+msgid ""
+"``converted([id])``\n"
+"    Changesets converted from the given identifier in the old repository if\n"
+"    present, or all converted changesets if no identifier is specified."
+msgstr ""
+
+msgid "converted takes one or no arguments"
+msgstr "converted tar ett eller inga argument"
+
+msgid "converted requires a revision"
+msgstr "converted kräver en revision"
 
 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 ""
 "``desc(string)``\n"
 "    Search commit message for string. The match is case-insensitive."
 msgstr ""
 
 #. i18n: "desc" is a keyword
 msgid "desc requires a string"
 msgstr "desc kräver en sträng"
 
 msgid ""
 "``descendants(set)``\n"
 "    Changesets which are descendants of changesets in set."
 msgstr ""
 
 msgid ""
+"``destination([set])``\n"
+"    Changesets that were created by a graft, transplant or rebase "
+"operation,\n"
+"    with the given revisions specified as the source.  Omitting the optional "
+"set\n"
+"    is the same as passing all()."
+msgstr ""
+
+msgid ""
 "``draft()``\n"
 "    Changeset in draft phase."
 msgstr ""
 
 msgid "draft takes no arguments"
 msgstr "draft tar inga argument"
 
 msgid ""
+"``extinct()``\n"
+"    obsolete changeset with obsolete descendant only."
+msgstr ""
+
+msgid "obsolete takes no arguments"
+msgstr "obsolete tar inga argument"
+
+msgid ""
+"``extra(label, [value])``\n"
+"    Changesets with the given label in the extra metadata, with the given\n"
+"    optional value."
+msgstr ""
+
+msgid ""
+"    If `value` starts with `re:`, the remainder of the value is treated as\n"
+"    a regular expression. To match a value that actually starts with `re:`,\n"
+"    use the prefix `literal:`."
+msgstr ""
+
+msgid "extra takes at least 1 and at most 2 arguments"
+msgstr "extra tar minst 1 och som mest 2 argument"
+
+msgid "first argument to extra must be a string"
+msgstr "första argumentet till extra måste vara en sträng"
+
+msgid "second argument to extra must be a string"
+msgstr "andra argumentet till extra måste vara en sträng"
+
+msgid ""
 "``filelog(pattern)``\n"
 "    Changesets connected to the specified filelog."
 msgstr ""
 
 msgid "filelog requires a pattern"
 msgstr "filelog kräver ett mönster"
 
 msgid ""
 "``first(set, [n])``\n"
 "    An alias for limit()."
 msgstr ""
 
+#, python-format
+msgid "%s takes no arguments or a filename"
+msgstr "%s tar inga argument eller ett filnamn"
+
+#, python-format
+msgid "%s expected a filename"
+msgstr "%s förväntade sig ett filnamn"
+
 msgid ""
 "``follow([file])``\n"
 "    An alias for ``::.`` (ancestors of the working copy's first parent).\n"
 "    If a filename is specified, the history of the given file is followed,\n"
 "    including copies."
 msgstr ""
 
-#. i18n: "follow" is a keyword
-msgid "follow takes no arguments or a filename"
-msgstr "follow tar inga argument eller ett filnamn"
-
-msgid "follow expected a filename"
-msgstr "follow förväntade sig ett filnamn"
-
 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 ""
 "``grep(regex)``\n"
 "    Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
 "    to ensure special escape characters are handled correctly. Unlike\n"
 "    ``keyword(string)``, the match is case-sensitive."
 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"
 
+#. i18n: "_matchfiles" is a keyword
+msgid "_matchfiles requires at least one argument"
+msgstr "_matchfiles kräver minst ett argument"
+
+msgid "_matchfiles requires string arguments"
+msgstr "_matchfiles kräver strängargument"
+
+msgid "_matchfiles expected at most one revision"
+msgstr "_matchfiles förväntade sig som mest en revision"
+
+msgid "_matchfiles expected at most one default mode"
+msgstr "_matchfiles förvändate sig som mest ett standardläge"
+
+#, python-format
+msgid "invalid _matchfiles prefix: %s"
+msgstr "ogiltigt _matchfiles-prefix: %s"
+
 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 ""
 "``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 ""
 "``heads(set)``\n"
 "    Members of set with no children in set."
 msgstr ""
 
 msgid ""
 "``keyword(string)``\n"
 "    Search commit message, user name, and names of changed files for\n"
 "    string. The match is case-insensitive."
 msgstr ""
 
 #. i18n: "keyword" is a keyword
 msgid "keyword requires a string"
 msgstr "keyword kräver en sträng"
 
 msgid ""
 "``limit(set, [n])``\n"
 "    First n members of set, defaulting to 1."
 msgstr ""
 
 #. i18n: "limit" is a keyword
 msgid "limit requires one or two arguments"
 msgstr "limit kräver ett eller 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 ""
 "``last(set, [n])``\n"
 "    Last n members of set, defaulting to 1."
 msgstr ""
 
 #. i18n: "last" is a keyword
 msgid "last requires one or two arguments"
 msgstr "last kräver ett eller två argument"
 
 #. i18n: "last" is a keyword
 msgid "last requires a number"
 msgstr "last kräver ett nummer"
 
 #. i18n: "last" is a keyword
 msgid "last expects a number"
 msgstr "last förväntar sig ett nummer"
 
 msgid ""
 "``max(set)``\n"
 "    Changeset with highest revision number in set."
 msgstr ""
 
 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 ""
 "``min(set)``\n"
 "    Changeset with lowest revision number in set."
 msgstr ""
 
 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 ""
 "``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 ""
+"``obsolete()``\n"
+"    Mutable changeset with a newer version."
+msgstr ""
+
+msgid ""
+"``origin([set])``\n"
+"    Changesets that were specified as a source for the grafts, transplants "
+"or\n"
+"    rebases that created the given revisions.  Omitting the optional set is "
+"the\n"
+"    same as passing all().  If a changeset created by these operations is "
+"itself\n"
+"    specified as a source for one of these operations, only the source "
+"changeset\n"
+"    for the first operation is selected."
+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 takes one or no arguments"
 msgstr "outgoing tar ett eller inga argument"
 
 #. i18n: "outgoing" is a keyword
 msgid "outgoing requires a repository path"
 msgstr ""
 
 msgid ""
 "``p1([set])``\n"
 "    First parent of changesets in set, or the working directory."
 msgstr ""
 
 msgid ""
 "``p2([set])``\n"
 "    Second parent of changesets in set, or the working directory."
 msgstr ""
 
 msgid ""
 "``parents([set])``\n"
 "    The set of all parents for all changesets in set, or the working "
 "directory."
 msgstr ""
 
 msgid "^ expects a number 0, 1, or 2"
 msgstr "^ förväntar sig ett nummer 0, 1, eller 2"
 
 msgid ""
 "``present(set)``\n"
 "    An empty set, if any revision in set isn't found; otherwise,\n"
 "    all revisions in set."
 msgstr ""
 
 msgid ""
+"    If any of specified revisions is not present in the local repository,\n"
+"    the query is normally aborted. But this predicate allows the query\n"
+"    to continue even in such cases."
+msgstr ""
+
+msgid ""
 "``public()``\n"
 "    Changeset in public phase."
 msgstr ""
 
 msgid "public takes no arguments"
 msgstr "public tar inga argument"
 
 msgid ""
 "``remote([id [,path]])``\n"
 "    Local revision that corresponds to the given identifier in a\n"
 "    remote repository, if present. Here, the '.' identifier is a\n"
 "    synonym for the current local branch."
 msgstr ""
 
 #. i18n: "remote" is a keyword
 msgid "remote takes one, two or no arguments"
 msgstr "remote tar ett, två eller inga argument"
 
 #. i18n: "remote" is a keyword
 msgid "remote requires a string id"
 msgstr "remote kräver ett sträng-id"
 
 #. i18n: "remote" is a keyword
 msgid "remote requires a repository path"
 msgstr "remote kräver en arkivsökväg"
 
 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 ""
 "``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 ""
+"``matching(revision [, field])``\n"
+"    Changesets in which a given set of fields match the set of fields in "
+"the\n"
+"    selected revision or set."
+msgstr ""
+
+msgid ""
+"    To match more than one field pass the list of fields to match separated\n"
+"    by spaces (e.g. ``author description``)."
+msgstr ""
+
+msgid ""
+"    Valid fields are most regular revision fields and some special fields."
+msgstr ""
+
+msgid ""
+"    Regular revision fields are ``description``, ``author``, ``branch``,\n"
+"    ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``\n"
+"    and ``diff``.\n"
+"    Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the\n"
+"    contents of the revision. Two revisions matching their ``diff`` will\n"
+"    also match their ``files``."
+msgstr ""
+
+msgid ""
+"    Special fields are ``summary`` and ``metadata``:\n"
+"    ``summary`` matches the first line of the description.\n"
+"    ``metadata`` is equivalent to matching ``description user date``\n"
+"    (i.e. it matches the main metadata fields)."
+msgstr ""
+
+msgid ""
+"    ``metadata`` is the default field which is used when no fields are\n"
+"    specified. You can match more than one field at a time."
+msgstr ""
+
+msgid "matching takes 1 or 2 arguments"
+msgstr "matching tar 1 eller 2 argument"
+
+msgid "matching requires a string as its second argument"
+msgstr "matching kräver en sträng som sitt andra argument"
+
+#, python-format
+msgid "unexpected field name passed to matching: %s"
+msgstr "oväntat fältnamn skickat till matching: %s"
+
+msgid ""
 "``reverse(set)``\n"
 "    Reverse order of set."
 msgstr ""
 
 msgid ""
 "``roots(set)``\n"
-"    Changesets with no parent changeset in set."
+"    Changesets in set with no parent changeset in set."
 msgstr ""
 
 msgid ""
 "``secret()``\n"
 "    Changeset in secret phase."
 msgstr ""
 
 msgid "secret takes no arguments"
 msgstr "secret tar inga argument"
 
 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"
 
+#, python-format
+msgid "invalid regular expression: %s"
+msgstr "ogiltigt reguljärt uttryck: %s"
+
 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"
 
+#, python-format
+msgid "no tags exist that match '%s'"
+msgstr "inga märken finns som matchar '%s'"
+
+msgid ""
+"``unstable()``\n"
+"    Unstable changesets are non-obsolete with obsolete descendants."
+msgstr ""
+
 msgid ""
 "``user(string)``\n"
 "    User name contains string. The match is case-insensitive."
 msgstr ""
 
+msgid ""
+"    If `string` starts with `re:`, the remainder of the string is treated "
+"as\n"
+"    a regular expression. To match a user that actually contains `re:`, use\n"
+"    the prefix `literal:`."
+msgstr ""
+
 msgid "can't negate that"
 msgstr "kan inte negera det"
 
 msgid "not a symbol"
 msgstr "inte en symbol"
 
 #, python-format
+msgid "infinite expansion of revset alias \"%s\" detected"
+msgstr ""
+
+#, python-format
 msgid "invalid number of arguments: %s"
 msgstr "felaktigt antal argument: %s"
 
 msgid "empty query"
 msgstr "tom fråga"
 
 #, python-format
 msgid "no changes found (ignored %d secret changesets)\n"
 msgstr "inga ändringar hittades (ignorerade %d hemliga ändringar)\n"
 
 #, python-format
 msgid "ui.portablefilenames value is invalid ('%s')"
 msgstr ""
 
 #, python-format
 msgid "possible case-folding collision for %s"
 msgstr ""
 
 #, python-format
 msgid "path ends in directory separator: %s"
 msgstr "sökvägen slutar med en katalogseparator: %s"
 
 #, python-format
 msgid "path contains illegal component: %s"
 msgstr ""
 
 #, python-format
 msgid "path '%s' is inside nested repo %r"
 msgstr ""
 
 #, python-format
 msgid "path %r traverses symbolic link %r"
 msgstr ""
 
 #, python-format
 msgid "could not symlink to %r: %s"
 msgstr ""
 
+msgid "empty revision range"
+msgstr "tomt revisionsset"
+
 #, 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"
 
 msgid ".hg/requires file is corrupt"
 msgstr "filen .hg/requires är korrupt"
 
 #, python-format
 msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
 msgstr "okänt arkivformat: kräver att '%s' fungerar (uppgradera Mercurial)"
 
 msgid "searching for changes\n"
 msgstr "söker efter ändringar\n"
 
 msgid "all local heads known remotely\n"
 msgstr ""
 
 msgid "sampling from both directions\n"
 msgstr ""
 
 msgid "queries"
 msgstr "frågar"
 
 msgid "searching"
 msgstr "söker"
 
 msgid "repository is unrelated"
 msgstr "arkivet är obesläktat"
 
 msgid "warning: repository is unrelated\n"
 msgstr "varning: arkivet är obesälktat\n"
 
 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 "password in URL not supported"
 msgstr "lösenord i URL stödjs inte"
 
 msgid "could not create remote repo"
 msgstr ""
 
 msgid "no suitable response from remote hg"
 msgstr ""
 
 #, python-format
 msgid "push refused: %s"
 msgstr ""
 
 msgid "ssl connection failed"
 msgstr "ssl-anslutning misslyckades"
 
 msgid "Python SSL support not found"
 msgstr "Pythons SSL-stöd hittades inte"
 
 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 "IDN in certificate not supported"
 msgstr "IDN i certifikat stöds inte"
 
 msgid "no commonName or subjectAltName found in certificate"
 msgstr "inget commonName eller subjectAltName hittades i certifikat"
 
 #, python-format
 msgid "could not find web.cacerts: %s"
 msgstr "kunde inte hitta web.cacerts: %s"
 
 #, python-format
 msgid "host fingerprint for %s can't be verified (Python too old)"
 msgstr ""
 
 #, python-format
 msgid "warning: certificate for %s can't be verified (Python too old)\n"
 msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n"
 
 #, python-format
 msgid "%s ssl connection error"
 msgstr ""
 
 #, python-format
 msgid "%s certificate error: no certificate received"
 msgstr "%s certifikatfel: inget certifikat mottaget"
 
 #, python-format
 msgid "certificate for %s has unexpected fingerprint %s"
 msgstr "certifikatet för %s har oväntat fingeravtryck %s"
 
 msgid "check hostfingerprint configuration"
 msgstr "kontrollera hostfingerprint-konfiguration"
 
 #, python-format
 msgid "%s certificate error: %s"
 msgstr "%s certifikatfel: %s"
 
 #, python-format
 msgid "configure hostfingerprint %s or use --insecure to connect insecurely"
 msgstr ""
 "konfigurera hostfingerprint %s eller använd --insecure för att ansluta "
 "osäkert"
 
 #, python-format
 msgid ""
 "warning: %s certificate with fingerprint %s not verified (check "
 "hostfingerprints or web.cacerts config setting)\n"
 msgstr ""
 "varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
 "inställningen för hostfingerprints eller web.cacerts)\n"
 
 #, python-format
 msgid "'%s' does not appear to be an hg repository"
 msgstr "'%s' verkar inte vara ett hg-arkiv"
 
 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 "warning: subrepo spec file %s not found\n"
 msgstr ""
 
 #, python-format
 msgid "subrepo spec file %s not found"
 msgstr ""
 
 #, python-format
+msgid "invalid subrepository revision specifier in .hgsubstate line %d"
+msgstr ""
+
+#, python-format
 msgid "bad subrepository pattern in %s: %s"
 msgstr ""
 
 msgid "missing ] in subrepo source"
 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 ""
 " subrepository sources for %s differ\n"
 "use (l)ocal source (%s) or (r)emote source (%s)?\n"
 msgstr ""
 
 #, python-format
 msgid ""
 " subrepository sources for %s differ (in checked out version)\n"
 "use (l)ocal source (%s) or (r)emote source (%s)?\n"
 msgstr ""
 
 #, python-format
 msgid "default path for subrepository %s not found"
 msgstr ""
 
 #, python-format
 msgid "unknown subrepo type %s"
 msgstr ""
 
 #, python-format
 msgid "archiving (%s)"
 msgstr "arkiverar (%s)"
 
 #, python-format
 msgid "warning: error \"%s\" in subrepository \"%s\"\n"
 msgstr ""
 
 #, python-format
 msgid "removing subrepo %s\n"
 msgstr ""
 
 #, python-format
 msgid "cloning subrepo %s from %s\n"
 msgstr "klonar underarkivet %s från %s\n"
 
 #, python-format
 msgid "pulling subrepo %s from %s\n"
 msgstr "drar underarkivet %s från %s\n"
 
 #, python-format
 msgid "pushing subrepo %s to %s\n"
 msgstr "trycker underarkivet %s till %s\n"
 
 #, python-format
+msgid "reverting subrepo %s\n"
+msgstr "återställer underarkivet %s\n"
+
+#, python-format
 msgid "'svn' executable not found for subrepo '%s'"
 msgstr ""
 
 msgid "cannot retrieve svn tool version"
 msgstr "kan inte hämta version på svn-verktyg"
 
 msgid "cannot commit svn externals"
 msgstr ""
 
+msgid "cannot commit missing svn entries"
+msgstr ""
+
+msgid "failed to commit svn changes"
+msgstr "kunde inte arkivera svn-ändringar"
+
 #, python-format
 msgid "not removing repo %s because it has changes.\n"
 msgstr "raderar inte arkivet %s eftersom den har ändringar.\n"
 
+msgid "cannot retrieve git version"
+msgstr "kan inte hämta git-version"
+
+msgid "git subrepo requires at least 1.6.0 or later"
+msgstr "git-underarkiv kräver minst 1.6.0 eller senare"
+
 #, python-format
 msgid "revision %s does not exist in subrepo %s\n"
 msgstr "revisionen %s existerar inte i underarkivet %s\n"
 
 #, python-format
 msgid "checking out detached HEAD in subrepo %s\n"
 msgstr "hämtar ut löst HEAD i underarkivet %s\n"
 
 msgid "check out a git branch if you intend to make changes\n"
 msgstr "hämta ut en git-gren om du tänker göra ändringer\n"
 
 #, python-format
 msgid "subrepo %s is missing"
 msgstr "underarkivet %s saknas"
 
 #, python-format
 msgid "unrelated git branch checked out in subrepo %s\n"
 msgstr "obesläktar git-gren hämtar i underarkivet %s\n"
 
 #, python-format
 msgid "pushing branch %s of subrepo %s\n"
 msgstr "trycker grenen %s från underarkivet %s\n"
 
 #, python-format
 msgid ""
 "no branch checked out in subrepo %s\n"
-"cannot push revision %s"
+"cannot push revision %s\n"
 msgstr ""
 "ingen gren uthämtar i underarkivet %s\n"
-"kan inte trycka revison %s"
+"kan inte trycka revison %s\n"
 
 #, python-format
 msgid "%s, line %s: %s\n"
-msgstr ""
+msgstr "%s, rad %s: %s\n"
 
 msgid "cannot parse entry"
 msgstr ""
 
 #, python-format
 msgid "node '%s' is not well formed"
 msgstr ""
 
 msgid ".hg/cache/tags is corrupt, rebuilding it\n"
 msgstr ".hg/cache/tags är korrupt, bygger om den\n"
 
 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 ""
 ":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"
 "    <[e-mail]>`` becomes ``example.com``."
 msgstr ""
 
 msgid ""
 ":email: Any text. Extracts the first string that looks like an email\n"
 "    address. Example: ``User <[e-mail]>`` becomes\n"
 "    ``[e-mail]``."
 msgstr ""
 
 msgid ""
 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
 "    and \">\" with XML entities."
 msgstr ""
 
 msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
 msgstr ""
 
 msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
 msgstr ""
 
 msgid ":firstline: Any text. Returns the first line of text."
 msgstr ""
 
 msgid ""
 ":hex: Any text. Convert a binary Mercurial node identifier into\n"
 "    its long hexadecimal representation."
 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 ":nonempty: Any text. Returns '(none)' if the string is empty."
 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."
+msgid ""
+":person: Any text. Returns the name before an email address,\n"
+"    interpreting it as per RFC 5322."
+msgstr ""
+
+msgid ""
+"    >>> person('foo@bar')\n"
+"    'foo'\n"
+"    >>> person('Foo Bar <foo@bar>')\n"
+"    'Foo Bar'\n"
+"    >>> person('\"Foo Bar\" <foo@bar>')\n"
+"    'Foo Bar'\n"
+"    >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
+"    'Foo \"buz\" Bar'\n"
+"    >>> # The following are invalid, but do exist in real-life\n"
+"    ...\n"
+"    >>> person('Foo \"buz\" Bar <foo@bar>')\n"
+"    'Foo \"buz\" Bar'\n"
+"    >>> person('\"Foo Bar <foo@bar>')\n"
+"    'Foo Bar'"
 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 ""
 ":rfc822date: Date. Returns a date using the same format used in email\n"
 "    headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
 msgstr ""
 
 msgid ""
 ":short: Changeset hash. Returns the short form of a changeset hash,\n"
 "    i.e. a 12 hexadecimal digit string."
 msgstr ""
 
 msgid ""
 ":shortbisect: Any text. Treats `text` as a bisection status, and\n"
 "    returns a single-character representing the status (G: good, B: bad,\n"
 "    S: skipped, U: untested, I: ignored). Returns single space if `text`\n"
 "    is not a valid bisection status."
 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 ""
 ":stripdir: Treat the text as path and strip a directory level, if\n"
 "    possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
 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."
+msgid ""
+":user: Any text. Returns a short representation of a user name or email\n"
+"    address."
+msgstr ""
+
+msgid ":emailuser: Any text. Returns the user portion of an email address."
 msgstr ""
 
 msgid ":author: String. The unmodified author of the changeset."
 msgstr ""
 
 msgid ":bisect: String. The changeset bisection status."
 msgstr ""
 
 msgid ""
 ":branch: String. The name of the branch on which the changeset was\n"
 "    committed."
 msgstr ""
 
 msgid ""
 ":branches: List of strings. The name of the branch on which the\n"
 "    changeset was committed. Will be empty if the branch name was\n"
 "    default."
 msgstr ""
 
 msgid ""
 ":bookmarks: List of strings. Any bookmarks associated with the\n"
 "    changeset."
 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 ":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_dels: List of strings. Files removed by this changeset."
 msgstr ""
 
 msgid ":file_mods: List of strings. Files modified by this changeset."
 msgstr ""
 
 msgid ""
 ":files: List of strings. All files modified, added, or removed by this\n"
 "    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 ""
 ":node: String. The changeset identification hash, as a 40 hexadecimal\n"
 "    digit string."
 msgstr ""
 
 msgid ":phase: String. The changeset phase name."
 msgstr ""
 
 msgid ":phaseidx: Integer. The changeset phase index."
 msgstr ""
 
 msgid ":rev: Integer. The repository-local changeset revision number."
 msgstr ""
 
 msgid ":tags: List of strings. Any tags associated with the changeset."
 msgstr ""
 
+msgid ""
+":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
+"    format. If the changeset has only one \"natural\" parent (the "
+"predecessor\n"
+"    revision) nothing is shown."
+msgstr ""
+
 #, python-format
 msgid "unknown method '%s'"
 msgstr "okänd metod '%s'"
 
 msgid "expected a symbol"
 msgstr "förväntade en symbol"
 
 #, python-format
 msgid "unknown function '%s'"
 msgstr "okänd funktion '%s'"
 
 msgid "expected template specifier"
 msgstr "förväntade mallspecifikation"
 
 #, python-format
 msgid "filter %s expects one argument"
 msgstr "filtret %s kräver ett argument"
 
 msgid "unmatched quotes"
 msgstr ""
 
 #, python-format
 msgid "style not found: %s"
 msgstr ""
 
 #, python-format
 msgid "\"%s\" not in template map"
 msgstr "\"%s\" finns inte i mallistan"
 
 #, 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 ""
 
 msgid "already have changeset "
 msgstr "har redan ändringen "
 
 #, 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 ""
+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 "ignorerad: %s\n"
 
 #, 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 "%s.%s is not a boolean ('%s')"
 msgstr "%s.%s är inte booleskt ('%s')"
 
 #, python-format
 msgid "%s.%s is not an integer ('%s')"
 msgstr "%s.%s är inte ett heltal ('%s')"
 
 msgid "enter a commit username:"
 msgstr ""
 
 #, python-format
-msgid "No username found, using '%s' instead\n"
-msgstr "Inget användarnamn hittades, använder '%s' istället\n"
+msgid "no username found, using '%s' instead\n"
+msgstr "inget användarnamn hittades, använder '%s' istället\n"
 
 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 ""
+msgstr "lösenord: "
 
 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 "command '%s' failed: %s"
 msgstr "kommandot '%s' misslyckades: %s"
 
 #, python-format
 msgid "filename contains '%s', which is reserved on Windows"
 msgstr ""
 
 #, python-format
 msgid "filename contains %r, which is invalid on Windows"
 msgstr ""
 
 #, python-format
 msgid "filename ends with '%s', which is not allowed on Windows"
 msgstr ""
 
 msgid "check your clock"
 msgstr "kontrollera din klocka"
 
 #, python-format
 msgid "negative timestamp: %d"
 msgstr "negativ tidsstämpel: %d"
 
 #, python-format
 msgid "invalid date: %r"
 msgstr "ogiltigt datum: %r"
 
 #, python-format
 msgid "date exceeds 32 bits: %d"
 msgstr "datum överskrider 32 bitar: %d"
 
 #, python-format
 msgid "negative date value: %d"
 msgstr "negativt datumvärde: %d"
 
 #, python-format
 msgid "impossible time zone offset: %d"
 msgstr "omöjlig tidzonsoffset: %d"
 
 msgid "dates cannot consist entirely of whitespace"
 msgstr "datum kan inte bara bestå av blanktecken"
 
 msgid "invalid day spec, use '<DATE'"
 msgstr ""
 
 msgid "invalid day spec, use '>DATE'"
 msgstr ""
 
 #, python-format
 msgid "invalid day spec: %s"
 msgstr ""
 
 #, python-format
 msgid "%s must be nonnegative (see 'hg help dates')"
 msgstr ""
 
 #, python-format
 msgid "%.0f GB"
 msgstr "%.0f GB"
 
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
 #, python-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #, python-format
 msgid "%.0f MB"
 msgstr "%.0f MB"
 
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #, python-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #, python-format
 msgid "%.0f KB"
 msgstr "%.0f KB"
 
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
 #, python-format
 msgid "%.2f KB"
 msgstr "%.2f KB"
 
 #, python-format
 msgid "%.0f bytes"
 msgstr "%.0f bytes"
 
 #, python-format
 msgid "no port number associated with service '%s'"
 msgstr ""
 
 msgid "file:// URLs can only refer to localhost"
 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 "look up remote revision"
 msgstr "söker fjärrevision"
 
 msgid "push failed (unexpected response):"
 msgstr "tryckning misslyckades (oväntat svar):"
 
 msgid "look up remote changes"
 msgstr "söker fjärrändringar"
 
 msgid "push failed:"
 msgstr "tryckning misslyckades:"