merge with i18n

i18n/sv.po

@@ -4,17 +4,20 b''
 #
 # 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"
@@ -113,6 +116,11 b' msgid ""'
 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 ""
@@ -262,15 +270,73 b' msgid ""'
 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 ""
@@ -305,7 +371,9 b' msgid ""'
 "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:"
@@ -334,7 +402,7 b' msgid ""'
 "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 ""
@@ -342,7 +410,8 b' msgid ""'
 "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 ""
@@ -352,7 +421,8 b' msgid ""'
 "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:"
@@ -375,11 +445,43 b' 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 ""
@@ -651,6 +753,10 b' 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 ""
 
@@ -684,6 +790,12 b' msgstr ""'
 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"
 
@@ -695,6 +807,10 b' msgstr ""'
 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"
@@ -709,8 +825,15 b' msgstr ""'
 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 ""
@@ -737,7 +860,7 b' msgid "command to display statistics abo'
 msgstr ""
 
 #, python-format
-msgid "Revision %d is a merge, ignoring...\n"
+msgid "revision %d is a merge, ignoring...\n"
 msgstr ""
 
 msgid "analyzing"
@@ -1547,8 +1670,8 b' msgid "bzr source type could not be dete'
 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"
@@ -1575,6 +1698,10 b' 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"
 
@@ -1604,6 +1731,14 b' 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 ""
 
@@ -1615,11 +1750,11 b' 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
@@ -1864,6 +1999,12 b' 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 ""
 
@@ -1924,6 +2065,9 b' 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 ""
 
@@ -1940,7 +2084,7 b' msgstr ""'
 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
@@ -2025,6 +2169,12 b' 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 ""
 
@@ -2211,7 +2361,8 b' msgid ""'
 "  # (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::"
@@ -2324,7 +2475,56 b' msgstr ""'
 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."
@@ -2343,10 +2543,9 b' msgid ""'
 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."
@@ -2385,10 +2584,10 b' 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
@@ -2454,15 +2653,15 b' msgstr "visa signerade \xc3\xa4ndringar"'
 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"
@@ -2485,8 +2684,8 b' 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"
@@ -2509,8 +2708,8 b' msgid "uncommitted merge - please provid'
 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"
@@ -2537,27 +2736,54 b' msgstr ""'
 "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"
@@ -2577,9 +2803,6 b' 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 ""
 
@@ -2707,6 +2930,12 b' 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 ""
 
@@ -2763,23 +2992,322 b' 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 ""
@@ -3425,11 +3953,23 b' msgstr ""'
 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"
@@ -3453,14 +3993,14 b' 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
@@ -3563,6 +4103,10 b' 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'"
 
@@ -3674,6 +4218,12 b' 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"
 
@@ -3748,7 +4298,7 b' msgstr ""'
 "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"
@@ -3763,10 +4313,35 b' msgstr ""'
 
 msgid ""
 "You will by default be managing a patch queue named \"patches\". You can\n"
-"create other, independent patch queues with the :hg:`qqueue` command.\n"
+"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"
@@ -3827,6 +4402,10 b' 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 ""
 
@@ -3858,16 +4437,22 b' 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 ""
 
@@ -3918,9 +4503,6 b' msgstr ""'
 msgid "uncommitted changes in subrepository %s"
 msgstr "oarkiverade ändringar i underarkivet %s"
 
-msgid "local changes found, refresh first"
-msgstr ""
-
 msgid "local changes found"
 msgstr ""
 
@@ -3944,6 +4526,9 b' msgstr "\\"%s\\" finns redan som katalog"'
 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"
 
@@ -3994,6 +4579,9 b' 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"
 
@@ -4039,6 +4627,12 b' 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 ""
 
@@ -4052,6 +4646,9 b' 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"
@@ -4064,8 +4661,8 b' msgstr ""'
 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"
@@ -4085,8 +4682,8 b' 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 ""
@@ -4107,6 +4704,9 b' 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 ""
 
