i18n/sv.po
changeset 9768 93eb1d05b8a6
parent 9556 6aece8fc7f3c
child 9776 f1ed441ab8e9
--- a/i18n/sv.po	Sun Oct 25 12:47:48 2009 +0100
+++ b/i18n/sv.po	Sun Oct 25 12:49:25 2009 +0100
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-08-18 20:47+0200\n"
+"POT-Creation-Date: 2009-10-25 12:38+0100\n"
 "PO-Revision-Date: 2009-08-21 19:38+0200\n"
 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -43,6 +43,466 @@
 msgstr ""
 
 msgid ""
+"Some commands allow the user to specify a date, e.g.:\n"
+"\n"
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date.\n"
+"\n"
+"Many date formats are valid. Here are some examples::\n"
+"\n"
+"  \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+"  \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+"  \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+"  \"Dec 6\" (midnight)\n"
+"  \"13:18\" (today assumed)\n"
+"  \"3:39\" (3:39AM assumed)\n"
+"  \"3:39pm\" (15:39)\n"
+"  \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"  \"2006-12-6 13:18\"\n"
+"  \"2006-12-6\"\n"
+"  \"12-6\"\n"
+"  \"12/6\"\n"
+"  \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"Lastly, there is Mercurial's internal format::\n"
+"\n"
+"  \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC).\n"
+"\n"
+"The log command also accepts date ranges::\n"
+"\n"
+"  \"<{datetime}\" - at or before a given date/time\n"
+"  \">{datetime}\" - on or after a given date/time\n"
+"  \"{datetime} to {datetime}\" - a date range, inclusive\n"
+"  \"-{days}\" - within a given number of days of today\n"
+msgstr ""
+
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools.\n"
+"\n"
+"While this standard format is often enough, it does not encode the\n"
+"following information:\n"
+"\n"
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files\n"
+"\n"
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format.\n"
+"\n"
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with \"hg export\"), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes.\n"
+"\n"
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your hgrc. You do not need to set this option when\n"
+"importing diffs in this format or using them in the mq extension.\n"
+msgstr ""
+
+msgid ""
+"HG\n"
+"    Path to the 'hg' executable, automatically passed when running\n"
+"    hooks, extensions or external tools. If unset or empty, this is\n"
+"    the hg executable's name if it's frozen, or an executable named\n"
+"    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+"    Windows) is searched.\n"
+"\n"
+"HGEDITOR\n"
+"    This is the name of the editor to run when committing. See EDITOR.\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"HGENCODING\n"
+"    This overrides the default locale setting detected by Mercurial.\n"
+"    This setting is used to convert data including usernames,\n"
+"    changeset descriptions, tag names, and branches. This setting can\n"
+"    be overridden with the --encoding command-line option.\n"
+"\n"
+"HGENCODINGMODE\n"
+"    This sets Mercurial's behavior for handling unknown characters\n"
+"    while transcoding user input. The default is \"strict\", which\n"
+"    causes Mercurial to abort if it can't map a character. Other\n"
+"    settings include \"replace\", which replaces unknown characters, and\n"
+"    \"ignore\", which drops them. This setting can be overridden with\n"
+"    the --encodingmode command-line option.\n"
+"\n"
+"HGMERGE\n"
+"    An executable to use for resolving merge conflicts. The program\n"
+"    will be executed with three arguments: local file, remote file,\n"
+"    ancestor file.\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"HGRCPATH\n"
+"    A list of files or directories to search for hgrc files. Item\n"
+"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
+"    platform default search path is used. If empty, only the .hg/hgrc\n"
+"    from the current repository is read.\n"
+"\n"
+"    For each element in HGRCPATH:\n"
+"\n"
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
+"    This is the string used as the author of a commit. If not set,\n"
+"    available values will be considered in this order:\n"
+"\n"
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with '@hostname' appended)\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"EMAIL\n"
+"    May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"LOGNAME\n"
+"    May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"VISUAL\n"
+"    This is the name of the editor to use when committing. See EDITOR.\n"
+"\n"
+"EDITOR\n"
+"    Sometimes Mercurial needs to open a text file in an editor for a\n"
+"    user to modify, for example when writing commit messages. The\n"
+"    editor it uses is determined by looking at the environment\n"
+"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+"    non-empty one is chosen. If all of them are empty, the editor\n"
+"    defaults to 'vi'.\n"
+"\n"
+"PYTHONPATH\n"
+"    This is used by Python to find imported modules and may need to be\n"
+"    set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks.\n"
+"\n"
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed.\n"
+"\n"
+"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"the Python search path, create an entry for it in your hgrc, like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  foo =\n"
+"\n"
+"You may also specify the full path to an extension::\n"
+"\n"
+"  [extensions]\n"
+"  myfeature = ~/.hgext/myfeature.py\n"
+"\n"
+"To explicitly disable an extension enabled in an hgrc of broader\n"
+"scope, prepend its path with !::\n"
+"\n"
+"  [extensions]\n"
+"  # disabling extension bar residing in /path/to/extension/bar.py\n"
+"  hgext.bar = !/path/to/extension/bar.py\n"
+"  # ditto, but no path was supplied for extension baz\n"
+"  hgext.baz = !\n"
+msgstr ""
+
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character.\n"
+"\n"
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
+"\n"
+"If BEGIN is greater than END, revisions are treated in reverse order.\n"
+"\n"
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time.\n"
+"\n"
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns.\n"
+"\n"
+"Alternate pattern notations must be specified explicitly.\n"
+"\n"
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root.\n"
+"\n"
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``.\n"
+"\n"
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\".\n"
+"\n"
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository.\n"
+"\n"
+"Plain examples::\n"
+"\n"
+"  path:foo/bar   a name bar in a directory named foo in the root\n"
+"                 of the repository\n"
+"  path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"Glob examples::\n"
+"\n"
+"  glob:*.c       any name ending in \".c\" in the current directory\n"
+"  *.c            any name ending in \".c\" in the current directory\n"
+"  **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                 current directory including itself.\n"
+"  foo/*.c        any name ending in \".c\" in the directory foo\n"
+"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                 including itself.\n"
+"\n"
+"Regexp examples::\n"
+"\n"
+"  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+
+msgid ""
+"Mercurial supports several ways to specify individual revisions.\n"
+"\n"
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth.\n"
+"\n"
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier.\n"
+"\n"
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier.\n"
+"\n"
+"Any other string is treated as a tag or branch name. A tag name is a\n"
+"symbolic name associated with a revision identifier. A branch name\n"
+"denotes the tipmost revision of that branch. Tag and branch names must\n"
+"not contain the \":\" character.\n"
+"\n"
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision.\n"
+"\n"
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0.\n"
+"\n"
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+
+msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style).\n"
+"\n"
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog.\n"
+"\n"
+"Three styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact and changelog.\n"
+"Usage::\n"
+"\n"
+"    $ hg log -r1 --style changelog\n"
+"\n"
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::\n"
+"\n"
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:\n"
+"\n"
+":author:    String. The unmodified author of the changeset.\n"
+":branches:  String. The name of the branch on which the changeset\n"
+"            was committed. Will be empty if the branch name was\n"
+"            default.\n"
+":date:      Date information. The date when the changeset was\n"
+"            committed.\n"
+":desc:      String. The text of the changeset description.\n"
+":diffstat:  String. Statistics of changes with the following\n"
+"            format: \"modified files: +added/-removed lines\"\n"
+":files:     List of strings. All files modified, added, or removed\n"
+"            by this changeset.\n"
+":file_adds: List of strings. Files added by this changeset.\n"
+":file_mods: List of strings. Files modified by this changeset.\n"
+":file_dels: List of strings. Files removed by this changeset.\n"
+":node:      String. The changeset identification hash, as a\n"
+"            40-character hexadecimal string.\n"
+":parents:   List of strings. The parents of the changeset.\n"
+":rev:       Integer. The repository-local changeset revision\n"
+"            number.\n"
+":tags:      List of strings. Any tags associated with the\n"
+"            changeset.\n"
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+"            changeset.\n"
+":latesttagdistance: Integer. Longest path to the latest tag.\n"
+"\n"
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. You can also use a chain of filters to get the desired\n"
+"output::\n"
+"\n"
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000\n"
+"\n"
+"List of filters:\n"
+"\n"
+":addbreaks:   Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"              every line except the last.\n"
+":age:         Date. Returns a human-readable date/time difference\n"
+"              between the given date/time and the current\n"
+"              date/time.\n"
+":basename:    Any text. Treats the text as a path, and returns the\n"
+"              last component of the path after splitting by the\n"
+"              path separator (ignoring trailing separators). For\n"
+"              example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
+"              becomes \"bar\".\n"
+":stripdir:    Treat the text as path and strip a directory level,\n"
+"              if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+"              \"foo\".\n"
+":date:        Date. Returns a date in a Unix date format, including\n"
+"              the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+":domain:      Any text. Finds the first string that looks like an\n"
+"              email address, and extracts just the domain\n"
+"              component. Example: 'User <user@example.com>' becomes\n"
+"              'example.com'.\n"
+":email:       Any text. Extracts the first string that looks like\n"
+"              an email address. Example: 'User <user@example.com>'\n"
+"              becomes 'user@example.com'.\n"
+":escape:      Any text. Replaces the special XML/XHTML characters\n"
+"              \"&\", \"<\" and \">\" with XML entities.\n"
+":fill68:      Any text. Wraps the text to fit in 68 columns.\n"
+":fill76:      Any text. Wraps the text to fit in 76 columns.\n"
+":firstline:   Any text. Returns the first line of text.\n"
+":nonempty:    Any text. Returns '(none)' if the string is empty.\n"
+":hgdate:      Date. Returns the date as a pair of numbers:\n"
+"              \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
+":isodate:     Date. Returns the date in ISO 8601 format:\n"
+"              \"2009-08-18 13:00 +0200\".\n"
+":isodatesec:  Date. Returns the date in ISO 8601 format, including\n"
+"              seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+"              rfc3339date filter.\n"
+":localdate:   Date. Converts a date to local date.\n"
+":obfuscate:   Any text. Returns the input text rendered as a\n"
+"              sequence of XML entities.\n"
+":person:      Any text. Returns the text before an email address.\n"
+":rfc822date:  Date. Returns a date using the same format used in\n"
+"              email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+"              specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+":short:       Changeset hash. Returns the short form of a changeset\n"
+"              hash, i.e. a 12-byte hexadecimal string.\n"
+":shortdate:   Date. Returns a date like \"2006-09-18\".\n"
+":strip:       Any text. Strips all leading and trailing whitespace.\n"
+":tabindent:   Any text. Returns the text, with every line except\n"
+"              the first starting with a tab character.\n"
+":urlescape:   Any text. Escapes all \"special\" characters. For\n"
+"              example, \"foo bar\" becomes \"foo%20bar\".\n"
+":user:        Any text. Returns the user portion of an email\n"
+"              address.\n"
+msgstr ""
+
+msgid ""
+"Valid URLs are of the form::\n"
+"\n"
+"  local/filesystem/path[#revision]\n"
+"  file://local/filesystem/path[#revision]\n"
+"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
+"\n"
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"incoming --bundle').\n"
+"\n"
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also 'hg help\n"
+"revisions'.\n"
+"\n"
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server.\n"
+"\n"
+"Some notes about using SSH with Mercurial:\n"
+"\n"
+"- SSH requires an accessible shell account on the destination machine\n"
+"  and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+"  an extra slash at the start of a path to specify an absolute path::\n"
+"\n"
+"    ssh://example.com//tmp/repository\n"
+"\n"
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+"  to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
+"    Host *.mylocalnetwork.example.com\n"
+"      Compression no\n"
+"    Host *\n"
+"      Compression yes\n"
+"\n"
+"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
+"  with the --ssh command line option.\n"
+"\n"
+"These URLs can all be stored in your hgrc with path aliases under the\n"
+"[paths] section like so::\n"
+"\n"
+"  [paths]\n"
+"  alias1 = URL1\n"
+"  alias2 = URL2\n"
+"  ...\n"
+"\n"
+"You can then use the alias for any command that uses a URL (for\n"
+"example 'hg pull alias1' would pull from the 'alias1' path).\n"
+"\n"
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:\n"
+"\n"
+"default:\n"
+"  When you create a repository with hg clone, the clone command saves\n"
+"  the location of the source repository as the new repository's\n"
+"  'default' path. This is then used when you omit path from push- and\n"
+"  pull-like commands (including incoming and outgoing).\n"
+"\n"
+"default-push:\n"
+"  The push command will look for a path named 'default-push', and\n"
+"  prefer it over 'default' if both are defined.\n"
+msgstr ""
+
+msgid ""
 "hooks for controlling repository access\n"
 "\n"
 "This hook makes it possible to allow or deny write access to portions\n"
@@ -91,37 +551,13 @@
 msgstr ""
 
 #, python-format
-msgid "acl: %s not enabled\n"
-msgstr ""
-
-#, python-format
-msgid "acl: %s enabled, %d entries for user %s\n"
-msgstr ""
-
-#, python-format
 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
 msgstr ""
 
 #, python-format
-msgid "acl: changes have source \"%s\" - skipping\n"
-msgstr ""
-
-#, python-format
-msgid "acl: user %s denied on %s\n"
-msgstr ""
-
-#, python-format
 msgid "acl: access denied for changeset %s"
 msgstr ""
 
-#, python-format
-msgid "acl: user %s not allowed on %s\n"
-msgstr ""
-
-#, python-format
-msgid "acl: allowing changeset %s\n"
-msgstr ""
-
 msgid ""
 "track a line of development with movable markers\n"
 "\n"
@@ -469,10 +905,6 @@
 "    "
 msgstr ""
 
-#, python-format
-msgid "assuming %i character terminal\n"
-msgstr ""
-
 msgid "count rate for the specified revision or range"
 msgstr ""
 
@@ -546,7 +978,8 @@
 msgid "when to colorize (always, auto, or never)"
 msgstr "när färgläggning ska ske (always, auto eller never)"
 
-msgid "don't colorize output"
+#, fuzzy
+msgid "don't colorize output (DEPRECATED)"
 msgstr "färglägg inte utmatning"
 
 #, python-format
@@ -683,23 +1116,8 @@
 "    converted, and that any directory reorganization in the CVS\n"
 "    sandbox is ignored.\n"
 "\n"
-"    Because CVS does not have changesets, it is necessary to collect\n"
-"    individual commits to CVS and merge them into changesets. CVS\n"
-"    source uses its internal changeset merging code by default but can\n"
-"    be configured to call the external 'cvsps' program by setting::\n"
-"\n"
-"      --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
-"\n"
-"    This option is deprecated and will be removed in Mercurial 1.4.\n"
-"\n"
 "    The options shown are the defaults.\n"
 "\n"
-"    Internal cvsps is selected by setting ::\n"
-"\n"
-"      --config convert.cvsps=builtin\n"
-"\n"
-"    and has a few more configurable options:\n"
-"\n"
 "    --config convert.cvsps.cache=True         (boolean)\n"
 "        Set to False to disable remote log caching, for testing and\n"
 "        debugging purposes.\n"
@@ -719,9 +1137,10 @@
 "        add the most recent revision on the branch indicated in the\n"
 "        regex as the second parent of the changeset.\n"
 "\n"
-"    The hgext/convert/cvsps wrapper script allows the builtin\n"
+"    An additional \"debugcvsps\" Mercurial command allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
-"    parameters and output are similar to that of cvsps 2.1.\n"
+"    parameters and output are similar to that of cvsps 2.1. Please see\n"
+"    the command help for more details.\n"
 "\n"
 "    Subversion Source\n"
 "    -----------------\n"
@@ -884,10 +1303,6 @@
 msgstr ""
 
 #, python-format
-msgid "running: %s\n"
-msgstr ""
-
-#, python-format
 msgid "%s error:\n"
 msgstr ""
 
@@ -965,16 +1380,8 @@
 msgid "--sourcesort is not supported by this data source"
 msgstr ""
 
-msgid ""
-"warning: support for external cvsps is deprecated and will be removed in "
-"Mercurial 1.4\n"
-msgstr ""
-
-#, python-format
-msgid "revision %s is not a patchset number or date"
-msgstr ""
-
-msgid "using builtin cvsps\n"
+#, python-format
+msgid "revision %s is not a patchset number"
 msgstr ""
 
 #, python-format
@@ -1020,10 +1427,6 @@
 msgid "running %s\n"
 msgstr ""
 