@@ -4130,9 +4730,6 b' msgstr ""'
 msgid "revision %d is not mutable"
 msgstr ""
 
-msgid "see \"hg help phases\" for details"
-msgstr ""
-
 #, python-format
 msgid "cannot import merge revision %d"
 msgstr ""
@@ -4187,8 +4784,8 b' msgid ""'
 "    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]"
@@ -4235,11 +4832,11 b' msgstr "anv\xc3\xa4nd gits ut\xc3\xb6kade 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"
@@ -4396,19 +4993,19 b' 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)"
@@ -4416,9 +5013,6 b' msgstr "importera icke arkiverade \xc3\xa4ndringar (F\xc3\x96RLEGAD)"'
 msgid "add \"From: <current user>\" to patch"
 msgstr ""
 
-msgid "USER"
-msgstr ""
-
 msgid "add \"From: <USER>\" to patch"
 msgstr ""
 
@@ -4569,8 +5163,8 b' msgid "qfold requires at least one patch'
 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"
@@ -4580,9 +5174,15 b' msgstr ""'
 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 ""
 
@@ -4670,8 +5270,10 b' msgid "push the next patch onto the stac'
 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"
@@ -4697,9 +5299,16 b' msgid "pop the current patch off the sta'
 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
@@ -4784,11 +5393,17 b' msgstr "inga s\xc3\xa4kerhetskopior"'
 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 ""
@@ -4821,6 +5436,20 b' msgid ""'
 "    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"
 
@@ -5034,15 +5663,12 b' 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"
@@ -5085,15 +5711,15 b' msgid "hooks for sending email push noti'
 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 ""
@@ -5110,15 +5736,15 b' msgid ""'
 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 ""
@@ -5132,8 +5758,13 b' 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 ""
@@ -5142,14 +5773,8 b' msgid ""'
 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 ""
@@ -5165,20 +5790,26 b' 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"
@@ -5187,8 +5818,7 b' 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 ""
@@ -5203,29 +5833,31 b' 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 ""
@@ -5245,26 +5877,25 b' 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 ""
 
@@ -5311,20 +5942,6 b' msgid ""'
 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 ""
@@ -5456,6 +6073,9 b' msgstr ""'
 "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 ""
 
@@ -5574,7 +6194,9 b' 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 ""
@@ -5650,10 +6272,6 b' msgid ""'
 "    "
 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"
 
@@ -5675,7 +6293,7 b' msgid ""'
 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"
@@ -5698,11 +6316,11 b' 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"
@@ -5847,12 +6465,12 b' 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 ""
@@ -5899,8 +6517,8 b' 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"
@@ -5990,9 +6608,6 b' 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 ""
 
@@ -6008,12 +6623,6 b' 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 ""
 
@@ -6069,7 +6678,8 b' 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"
@@ -6090,6 +6700,10 b' 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 ""
 
@@ -6121,7 +6735,7 b' msgstr ""'
 msgid "%d hunks, %d lines changed\n"
 msgstr ""
 
-msgid "[Ynsfdaq?]"
+msgid "[Ynesfdaq?]"
 msgstr ""
 
 msgid "&Yes, record this change"
@@ -6130,6 +6744,9 b' msgstr ""'
 msgid "&No, skip this change"
 msgstr ""
 
+msgid "&Edit the change manually"
+msgstr ""
+
 msgid "&Skip remaining changes to this file"
 msgstr ""
 
@@ -6148,6 +6765,30 b' 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 ""
 
@@ -6188,7 +6829,8 b' msgstr ""'
 
 msgid ""
 "      y - record this change\n"
-"      n - skip this change"
+"      n - skip this change\n"
+"      e - edit this change manually"
 msgstr ""
 
 msgid ""
@@ -6284,9 +6926,6 b' 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"
@@ -6448,6 +7087,10 b' 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 ""
 
@@ -6465,10 +7108,6 b' 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 ""
 
@@ -6515,9 +7154,6 b' msgstr "inget s\xc3\xa5dant alternativ\\n"'
 msgid "pull patches from REPO"
 msgstr ""
 
-msgid "BRANCH"
-msgstr "GREN"
-
 msgid "pull patches from branch BRANCH"
 msgstr ""
 
@@ -6530,6 +7166,9 b' 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 ""
 
@@ -6577,7 +7216,7 b' msgid ""'
 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 ""
@@ -6590,6 +7229,11 b' msgid ""'
 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 ""
@@ -6753,7 +7397,7 b' msgid ""'
 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
@@ -6840,13 +7484,13 b' 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"
 
@@ -6854,7 +7498,7 b' 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"
@@ -6941,6 +7585,10 b' msgid "%s: not overwriting - %s collides'
 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 ""
 
@@ -7056,18 +7704,26 b' 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"
@@ -7077,6 +7733,22 b' msgstr "l\xc3\xa4gger till %s\\n"'
 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 ""
 
@@ -7116,6 +7788,26 b' msgstr "HG: inga \xc3\xa4ndrade 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"
 
@@ -7216,12 +7908,18 b' 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"
 
@@ -7328,7 +8026,9 b' msgid ""'
 "    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"
@@ -7337,7 +8037,8 b' msgstr ""'
 "    (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"
@@ -7580,10 +8281,6 b' msgstr "kan inte \xc3\xa5terkalla en \xc3\xa4ndring utan f\xc3\xb6r\xc3\xa4ldrar"'
 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"
 
@@ -7649,16 +8346,20 b' msgstr ""'
 
 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:"
@@ -7740,6 +8441,15 b' msgstr ""'
 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::"
 
@@ -7788,6 +8498,12 b' msgstr "(anv\xc3\xa4ndning av \'hg bisect <kmd>\' \xc3\xa4r f\xc3\xb6r\xc3\xa5ldrat)\\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"
@@ -7797,8 +8513,8 b' 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"
@@ -8100,12 +8816,12 b' 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"
 
@@ -8340,6 +9056,9 b' msgstr "m\xc3\xa4rk 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"
 
@@ -8378,6 +9097,26 b' msgstr ""'
 "    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 ""
@@ -8387,13 +9126,28 b' msgstr ""'
 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"
 
@@ -8691,15 +9445,15 b' 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"
@@ -8708,14 +9462,14 b' msgid " (check that you compiled the ext'
 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"
@@ -8727,14 +9481,14 b' msgstr " (specificera en arkiveringsedit'
 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"
@@ -8747,10 +9501,15 b' msgid "test whether node ids are known t'
 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]"
@@ -8768,6 +9527,25 b' msgid ""'
 "    "
 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"
 
@@ -8806,6 +9584,12 b' 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]"
 
@@ -8933,8 +9717,8 b' msgstr "diffa mot den andra f\xc3\xb6r\xc3\xa4ldern"'
 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"
@@ -9086,17 +9870,23 b' msgstr " - gl\xc3\xb6m 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"
@@ -9114,6 +9904,9 b' msgid ""'
 "    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"
@@ -9199,16 +9992,16 b' msgstr "ol\xc3\xb6sta konflikter, kan inte forts\xc3\xa4tta"'
 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"
 
@@ -9279,8 +10072,8 b' msgstr "visa bara aktiva grenhuvuden (F\xc3\x96RLEGAD)"'
 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"
@@ -9353,6 +10146,9 b' msgstr "visa bara hj\xc3\xa4lp f\xc3\xb6r ut\xc3\xb6kningar"'
 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]"
 
@@ -9367,8 +10163,7 b' 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"
@@ -9377,42 +10172,6 b' 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"
@@ -9447,6 +10206,9 b' msgstr "anv\xc3\xa4nd \\"hg help -e %s\\" f\xc3\xb6r att visa hj\xc3\xa4lp f\xc3\xb6r ut\xc3\xb6kningen %s"'
 msgid "options:"
 msgstr "flaggor:"
 