-#, python-format
-msgid "prefix=%r directory=%r root=%r\n"
-msgstr ""
-
 msgid "RCS file must be followed by working file"
 msgstr ""
 
@@ -1037,10 +1440,6 @@
 msgstr ""
 
 #, python-format
-msgid "found synthetic revision in %s: %r\n"
-msgstr ""
-
-#, python-format
 msgid "writing cvs log cache %s\n"
 msgstr ""
 
@@ -1071,10 +1470,6 @@
 msgid "Python ElementTree module is not available"
 msgstr ""
 
-#, python-format
-msgid "cleaning up %s\n"
-msgstr ""
-
 msgid "internal calling inconsistency"
 msgstr ""
 
@@ -1109,22 +1504,6 @@
 msgstr ""
 
 #, python-format
-msgid "applying revision %s...\n"
-msgstr ""
-
-#, python-format
-msgid "computing changeset between %s and %s...\n"
-msgstr ""
-
-#, python-format
-msgid "obtaining revision %s...\n"
-msgstr ""
-
-#, python-format
-msgid "analyzing revision %s...\n"
-msgstr ""
-
-#, python-format
 msgid "could not parse cat-log of %s"
 msgstr ""
 
@@ -1136,12 +1515,6 @@
 msgid "initializing destination %s repository\n"
 msgstr ""
 
-msgid "run hg sink pre-conversion action\n"
-msgstr ""
-
-msgid "run hg sink post-conversion action\n"
-msgstr ""
-
 #, python-format
 msgid "pulling from %s into %s\n"
 msgstr ""
@@ -1160,12 +1533,6 @@
 msgid "ignoring: %s\n"
 msgstr ""
 
-msgid "run hg source pre-conversion action\n"
-msgstr ""
-
-msgid "run hg source post-conversion action\n"
-msgstr ""
-
 #, python-format
 msgid "%s does not look like a monotone repo"
 msgstr ""
@@ -1180,6 +1547,9 @@
 msgid "collecting p4 changelists\n"
 msgstr ""
 
+msgid "Mercurial failed to run itself, check hg executable is in PATH"
+msgstr ""
+
 msgid "Subversion python bindings could not be loaded"
 msgstr ""
 
@@ -1230,69 +1600,22 @@
 msgstr ""
 
 #, python-format
-msgid "ignoring foreign branch %r\n"
-msgstr ""
-
-#, python-format
 msgid "%s not found up to revision %d"
 msgstr ""
 
 #, python-format
-msgid "branch renamed from %s to %s at %d\n"
-msgstr ""
-
-#, python-format
-msgid "reparent to %s\n"
-msgstr ""
-
-#, python-format
-msgid "copied to %s from %s@%s\n"
-msgstr ""
-
-#, python-format
-msgid "gone from %s\n"
-msgstr ""
-
-#, python-format
-msgid "entry %s\n"
-msgstr ""
-
-#, python-format
-msgid "unknown path in revision %d: %s\n"
-msgstr ""
-
-#, python-format
-msgid "mark %s came from %s:%d\n"
-msgstr ""
-
-#, python-format
-msgid "parsing revision %d (%d changes)\n"
-msgstr ""
-
-#, python-format
 msgid "found parent of branch %s at %d: %s\n"
 msgstr ""
 
-msgid "no copyfrom path, don't know what to do.\n"
-msgstr ""
-
 #, python-format
 msgid "fetching revision log for \"%s\" from %d to %d\n"
 msgstr ""
 
 #, python-format
-msgid "revision %d has no entries\n"
-msgstr ""
-
-#, python-format
 msgid "svn: branch has no revision %s"
 msgstr ""
 
 #, python-format
-msgid "%r is not under %r, ignoring\n"
-msgstr ""
-
-#, python-format
 msgid "initializing svn repo %r\n"
 msgstr ""
 
@@ -1357,14 +1680,6 @@
 msgid "cannot specify --rev and --change at the same time"
 msgstr ""
 
-#, python-format
-msgid "running %r in %s\n"
-msgstr ""
-
-#, python-format
-msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
-msgstr ""
-
 msgid "cleaning up temp directory\n"
 msgstr ""
 
@@ -1669,12 +1984,6 @@
 msgid "email.from must be defined when sending by email"
 msgstr ""
 
-msgid "cia: no user specified"
-msgstr ""
-
-msgid "cia: no project specified"
-msgstr ""
-
 msgid ""
 "browse the repository in a graphical way\n"
 "\n"
@@ -1834,9 +2143,6 @@
 msgid "(found dead inotify server socket; removing it)\n"
 msgstr ""
 
-msgid "(starting inotify server)\n"
-msgstr ""
-
 #, python-format
 msgid "could not start inotify server: %s\n"
 msgstr ""
@@ -1845,9 +2151,6 @@
 msgid "could not talk to new inotify server: %s\n"
 msgstr ""
 
-msgid "(inotify server not running)\n"
-msgstr ""
-
 #, python-format
 msgid "failed to contact inotify server: %s\n"
 msgstr ""
@@ -2117,12 +2420,6 @@
 "\tkeywords expanded\n"
 msgstr ""
 
-#, python-format
-msgid ""
-"\n"
-"removing temporary repository %s\n"
-msgstr ""
-
 msgid ""
 "expand keywords in the working directory\n"
 "\n"
@@ -2145,15 +2442,13 @@
 "    See \"hg help keyword\" on how to construct patterns both for\n"
 "    inclusion and exclusion of files.\n"
 "\n"
-"    Use -u/--untracked to list untracked files as well.\n"
-"\n"
-"    With -a/--all and -v/--verbose the codes used to show the status\n"
+"    With -A/--all and -v/--verbose the codes used to show the status\n"
 "    of files are::\n"
 "\n"
 "      K = keyword expansion candidate\n"
-"      k = keyword expansion candidate (untracked)\n"
+"      k = keyword expansion candidate (not tracked)\n"
 "      I = ignored\n"
-"      i = ignored (untracked)\n"
+"      i = ignored (not tracked)\n"
 "    "
 msgstr ""
 
@@ -2185,7 +2480,15 @@
 msgid "show files excluded from expansion"
 msgstr ""
 
-msgid "additionally show untracked files"
+#, fuzzy
+msgid "only show unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+#, fuzzy
+msgid "show keyword status flags of all files (DEPRECATED)"
+msgstr "visa status för alla filer"
+
+msgid "only show untracked files (DEPRECATED)"
 msgstr ""
 
 msgid "hg kwfiles [OPTION]... [FILE]..."
@@ -2212,7 +2515,6 @@
 "\n"
 "  print patch series                        qseries\n"
 "  print applied patches                     qapplied\n"
-"  print name of top applied patch           qtop\n"
 "\n"
 "  add known patch to applied stack          qpush\n"
 "  remove patch from applied stack           qpop\n"
@@ -2235,10 +2537,6 @@
 msgstr ""
 
 #, python-format
-msgid "active guards: %s\n"
-msgstr ""
-
-#, python-format
 msgid "guard %r too short"
 msgstr ""
 
@@ -2569,9 +2867,15 @@
 msgid "print the patches already applied"
 msgstr ""
 
+msgid "only one patch applied\n"
+msgstr ""
+
 msgid "print the patches not yet applied"
 msgstr ""
 
+msgid "all patches applied\n"
+msgstr ""
+
 msgid ""
 "import a patch\n"
 "\n"
@@ -2655,15 +2959,9 @@
 msgid "print the name of the next patch"
 msgstr ""
 
-msgid "all patches applied\n"
-msgstr ""
-
 msgid "print the name of the previous patch"
 msgstr ""
 
-msgid "only one patch applied\n"
-msgstr ""
-
 msgid ""
 "create a new patch\n"
 "\n"
@@ -2965,7 +3263,11 @@
 msgid "print first line of patch header"
 msgstr ""
 
-msgid "hg qapplied [-s] [PATCH]"
+#, fuzzy
+msgid "show only the last patch"
+msgstr "visa bara adderade filer"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
 msgstr ""
 
 msgid "use pull protocol to copy metadata"
@@ -3082,7 +3384,7 @@
 msgid "queue name to pop"
 msgstr ""
 
-msgid "forget any local changes"
+msgid "forget any local changes to patched files"
 msgstr ""
 
 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
@@ -3187,7 +3489,11 @@
 msgid "hg qtop [-s]"
 msgstr ""
 
-msgid "hg qunapplied [-s] [PATCH]"
+#, fuzzy
+msgid "show only the first patch"
+msgstr "visa bara adderade filer"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
 msgstr ""
 
 msgid "finish all applied changesets"
@@ -3236,6 +3542,7 @@
 "  sources = serve        # notify if source of incoming changes in this "
 "list\n"
 "                         # (serve == ssh or http, push, pull, bundle)\n"
+"  merge = False          # send notification for merges (default True)\n"
 "  [email]\n"
 "  from = user@host.com   # email address to send as if none given\n"
 "  [web]\n"
@@ -3284,11 +3591,7 @@
 msgstr ""
 
 #, python-format
-msgid "notify: no subscribers to repository %s\n"
-msgstr ""
-
-#, python-format
-msgid "notify: changes have source \"%s\" - skipping\n"
+msgid "notify: suppressing notification for merge %d:%s\n"
 msgstr ""
 
 msgid ""
@@ -3411,6 +3714,10 @@
 "hgrc(5) for details.\n"
 msgstr ""
 
+#, python-format
+msgid "%sPlease enter a valid value"
+msgstr ""
+
 msgid "Please enter a valid value.\n"
 msgstr ""
 
@@ -3544,6 +3851,9 @@
 msgid "message identifier to reply to"
 msgstr ""
 
+msgid "flags to add in subject prefixes"
+msgstr ""
+
 msgid "email addresses of recipients"
 msgstr ""
 
@@ -3646,9 +3956,6 @@
 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 
-msgid "first revision, do not change ancestor\n"
-msgstr ""
-
 msgid ""
 "move changeset (and descendants) to a different branch\n"
 "\n"
@@ -3692,60 +3999,17 @@
 msgid "%d revisions have been skipped\n"
 msgstr ""
 
-msgid " set parents\n"
-msgstr ""
-
-#, python-format
-msgid "rebasing %d:%s\n"
-msgstr ""
-
-#, python-format
-msgid " future parents are %d and %d\n"
-msgstr ""
-
-#, python-format
-msgid " update to %d:%s\n"
-msgstr ""
-
-msgid " already in target\n"
-msgstr ""
-
-#, python-format
-msgid " merge against %d:%s\n"
-msgstr ""
-
 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
 msgstr ""
 
-msgid "resuming interrupted rebase\n"
-msgstr ""
-
 #, python-format
 msgid "no changes, revision %d skipped\n"
 msgstr ""
 
 #, python-format
-msgid "next revision set to %s\n"
-msgstr ""
-
-#, python-format
 msgid "cannot use revision %d as base, result would have 3 parents"
 msgstr ""
 
-#, python-format
-msgid "revision %d is an mq patch (%s), finalize it.\n"
-msgstr ""
-
-#, python-format
-msgid "import mq patch %d (%s)\n"
-msgstr ""
-
-msgid "rebase status stored\n"
-msgstr ""
-
-msgid "rebase status resumed\n"
-msgstr ""
-
 msgid "no rebase in progress"
 msgstr ""
 
@@ -3758,28 +4022,15 @@
 msgid "cannot rebase onto an applied mq patch"
 msgstr ""
 
-msgid "cannot rebase an ancestor"
-msgstr ""
-
-msgid "cannot rebase a descendant"
-msgstr ""
-
-msgid "already working on current\n"
-msgstr ""
-
-msgid "already working on the current branch\n"
-msgstr ""
-
-#, python-format
-msgid "rebase onto %d starting from %d\n"
+msgid "source is ancestor of destination"
+msgstr ""
+
+msgid "source is descendant of destination"
 msgstr ""
 
 msgid "unable to collapse, there is more than one external parent"
 msgstr ""
 
-msgid "--update and --rebase are not compatible, ignoring the update flag\n"
-msgstr ""
-
 msgid "rebase working directory to branch head"
 msgstr ""
 
@@ -3792,13 +4043,14 @@
 msgid "rebase onto a given revision"
 msgstr ""
 
-msgid "collapse the rebased revisions"
-msgstr ""
-
-msgid "keep original revisions"
-msgstr ""
-
-msgid "keep original branches"
+#, fuzzy
+msgid "collapse the rebased changesets"
+msgstr "visa ändring"
+
+msgid "keep original changesets"
+msgstr ""
+
+msgid "keep original branch names"
 msgstr ""
 
 msgid "continue an interrupted rebase"
@@ -3911,20 +4163,9 @@
 msgid "no changes to record\n"
 msgstr ""
 
-#, python-format
-msgid "backup %r as %r\n"
-msgstr ""
-
-msgid "applying patch\n"
-msgstr ""
-
 msgid "patch failed to apply"
 msgstr ""
 
-#, python-format
-msgid "restoring %r to %r\n"
-msgstr ""
-
 msgid "hg record [OPTION]... [FILE]..."
 msgstr ""
 
@@ -4137,10 +4378,6 @@
 msgid "[win32mbcs] cannot activate on this platform.\n"
 msgstr ""
 
-#, python-format
-msgid "[win32mbcs] activated with encoding: %s\n"
-msgstr ""
-
 msgid ""
 "perform automatic newline conversion\n"
 "\n"
@@ -4701,10 +4938,6 @@
 msgstr ""
 
 #, python-format
-msgid "cannot find executable: %s"
-msgstr ""
-
-#, python-format
 msgid "failed to execute %s"
 msgstr ""
 
@@ -5323,23 +5556,25 @@
 "\n"
 "    With no arguments, show all repository head changesets.\n"
 "\n"
-"    Repository \"heads\" are changesets that don't have child\n"
-"    changesets. They are where development generally takes place and\n"
-"    are the usual targets for update and merge operations.\n"
+"    Repository \"heads\" are changesets with no child changesets. They are\n"
+"    where development generally takes place and are the usual targets\n"
+"    for update and merge operations.\n"
 "\n"
 "    If one or more REV is given, the \"branch heads\" will be shown for\n"
-"    the named branch associated with that revision. The name of the\n"
-"    branch is called the revision's branch tag.\n"
-"\n"
-"    Branch heads are revisions on a given named branch that do not have\n"
-"    any descendants on the same branch. A branch head could be a true head\n"
-"    or it could be the last changeset on a branch before a new branch\n"
-"    was created. If none of the branch heads are true heads, the branch\n"
-"    is considered inactive. If -c/--closed is specified, also show branch\n"
-"    heads marked closed (see hg commit --close-branch).\n"
-"\n"
-"    If STARTREV is specified only those heads (or branch heads) that\n"
-"    are descendants of STARTREV will be displayed.\n"
+"    the named branch associated with the specified changeset(s).\n"
+"\n"
+"    Branch heads are changesets on a named branch with no descendants on\n"
+"    the same branch. A branch head could be a \"true\" (repository) head,\n"
+"    or it could be the last changeset on that branch before it was\n"
+"    merged into another branch, or it could be the last changeset on the\n"
+"    branch before a new branch was created. If none of the branch heads\n"
+"    are true heads, the branch is considered inactive.\n"
+"\n"
+"    If -c/--closed is specified, also show branch heads marked closed\n"
+"    (see hg commit --close-branch).\n"
+"\n"
+"    If STARTREV is specified, only those heads that are descendants of\n"
+"    STARTREV will be displayed.\n"
 "    "
 msgstr ""
 
@@ -5503,12 +5738,6 @@
 msgid "no diffs found"
 msgstr ""
 
-#, python-format
-msgid ""
-"message:\n"
-"%s\n"
-msgstr ""
-
 msgid "not a Mercurial patch"
 msgstr ""
 
@@ -5774,8 +6003,7 @@
 "    See 'hg help urls' for more information.\n"
 "    "
 msgstr ""
-"dra ändringar från den specificerade källan"
-"\n"
+"dra ändringar från den specificerade källan\n"
 "    Drar ändringar från ett annat arkiv till ett lokalt.\n"
 "\n"
 "    Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
@@ -5813,8 +6041,7 @@
 "    URLs. If DESTINATION is omitted, a default path will be used.\n"
 "    "
 msgstr ""
-"tryck ändringar till den specificerade destinationen"
-"\n"
+"tryck ändringar till den specificerade destinationen\n"
 "    Trycker ändringar från det lokala arkivet till den givna destinationen.\n"
 "\n"
 "    Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
@@ -5879,13 +6106,15 @@
 "\n"
 "    Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
 "    projektets historik. -A/--after kan användas för att bara ta bort filer\n"