+msgid "global options:"
+msgstr "globala flaggor:"
+
 #, python-format
 msgid ""
 "\n"
@@ -9482,6 +10244,22 b' 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"
@@ -9505,6 +10283,12 b' msgstr ""'
 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"
 
@@ -9849,42 +10633,6 b' msgstr ""'
 "    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"
 
@@ -10019,6 +10767,13 b' 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"
 
@@ -10130,6 +10885,22 b' 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"
@@ -10137,13 +10908,13 b' msgstr "grenen \'%s\' har %d huvuden - sam'
 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"
 
@@ -10306,18 +11077,24 b' 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"
@@ -10401,13 +11178,6 b' msgstr ""'
 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"
@@ -10475,6 +11245,14 b' msgstr ""'
 "    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 ""
@@ -10744,24 +11522,24 b' 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"
@@ -10837,30 +11615,6 b' msgstr "oarkiverade \xc3\xa4ndringar, anv\xc3\xa4nd --all f\xc3\xb6r att kasta alla \xc3\xa4ndringar"'
 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"
 
@@ -10883,35 +11637,39 b' msgstr ""'
 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"
-"    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."
+"    ä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\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"
@@ -11033,9 +11791,6 b' msgstr ""'
 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"
@@ -11516,56 +12271,63 b' msgstr ""'
 "    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 ""
-"    The following rules apply when the working directory contains\n"
-"    uncommitted changes:"
-msgstr ""
-"    Följande regler gäller när arbetskatalogen innehåller oarkiverade\n"
-"    ändringar:"
-
-msgid ""
-"    1. If neither -c/--check nor -C/--clean is specified, and if\n"
-"       the requested changeset is an ancestor or descendant of\n"
-"       the working directory's parent, the uncommitted changes\n"
-"       are merged into the requested changeset and the merged\n"
-"       result is left uncommitted. If the requested changeset is\n"
-"       not an ancestor or descendant (that is, it is on another\n"
-"       branch), the update is aborted and the uncommitted changes\n"
-"       are preserved."
-msgstr ""
-"    1. Om varken -c/--check eller -C/--clean specificeras, och om den\n"
-"       begärda ändringen är en anfader eller ättling till arbetskatalogens\n"
-"       förälder, kommer oarkiverade ändringar att sammanfogas med den\n"
-"       begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n"
-"       Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n"
-"       en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n"
-"       bevaras."
-
-msgid ""
-"    2. With the -c/--check option, the update is aborted and the\n"
-"       uncommitted changes are preserved."
-msgstr ""
-"    2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n"
-"       ändringarna lämnas."
-
-msgid ""
-"    3. With the -C/--clean option, uncommitted changes are discarded and\n"
-"       the working directory is updated to the requested changeset."
-msgstr ""
-"    3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n"
-"       arbetskatalogen uppdateras till den begärda ändringen."
+"    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\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\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"
@@ -11631,6 +12393,14 b' msgstr "ok\xc3\xa4nt kommando %s"'
 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"
 
@@ -11855,11 +12625,23 b' 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 ""
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n"
 
 #, python-format
 msgid "** Python %s\n"
@@ -11873,6 +12655,9 b' msgstr ""'
 msgid "** Extensions loaded: %s\n"
 msgstr ""
 
+msgid "too few arguments for command alias"
+msgstr ""
+
 #, python-format
 msgid "no definition for alias '%s'\n"
 msgstr ""
@@ -11915,7 +12700,7 b' msgid ""'
 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
@@ -11938,6 +12723,17 b' msgid ""'
 "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 ""
@@ -11966,16 +12762,64 b' msgstr ""'
 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 ""
@@ -11986,14 +12830,6 b' msgid ""'
 "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 ""
 
@@ -12180,6 +13016,18 b' msgstr ""'
 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 ""
 
@@ -12224,6 +13072,19 b' msgstr "d\xc3\xa5lig (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"
 