-"    som redan raderats, -f/--force kan användas för att tvinga radering, och\n"
+"    som redan raderats, -f/--force kan användas för att tvinga radering, "
+"och\n"
 "    -Af kan ta bort filer från nästa revision utan att radera dem från\n"
 "    arbetskopian.\n"
 "\n"
 "    Följande tabell visar hur remove uppför sig för olika filstatus\n"
 "    (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
-"    Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n"
+"    Modifierad [M] och Saknad [!] (som rapporteras av hg status). "
+"Aktionerna\n"
 "    är Varna, Radera (från gren) och Ta bort (från disk)::\n"
 "\n"
 "             A  C  M  !\n"
@@ -6131,7 +6360,8 @@
 "    Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
 "    inte bes om explicit med -u/--unknown eller -i/--ignored.\n"
 "\n"
-"    NOTERA: status kan verka osams med diff om tillstånd har ändrat eller en\n"
+"    NOTERA: status kan verka osams med diff om tillstånd har ändrat eller "
+"en\n"
 "    sammanfogning har utförts. Det vanliga diff-formatet rapporterar inte\n"
 "    förändringar av tillstånd och diff rapporterar bara ändringar relativt\n"
 "    till en förälder vid sammanfogningar.\n"
@@ -6149,6 +6379,100 @@
 "    "
 
 msgid ""
+"summarize working directory state\n"
+"\n"
+"    This generates a brief summary of the working directory state,\n"
+"    including parents, branch, commit status, and available updates.\n"
+"\n"
+"    With the --remote option, this will check the default paths for\n"
+"    incoming and outgoing changes. This can be time-consuming.\n"
+"    "
+msgstr ""
+
+msgid " (empty repository)"
+msgstr ""
+
+msgid " (no revision checked out)"
+msgstr ""
+
+#, python-format
+msgid "parent: %d:%s %s\n"
+msgstr ""
+
+#, python-format
+msgid "branch: %s\n"
+msgstr ""
+
+#, python-format
+msgid "%d added"
+msgstr ""
+
+#, python-format
+msgid "%d modified"
+msgstr ""
+
+#, python-format
+msgid "%d removed"
+msgstr ""
+
+#, python-format
+msgid "%d deleted"
+msgstr ""
+
+#, python-format
+msgid "%d ignored"
+msgstr ""
+
+#, python-format
+msgid "%d unknown"
+msgstr ""
+
+#, python-format
+msgid "%d unresolved"
+msgstr ""
+
+msgid " (merge)"
+msgstr ""
+
+msgid " (new branch)"
+msgstr ""
+
+msgid " (clean)"
+msgstr ""
+
+msgid " (new branch head)"
+msgstr ""
+
+#, python-format
+msgid "commit: %s\n"
+msgstr ""
+
+msgid "update: (current)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "update: %d new changesets (update)\n"
+msgstr "uppdatera till ny topp om ändringar drogs"
+
+#, python-format
+msgid "update: %d new changesets, %d branch heads (merge)\n"
+msgstr ""
+
+msgid "1 or more incoming"
+msgstr ""
+
+#, python-format
+msgid "%d outgoing"
+msgstr ""
+
+#, python-format
+msgid "remote: %s\n"
+msgstr ""
+
+msgid "remote: (synced)\n"
+msgstr ""
+
+msgid ""
 "add one or more tags for the current or given revision\n"
 "\n"
 "    Name a particular revision using <name>.\n"
@@ -6273,7 +6597,8 @@
 "    kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n"
 "    revisionen. Alternativt, använd -c/--check för att avbryta.\n"
 "\n"
-"    När det finns oarkiverade ändringar och flaggan -C/--clean inte används,\n"
+"    När det finns oarkiverade ändringar och flaggan -C/--clean inte "
+"används,\n"
 "    och föräldrarevisionen och den begärda revisionen är på samma gren, och\n"
 "    en av dem är en anfäder till den andre, kommer arbetskatalogen att\n"
 "    innehålla den begärda revisionen sammanfogad med de oarkiverade\n"
@@ -6285,6 +6610,9 @@
 "    Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
 "    "
 
+msgid "cannot specify both -c/--check and -C/--clean"
+msgstr ""
+
 msgid "uncommitted local changes"
 msgstr ""
 
@@ -6314,7 +6642,8 @@
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-msgid "repository root directory or symbolic path name"
+#, fuzzy
+msgid "repository root directory or name of overlay bundle file"
 msgstr "arkivrotkatalog eller symbolisk sökväg"
 
 msgid "change working directory"
@@ -6633,7 +6962,8 @@
 msgstr ""
 
 msgid "follow changeset history, or file history across copies and renames"
-msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
+msgstr ""
+"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
 
 msgid "ignore case when matching"
 msgstr ""
@@ -6889,6 +7219,9 @@
 msgid "[-u] [NAME]..."
 msgstr ""
 
+msgid "check for push and pull"
+msgstr ""
+
 msgid "show status of all files"
 msgstr "visa status för alla filer"
 
@@ -6965,36 +7298,6 @@
 msgid "branch name not in UTF-8!"
 msgstr ""
 
-#, python-format
-msgid "  searching for copies back to rev %d\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"  unmatched files in local:\n"
-"   %s\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"  unmatched files in other:\n"
-"   %s\n"
-msgstr ""
-
-msgid "  all copies found (* = to merge, ! = divergent):\n"
-msgstr ""
-
-msgid "  checking for directory renames\n"
-msgstr ""
-
-#, python-format
-msgid "  dir %s -> %s\n"
-msgstr ""
-
-#, python-format
-msgid "  file %s -> %s\n"
-msgstr ""
-
 msgid "working directory state appears damaged!"
 msgstr ""
 
@@ -7041,16 +7344,16 @@
 msgstr ""
 
 #, python-format
+msgid "hg: %s\n"
+msgstr ""
+
+#, python-format
 msgid ""
 "hg: command '%s' is ambiguous:\n"
 "    %s\n"
 msgstr ""
 
 #, python-format
-msgid "hg: %s\n"
-msgstr ""
-
-#, python-format
 msgid "timed out waiting for lock held by %s"
 msgstr ""
 
@@ -7146,10 +7449,6 @@
 msgstr ""
 
 #, python-format
-msgid "alias '%s' shadows command\n"
-msgstr ""
-
-#, python-format
 msgid "malformed --config option: %s"
 msgstr ""
 
@@ -7213,10 +7512,6 @@
 msgstr ""
 
 #, python-format
-msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
-msgstr ""
-
-#, python-format
 msgid ""
 " no tool found to merge %s\n"
 "keep (l)ocal or take (o)ther?"
@@ -7237,13 +7532,6 @@
 msgstr ""
 
 #, python-format
-msgid "my %s other %s ancestor %s\n"
-msgstr ""
-
-msgid " premerge successful\n"
-msgstr ""
-
-#, python-format
 msgid ""
 " output file %s appears unchanged\n"
 "was merge successful (yn)?"
@@ -7267,510 +7555,33 @@
 msgid "unknown bisect kind %s"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial has the ability to add new features through the use of\n"
-"    extensions. Extensions may add new commands, add options to\n"
-"    existing commands, change the default behavior of commands, or\n"
-"    implement hooks.\n"
-"\n"
-"    Extensions are not loaded by default for a variety of reasons:\n"
-"    they can increase startup overhead; they may be meant for advanced\n"
-"    usage only; they may provide potentially dangerous abilities (such\n"
-"    as letting you destroy or modify history); they might not be ready\n"
-"    for prime time; or they may alter some usual behaviors of stock\n"
-"    Mercurial. It is thus up to the user to activate extensions as\n"
-"    needed.\n"
-"\n"
-"    To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"    the Python search path, create an entry for it in your hgrc, like\n"
-"    this::\n"
-"\n"
-"      [extensions]\n"
-"      foo =\n"
-"\n"
-"    You may also specify the full path to an extension::\n"
-"\n"
-"      [extensions]\n"
-"      myfeature = ~/.hgext/myfeature.py\n"
-"\n"
-"    To explicitly disable an extension enabled in an hgrc of broader\n"
-"    scope, prepend its path with !::\n"
-"\n"
-"      [extensions]\n"
-"      # disabling extension bar residing in /path/to/extension/bar.py\n"
-"      hgext.bar = !/path/to/extension/bar.py\n"
-"      # ditto, but no path was supplied for extension baz\n"
-"      hgext.baz = !\n"
-"    "
-msgstr ""
-
 msgid "disabled extensions:"
 msgstr ""
 
 msgid "Date Formats"
 msgstr ""
 
-msgid ""
-"\n"
-"    Some commands allow the user to specify a date, e.g.:\n"
-"\n"
-"    - backout, commit, import, tag: Specify the commit date.\n"
-"    - log, revert, update: Select revision(s) by date.\n"
-"\n"
-"    Many date formats are valid. Here are some examples::\n"
-"\n"
-"      \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"      \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"      \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"      \"Dec 6\" (midnight)\n"
-"      \"13:18\" (today assumed)\n"
-"      \"3:39\" (3:39AM assumed)\n"
-"      \"3:39pm\" (15:39)\n"
-"      \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"      \"2006-12-6 13:18\"\n"
-"      \"2006-12-6\"\n"
-"      \"12-6\"\n"
-"      \"12/6\"\n"
-"      \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Lastly, there is Mercurial's internal format::\n"
-"\n"
-"      \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
-"\n"
-"    This is the internal representation format for dates. unixtime is\n"
-"    the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
-"    offset is the offset of the local timezone, in seconds west of UTC\n"
-"    (negative if the timezone is east of UTC).\n"
-"\n"
-"    The log command also accepts date ranges::\n"
-"\n"
-"      \"<{datetime}\" - at or before a given date/time\n"
-"      \">{datetime}\" - on or after a given date/time\n"
-"      \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"      \"-{days}\" - within a given number of days of today\n"
-"    "
-msgstr ""
-
 msgid "File Name Patterns"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial accepts several notations for identifying one or more\n"
-"    files at a time.\n"
-"\n"
-"    By default, Mercurial treats filenames as shell-style extended\n"
-"    glob patterns.\n"
-"\n"
-"    Alternate pattern notations must be specified explicitly.\n"
-"\n"
-"    To use a plain path name without any pattern matching, start it\n"
-"    with \"path:\". These path names must completely match starting at\n"
-"    the current repository root.\n"
-"\n"
-"    To use an extended glob, start a name with \"glob:\". Globs are\n"
-"    rooted at the current directory; a glob such as \"``*.c``\" will\n"
-"    only match files in the current directory ending with \".c\".\n"
-"\n"
-"    The supported glob syntax extensions are \"``**``\" to match any\n"
-"    string across path separators and \"{a,b}\" to mean \"a or b\".\n"
-"\n"
-"    To use a Perl/Python regular expression, start a name with \"re:\".\n"
-"    Regexp pattern matching is anchored at the root of the repository.\n"
-"\n"
-"    Plain examples::\n"
-"\n"
-"      path:foo/bar   a name bar in a directory named foo in the root\n"
-"                     of the repository\n"
-"      path:path:name a file or directory named \"path:name\"\n"
-"\n"
-"    Glob examples::\n"
-"\n"
-"      glob:*.c       any name ending in \".c\" in the current directory\n"
-"      *.c            any name ending in \".c\" in the current directory\n"
-"      **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                     current directory including itself.\n"
-"      foo/*.c        any name ending in \".c\" in the directory foo\n"
-"      foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                     including itself.\n"
-"\n"
-"    Regexp examples::\n"
-"\n"
-"      re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
-"\n"
-"    "
-msgstr ""
-
 msgid "Environment Variables"
 msgstr ""
 
-msgid ""
-"\n"
-"HG\n"
-"    Path to the 'hg' executable, automatically passed when running\n"
-"    hooks, extensions or external tools. If unset or empty, this is\n"
-"    the hg executable's name if it's frozen, or an executable named\n"
-"    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
-"    Windows) is searched.\n"
-"\n"
-"HGEDITOR\n"
-"    This is the name of the editor to run when committing. See EDITOR.\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"HGENCODING\n"
-"    This overrides the default locale setting detected by Mercurial.\n"
-"    This setting is used to convert data including usernames,\n"
-"    changeset descriptions, tag names, and branches. This setting can\n"
-"    be overridden with the --encoding command-line option.\n"
-"\n"
-"HGENCODINGMODE\n"
-"    This sets Mercurial's behavior for handling unknown characters\n"
-"    while transcoding user input. The default is \"strict\", which\n"
-"    causes Mercurial to abort if it can't map a character. Other\n"
-"    settings include \"replace\", which replaces unknown characters, and\n"
-"    \"ignore\", which drops them. This setting can be overridden with\n"
-"    the --encodingmode command-line option.\n"
-"\n"
-"HGMERGE\n"
-"    An executable to use for resolving merge conflicts. The program\n"
-"    will be executed with three arguments: local file, remote file,\n"
-"    ancestor file.\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"HGRCPATH\n"
-"    A list of files or directories to search for hgrc files. Item\n"
-"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-"    platform default search path is used. If empty, only the .hg/hgrc\n"
-"    from the current repository is read.\n"
-"\n"
-"    For each element in HGRCPATH:\n"
-"\n"
-"    - if it's a directory, all files ending with .rc are added\n"
-"    - otherwise, the file itself will be added\n"
-"\n"
-"HGUSER\n"
-"    This is the string used as the author of a commit. If not set,\n"
-"    available values will be considered in this order:\n"
-"\n"
-"    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
-"    - EMAIL\n"
-"    - interactive prompt\n"
-"    - LOGNAME (with '@hostname' appended)\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"EMAIL\n"
-"    May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"LOGNAME\n"
-"    May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"VISUAL\n"
-"    This is the name of the editor to use when committing. See EDITOR.\n"
-"\n"
-"EDITOR\n"
-"    Sometimes Mercurial needs to open a text file in an editor for a\n"
-"    user to modify, for example when writing commit messages. The\n"
-"    editor it uses is determined by looking at the environment\n"
-"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-"    non-empty one is chosen. If all of them are empty, the editor\n"
-"    defaults to 'vi'.\n"
-"\n"
-"PYTHONPATH\n"
-"    This is used by Python to find imported modules and may need to be\n"
-"    set appropriately if this Mercurial is not installed system-wide.\n"
-"    "
-msgstr ""
-
 msgid "Specifying Single Revisions"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial supports several ways to specify individual revisions.\n"
-"\n"
-"    A plain integer is treated as a revision number. Negative integers\n"
-"    are treated as sequential offsets from the tip, with -1 denoting\n"
-"    the tip, -2 denoting the revision prior to the tip, and so forth.\n"
-"\n"
-"    A 40-digit hexadecimal string is treated as a unique revision\n"
-"    identifier.\n"
-"\n"
-"    A hexadecimal string less than 40 characters long is treated as a\n"
-"    unique revision identifier and is referred to as a short-form\n"
-"    identifier. A short-form identifier is only valid if it is the\n"
-"    prefix of exactly one full-length identifier.\n"
-"\n"
-"    Any other string is treated as a tag or branch name. A tag name is\n"
-"    a symbolic name associated with a revision identifier. A branch\n"
-"    name denotes the tipmost revision of that branch. Tag and branch\n"
-"    names must not contain the \":\" character.\n"
-"\n"
-"    The reserved name \"tip\" is a special tag that always identifies\n"
-"    the most recent revision.\n"
-"\n"
-"    The reserved name \"null\" indicates the null revision. This is the\n"
-"    revision of an empty repository, and the parent of revision 0.\n"
-"\n"
-"    The reserved name \".\" indicates the working directory parent. If\n"
-"    no working directory is checked out, it is equivalent to null. If\n"
-"    an uncommitted merge is in progress, \".\" is the revision of the\n"
-"    first parent.\n"
-"    "
-msgstr ""
-
 msgid "Specifying Multiple Revisions"
 msgstr ""
 
-msgid ""
-"\n"
-"    When Mercurial accepts more than one revision, they may be\n"
-"    specified individually, or provided as a topologically continuous\n"
-"    range, separated by the \":\" character.\n"
-"\n"
-"    The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
-"    are revision identifiers. Both BEGIN and END are optional. If\n"
-"    BEGIN is not specified, it defaults to revision number 0. If END\n"
-"    is not specified, it defaults to the tip. The range \":\" thus means\n"
-"    \"all revisions\".\n"
-"\n"
-"    If BEGIN is greater than END, revisions are treated in reverse\n"
-"    order.\n"
-"\n"
-"    A range acts as a closed interval. This means that a range of 3:5\n"
-"    gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
-"    "
-msgstr ""
-
 msgid "Diff Formats"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial's default format for showing changes between two\n"