@@ -12260,8 +13121,8 b' msgstr "Anv\xc3\xa4ndning 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"
@@ -12272,8 +13133,8 b' 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"
@@ -12334,7 +13195,7 b' msgid ""'
 "ones."
 msgstr ""
 
-msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgid "| (All) ``<repo>/.hg/hgrc``"
 msgstr ""
 
 msgid ""
@@ -12342,12 +13203,13 b' msgid ""'
 "    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"
@@ -12365,6 +13227,8 b' msgid ""'
 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 ""
@@ -12377,6 +13241,8 b' msgid ""'
 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 ""
@@ -12403,9 +13269,7 b' msgid ""'
 "    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 ""
@@ -12590,7 +13454,7 b' msgid ""'
 "run arbitrary commands. As an example, ::"
 msgstr ""
 
-msgid "   echo = !echo"
+msgid "   echo = !echo $@"
 msgstr ""
 
 msgid ""
@@ -12607,11 +13471,19 b' msgid ""'
 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 ""
 
@@ -13005,33 +13877,6 b' 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 ""
@@ -13067,164 +13912,43 b' msgid ""'
 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 ""
@@ -13463,6 +14187,33 b' 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 ""
@@ -13501,47 +14252,160 b' msgid ""'
 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 ""
@@ -13624,16 +14488,39 b' msgid ""'
 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 ""
 
@@ -13649,6 +14536,12 b' msgid ""'
 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"
@@ -13686,6 +14579,12 b' msgid ""'
 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"
@@ -13693,21 +14592,69 b' msgid ""'
 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/"
@@ -13716,7 +14663,10 b' 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 ""
@@ -13857,6 +14807,12 b' msgid ""'
 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."
@@ -14043,7 +14999,27 b' msgid ""'
 "    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 ""
@@ -14056,31 +15032,22 b' msgid ""'
 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."
@@ -14139,6 +15106,15 b' msgid ""'
 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."
@@ -14858,7 +15834,7 b' msgstr ""'
 
 msgid ""
 "Close changeset\n"
-"    See 'Changeset, close'."
+"    See 'Head, closed branch'"
 msgstr ""
 
 msgid ""
@@ -14969,6 +15945,13 b' msgid ""'
 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 ""
@@ -14999,6 +15982,11 b' msgid ""'
 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 ""
@@ -15099,6 +16087,19 b' msgid " Example: \\"You will need to p'
 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"
@@ -15173,6 +16174,12 b' msgid ""'
 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"
@@ -15276,6 +16283,13 b' msgid ""'
 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"
@@ -15316,6 +16330,12 b' msgid ""'
 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 ""
@@ -15342,21 +16362,22 b' 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"
@@ -15367,83 +16388,82 b' msgstr ""'
 "  - 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 ""
@@ -15497,44 +16517,7 b' msgid ""'
 "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 ""
@@ -15660,6 +16643,12 b' msgid "Alternate pattern notations must '
 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."
@@ -15771,7 +16760,7 b' 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 ""
@@ -15873,6 +16862,12 b' msgstr " - visa en lista med \xc3\xa4ndringsrevision 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 ""
@@ -15909,22 +16904,21 b' msgstr ""'
 "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"
@@ -16129,7 +17123,8 b' msgid ""'
 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 ""
@@ -16159,7 +17154,8 b' msgid ""'
 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"
@@ -16496,6 +17492,9 b' msgstr "uppdaterar arbetskatalog\\n"'
 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"
@@ -16559,8 +17558,12 b' msgid "cannot start server at \'%s:%d\': %'
 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"
@@ -16616,6 +17619,10 b' msgstr ""'
 msgid "warning: %s hook %s\n"
 msgstr ""
 
+#, python-format
+msgid "loading %s hook failed:\n"
+msgstr ""
+
 msgid "kb"
 msgstr "kb"
 
@@ -16708,14 +17715,6 b' 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 ""
 
@@ -16777,12 +17776,16 b' msgid "cannot partially commit a merge ('
 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!"
 
@@ -16792,12 +17795,15 b' 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"
@@ -16817,10 +17823,24 b' 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"
@@ -16865,8 +17885,8 b' msgstr " (%+d huvuden)"'
 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 ""
@@ -16884,6 +17904,9 b' msgstr "str\xc3\xb6mmar alla \xc3\xa4ndringar\\n"'
 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"
@@ -17024,6 +18047,10 b' msgstr "h\xc3\xa4mtar %s till %s\\n"'
 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 ""
 
@@ -17071,6 +18098,24 b' 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 ""
 
@@ -17130,11 +18175,16 b' msgstr ""'
 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
@@ -17145,6 +18195,10 b' msgid "undefined source and destination '
 msgstr ""
 
 #, python-format
+msgid "failed to synchronize metadata for \"%s\""
+msgstr ""
+
+#, python-format
 msgid "cannot create %s: destination already exists"
 msgstr ""
 
@@ -17164,6 +18218,13 b' 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 ""
 
@@ -17172,6 +18233,10 b' msgid "ignoring unexpected root from rem'
 msgstr ""
 
 #, python-format
+msgid "phases.new-commit: not a valid phase name ('%s')"
+msgstr ""
+
+#, python-format
 msgid "exited with status %d"
 msgstr ""
 
@@ -17187,6 +18252,10 b' 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"
 
@@ -17195,7 +18264,7 b' msgid "strip failed, partial bundle stor'
 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
@@ -17298,7 +18367,8 b' msgid ""'
 "    - ``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"
@@ -17309,6 +18379,13 b' msgid ""'
 "    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"
@@ -17317,6 +18394,10 b' msgstr "bookmark tar ett eller inga argu'
 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 "
@@ -17325,6 +18406,13 b' msgid ""'
 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 ""
@@ -17346,7 +18434,19 b' 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"
@@ -17372,6 +18472,15 b' msgid ""'
 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 ""
@@ -17380,6 +18489,35 b' 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 ""
@@ -17392,6 +18530,14 b' msgid ""'
 "    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"
@@ -17399,13 +18545,6 b' msgid ""'
 "    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``."
@@ -17430,6 +18569,23 b' msgstr "grep kr\xc3\xa4ver en str\xc3\xa4ng"'
 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."
@@ -17539,6 +18695,24 b' 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."
@@ -17578,6 +18752,12 b' msgid ""'
 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 ""
@@ -17631,13 +18811,60 b' 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 ""
@@ -17676,6 +18903,10 b' msgstr "sort-spec m\xc3\xa5ste vara en str\xc3\xa4ng"'
 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."
@@ -17689,11 +18920,27 b' msgstr "tag tar ett eller inga argument"'
 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"
 
@@ -17701,6 +18948,10 b' 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"
 
@@ -17739,6 +18990,9 b' msgstr ""'
 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 ""
@@ -17899,6 +19153,10 b' 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 ""
 
@@ -17971,6 +19229,10 b' 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 ""
 
@@ -17980,10 +19242,22 b' msgstr "kan inte h\xc3\xa4mta version p\xc3\xa5 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"
@@ -18010,14 +19284,14 b' msgstr "trycker grenen %s fr\xc3\xa5n 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 ""
@@ -18109,7 +19383,26 b' msgid ""'
 "    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 ""
@@ -18160,7 +19453,12 b' msgid ""'
 "    \"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."
@@ -18248,6 +19546,13 b' 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'"
@@ -18301,12 +19606,12 b' 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"
@@ -18324,8 +19629,8 b' 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\")"
@@ -18341,10 +19646,7 b' msgid "unrecognized response\\n"'
 msgstr ""
 
 msgid "password: "
-msgstr ""
-
-msgid "edit failed"
-msgstr ""
+msgstr "lösenord: "
 
 msgid "http authorization required"
 msgstr "http-autenticiering krävs"