-"    versions of a file is compatible with the unified format of GNU\n"
-"    diff, which can be used by GNU patch and many other standard\n"
-"    tools.\n"
-"\n"
-"    While this standard format is often enough, it does not encode the\n"
-"    following information:\n"
-"\n"
-"    - executable status and other permission bits\n"
-"    - copy or rename information\n"
-"    - changes in binary files\n"
-"    - creation or deletion of empty files\n"
-"\n"
-"    Mercurial also supports the extended diff format from the git VCS\n"
-"    which addresses these limitations. The git diff format is not\n"
-"    produced by default because a few widespread tools still do not\n"
-"    understand this format.\n"
-"\n"
-"    This means that when generating diffs from a Mercurial repository\n"
-"    (e.g. with \"hg export\"), you should be careful about things like\n"
-"    file copies and renames or other things mentioned above, because\n"
-"    when applying a standard diff to a different repository, this\n"
-"    extra information is lost. Mercurial's internal operations (like\n"
-"    push and pull) are not affected by this, because they use an\n"
-"    internal binary format for communicating changes.\n"
-"\n"
-"    To make Mercurial produce the git extended diff format, use the\n"
-"    --git option available for many commands, or set 'git = True' in\n"
-"    the [diff] section of your hgrc. You do not need to set this\n"
-"    option when importing diffs in this format or using them in the mq\n"
-"    extension.\n"
-"    "
-msgstr ""
-
 msgid "Template Usage"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial allows you to customize output of commands through\n"
-"    templates. You can either pass in a template from the command\n"
-"    line, via the --template option, or select an existing\n"
-"    template-style (--style).\n"
-"\n"
-"    You can customize output for any \"log-like\" command: log,\n"
-"    outgoing, incoming, tip, parents, heads and glog.\n"
-"\n"
-"    Three styles are packaged with Mercurial: default (the style used\n"
-"    when no explicit preference is passed), compact and changelog.\n"
-"    Usage::\n"
-"\n"
-"        $ hg log -r1 --style changelog\n"
-"\n"
-"    A template is a piece of text, with markup to invoke variable\n"
-"    expansion::\n"
-"\n"
-"        $ hg log -r1 --template \"{node}\\n\"\n"
-"        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
-"\n"
-"    Strings in curly braces are called keywords. The availability of\n"
-"    keywords depends on the exact context of the templater. These\n"
-"    keywords are usually available for templating a log-like command:\n"
-"\n"
-"    :author:    String. The unmodified author of the changeset.\n"
-"    :branches:  String. The name of the branch on which the changeset\n"
-"                was committed. Will be empty if the branch name was\n"
-"                default.\n"
-"    :date:      Date information. The date when the changeset was\n"
-"                committed.\n"
-"    :desc:      String. The text of the changeset description.\n"
-"    :diffstat:  String. Statistics of changes with the following\n"
-"                format: \"modified files: +added/-removed lines\"\n"
-"    :files:     List of strings. All files modified, added, or removed\n"
-"                by this changeset.\n"
-"    :file_adds: List of strings. Files added by this changeset.\n"
-"    :file_mods: List of strings. Files modified by this changeset.\n"
-"    :file_dels: List of strings. Files removed by this changeset.\n"
-"    :node:      String. The changeset identification hash, as a\n"
-"                40-character hexadecimal string.\n"
-"    :parents:   List of strings. The parents of the changeset.\n"
-"    :rev:       Integer. The repository-local changeset revision\n"
-"                number.\n"
-"    :tags:      List of strings. Any tags associated with the\n"
-"                changeset.\n"
-"\n"
-"    The \"date\" keyword does not produce human-readable output. If you\n"
-"    want to use a date in your output, you can use a filter to process\n"
-"    it. Filters are functions which return a string based on the input\n"
-"    variable. You can also use a chain of filters to get the desired\n"
-"    output::\n"
-"\n"
-"       $ hg tip --template \"{date|isodate}\\n\"\n"
-"       2008-08-21 18:22 +0000\n"
-"\n"
-"    List of filters:\n"
-"\n"
-"    :addbreaks:  Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"                 every line except the last.\n"
-"    :age:        Date. Returns a human-readable date/time difference\n"
-"                 between the given date/time and the current\n"
-"                 date/time.\n"
-"    :basename:   Any text. Treats the text as a path, and returns the\n"
-"                 last component of the path after splitting by the\n"
-"                 path separator (ignoring trailing separators). For\n"
-"                 example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
-"                 becomes \"bar\".\n"
-"    :stripdir:   Treat the text as path and strip a directory level,\n"
-"                 if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
-"                 \"foo\".\n"
-"    :date:       Date. Returns a date in a Unix date format, including\n"
-"                 the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-"    :domain:     Any text. Finds the first string that looks like an\n"
-"                 email address, and extracts just the domain\n"
-"                 component. Example: 'User <user@example.com>' becomes\n"
-"                 'example.com'.\n"
-"    :email:      Any text. Extracts the first string that looks like\n"
-"                 an email address. Example: 'User <user@example.com>'\n"
-"                 becomes 'user@example.com'.\n"
-"    :escape:     Any text. Replaces the special XML/XHTML characters\n"
-"                 \"&\", \"<\" and \">\" with XML entities.\n"
-"    :fill68:     Any text. Wraps the text to fit in 68 columns.\n"
-"    :fill76:     Any text. Wraps the text to fit in 76 columns.\n"
-"    :firstline:  Any text. Returns the first line of text.\n"
-"    :nonempty:   Any text. Returns '(none)' if the string is empty.\n"
-"    :hgdate:     Date. Returns the date as a pair of numbers:\n"
-"                 \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-"    :isodate:    Date. Returns the date in ISO 8601 format.\n"
-"    :localdate:  Date. Converts a date to local date.\n"
-"    :obfuscate:  Any text. Returns the input text rendered as a\n"
-"                 sequence of XML entities.\n"
-"    :person:     Any text. Returns the text before an email address.\n"
-"    :rfc822date: Date. Returns a date using the same format used in\n"
-"                 email headers.\n"
-"    :short:      Changeset hash. Returns the short form of a changeset\n"
-"                 hash, i.e. a 12-byte hexadecimal string.\n"
-"    :shortdate:  Date. Returns a date like \"2006-09-18\".\n"
-"    :strip:      Any text. Strips all leading and trailing whitespace.\n"
-"    :tabindent:  Any text. Returns the text, with every line except\n"
-"                 the first starting with a tab character.\n"
-"    :urlescape:  Any text. Escapes all \"special\" characters. For\n"
-"                 example, \"foo bar\" becomes \"foo%20bar\".\n"
-"    :user:       Any text. Returns the user portion of an email\n"
-"                 address.\n"
-"    "
-msgstr ""
-
 msgid "URL Paths"
 msgstr ""
 
-msgid ""
-"\n"
-"    Valid URLs are of the form::\n"
-"\n"
-"      local/filesystem/path[#revision]\n"
-"      file://local/filesystem/path[#revision]\n"
-"      http://[user[:pass]@]host[:port]/[path][#revision]\n"
-"      https://[user[:pass]@]host[:port]/[path][#revision]\n"
-"      ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
-"\n"
-"    Paths in the local filesystem can either point to Mercurial\n"
-"    repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
-"    incoming --bundle').\n"
-"\n"
-"    An optional identifier after # indicates a particular branch, tag,\n"
-"    or changeset to use from the remote repository. See also 'hg help\n"
-"    revisions'.\n"
-"\n"
-"    Some features, such as pushing to http:// and https:// URLs are\n"
-"    only possible if the feature is explicitly enabled on the remote\n"
-"    Mercurial server.\n"
-"\n"
-"    Some notes about using SSH with Mercurial:\n"
-"\n"
-"    - SSH requires an accessible shell account on the destination\n"
-"      machine and a copy of hg in the remote path or specified with as\n"
-"      remotecmd.\n"
-"    - path is relative to the remote user's home directory by default.\n"
-"      Use an extra slash at the start of a path to specify an absolute\n"
-"      path::\n"
-"\n"
-"        ssh://example.com//tmp/repository\n"
-"\n"
-"    - Mercurial doesn't use its own compression via SSH; the right\n"
-"      thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
-"\n"
-"        Host *.mylocalnetwork.example.com\n"
-"          Compression no\n"
-"        Host *\n"
-"          Compression yes\n"
-"\n"
-"      Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
-"      or with the --ssh command line option.\n"
-"\n"
-"    These URLs can all be stored in your hgrc with path aliases under\n"
-"    the [paths] section like so::\n"
-"\n"
-"      [paths]\n"
-"      alias1 = URL1\n"
-"      alias2 = URL2\n"
-"      ...\n"
-"\n"
-"    You can then use the alias for any command that uses a URL (for\n"
-"    example 'hg pull alias1' would pull from the 'alias1' path).\n"
-"\n"
-"    Two path aliases are special because they are used as defaults\n"
-"    when you do not provide the URL to a command:\n"
-"\n"
-"    default:\n"
-"      When you create a repository with hg clone, the clone command\n"
-"      saves the location of the source repository as the new\n"
-"      repository's 'default' path. This is then used when you omit\n"
-"      path from push- and pull-like commands (including incoming and\n"
-"      outgoing).\n"
-"\n"
-"    default-push:\n"
-"      The push command will look for a path named 'default-push', and\n"
-"      prefer it over 'default' if both are defined.\n"
-"    "
-msgstr ""
-
 msgid "Using additional features"
 msgstr ""
 
@@ -7803,27 +7614,20 @@
 msgid "clone from remote to remote not supported"
 msgstr ""
 
-msgid "updated"
-msgstr ""
-
-msgid "merged"
-msgstr ""
-
-msgid "removed"
-msgstr ""
-
-msgid "unresolved"
-msgstr ""
-
-#, python-format
-msgid "%d files %s"
+#, python-format
+msgid "updating to branch %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
 msgstr ""
 
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr ""
 
 msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
 "abandon\n"
 msgstr ""
 
@@ -7899,32 +7703,12 @@
 msgid "unsupported URL component: \"%s\""
 msgstr ""
 
-#, python-format
-msgid "using %s\n"
-msgstr ""
-
-#, python-format
-msgid "capabilities: %s\n"
-msgstr ""
-
 msgid "operation not supported over http"
 msgstr ""
 
-#, python-format
-msgid "sending %s command\n"
-msgstr ""
-
-#, python-format
-msgid "sending %s bytes\n"
-msgstr ""
-
 msgid "authorization failed"
 msgstr ""
 
-#, python-format
-msgid "http error while sending %s command\n"
-msgstr ""
-
 msgid "http error, possibly caused by proxy setting"
 msgstr ""
 
@@ -7933,10 +7717,6 @@
 msgstr ""
 
 #, python-format
-msgid "requested URL: '%s'\n"
-msgstr ""
-
-#, python-format
 msgid "'%s' does not appear to be an hg repository"
 msgstr ""
 
@@ -8009,10 +7789,6 @@
 msgid "unknown revision '%s'"
 msgstr ""
 
-#, python-format
-msgid "filtering %s through %s\n"
-msgstr ""
-
 msgid "journal already exists - run hg recover"
 msgstr ""
 
@@ -8044,14 +7820,6 @@
 msgid "working directory of %s"
 msgstr ""
 
-#, python-format
-msgid " %s: searching for copy revision for %s\n"
-msgstr ""
-
-#, python-format
-msgid " %s: copy %s:%s\n"
-msgstr ""
-
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr ""
 
@@ -8116,41 +7884,6 @@
 msgid "searching for changes\n"
 msgstr ""
 
-#, python-format
-msgid "examining %s:%s\n"
-msgstr ""
-
-msgid "branch already found\n"
-msgstr ""
-
-#, python-format
-msgid "found incomplete branch %s:%s\n"
-msgstr ""
-
-#, python-format
-msgid "found new changeset %s\n"
-msgstr ""
-
-#, python-format
-msgid "request %d: %s\n"
-msgstr ""
-
-#, python-format
-msgid "received %s:%s\n"
-msgstr ""
-
-#, python-format
-msgid "narrowing %d:%d %s\n"
-msgstr ""
-
-#, python-format
-msgid "found new branch changeset %s\n"
-msgstr ""
-
-#, python-format
-msgid "narrowed branch search to %s:%s\n"
-msgstr ""
-
 msgid "already have changeset "
 msgstr ""
 
@@ -8160,16 +7893,6 @@
 msgid "repository is unrelated"
 msgstr ""
 
-msgid "found new changesets starting at "
-msgstr ""
-
-#, python-format
-msgid "%d total queries\n"
-msgstr ""
-
-msgid "common changesets up to "
-msgstr ""
-
 msgid "requesting all changes\n"
 msgstr ""
 
@@ -8195,17 +7918,10 @@
 msgid "%d changesets found\n"
 msgstr ""
 
-msgid "list of changesets:\n"
-msgstr ""
-
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr ""
 
-#, python-format
-msgid "add changeset %s\n"
-msgstr ""
-
 msgid "adding changesets\n"
 msgstr ""
 
@@ -8218,10 +7934,6 @@
 msgid "adding file changes\n"
 msgstr ""
 
-#, python-format
-msgid "adding %s revisions\n"
-msgstr ""
-
 msgid "received file revlog group is empty"
 msgstr ""
 
@@ -8233,9 +7945,6 @@
 msgid "added %d changesets with %d changes to %d files%s\n"
 msgstr ""
 
-msgid "updating the branch cache\n"
-msgstr ""
-
 msgid "Unexpected response from remote server:"
 msgstr ""
 
@@ -8256,10 +7965,6 @@
 msgstr ""
 
 #, python-format
-msgid "adding %s (%s)\n"
-msgstr ""
-
-#, python-format
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr ""
 
@@ -8340,14 +8045,6 @@
 msgstr ""
 
 #, python-format
-msgid " overwrite %s partial %s\n"
-msgstr ""
-
-#, python-format
-msgid " ancestor %s local %s remote %s\n"
-msgstr ""
-
-#, python-format
 msgid ""
 " local changed %s which remote deleted\n"
 "use (c)hanged version or (d)elete?"
@@ -8369,10 +8066,6 @@
 msgstr ""
 
 #, python-format
-msgid "preserving %s for resolve of %s\n"
-msgstr ""
-
-#, python-format
 msgid "update failed to remove %s: %s!\n"
 msgstr ""
 
@@ -8419,13 +8112,6 @@
 msgstr ""
 
 #, python-format
-msgid "found patch at byte %d\n"
-msgstr ""
-
-msgid "patch generated by hg export\n"
-msgstr ""
-
-#, python-format
 msgid "unable to find '%s' for patching\n"
 msgstr ""
 
@@ -8496,10 +8182,6 @@
 msgstr ""
 
 #, python-format
-msgid "no valid hunks found; trying with %r instead\n"
-msgstr ""
-
-#, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
 msgstr ""
 
@@ -8512,13 +8194,6 @@
 msgstr ""
 
 #, python-format
-msgid "stopped by signal %d"
-msgstr ""
-
-msgid "invalid exit code"
-msgstr ""
-
-#, python-format
 msgid "saving bundle to %s\n"
 msgstr ""
 
@@ -8589,12 +8264,12 @@
 msgid "could not create remote repo"
 msgstr ""
 
+msgid "no suitable response from remote hg"
+msgstr ""
+
 msgid "remote: "
 msgstr ""
 
-msgid "no suitable response from remote hg"
-msgstr ""
-
 #, python-format
 msgid "push refused: %s"
 msgstr ""
@@ -8612,17 +8287,6 @@
 msgid "invalid entry in fncache, line %s"
 msgstr ""
 
-msgid "scanning\n"
-msgstr ""
-
-#, python-format
-msgid "%d files, %d bytes to transfer\n"
-msgstr ""
-
-#, python-format
-msgid "sending %s (%d bytes)\n"
-msgstr ""
-
 #, python-format
 msgid ""
 " subrepository sources for %s differ\n"
@@ -8766,10 +8430,6 @@
 msgstr ""
 
 #, python-format
-msgid "proxying through http://%s:%s\n"
-msgstr ""
-
-#, python-format
 msgid "command '%s' failed: %s"
 msgstr ""
 
@@ -8967,6 +8627,10 @@
 msgstr ""
 
 #, python-format
+msgid "warning: copy source of '%s' not in parents of %s"
+msgstr ""
+
+#, python-format
 msgid "empty or missing copy source revlog %s:%s"
 msgstr ""