i18n-it: perform msgmerge on the tip of the stable branch

i18n/it.po

@@ -1,10000 +1,13182 b''
 # Italian translations for Mercurial
 # Traduzione italiana per Mercurial
 # Copyright (C) 2009 Matt Mackall and others
 msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2009-10-25 12:38+0100\n"
+"POT-Creation-Date: 2010-08-12 18:06+0200\n"
 "PO-Revision-Date: 2009-10-25 12:45+0100\n"
 "Last-Translator: Stefano Tortarolo <[e-mail]>\n"
 "Language-Team: Italian <Italian>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, python-format
 msgid " (default: %s)"
 msgstr " (default: %s)"
 
-msgid "OPTIONS"
-msgstr "OPZIONI"
-
-msgid "COMMANDS"
-msgstr "COMANDI"
+#, fuzzy
+msgid "Options"
+msgstr "opzioni:\n"
+
+#, fuzzy
+msgid "Commands"
+msgstr "comandi base:"
 
 msgid "    options:"
 msgstr "    opzioni:"
 
 #, python-format
 msgid "    aliases: %s"
 msgstr "    alias: %s"
 
-msgid "Some commands allow the user to specify a date, e.g.:"
-msgstr ""
-
-msgid ""
-"- backout, commit, import, tag: Specify the commit date.\n"
-"- log, revert, update: Select revision(s) by date."
-msgstr ""
-
-msgid "Many date formats are valid. Here are some examples::"
-msgstr ""
-
-msgid ""
-"  \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"  \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"  \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"  \"Dec 6\" (midnight)\n"
-"  \"13:18\" (today assumed)\n"
-"  \"3:39\" (3:39AM assumed)\n"
-"  \"3:39pm\" (15:39)\n"
-"  \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"  \"2006-12-6 13:18\"\n"
-"  \"2006-12-6\"\n"
-"  \"12-6\"\n"
-"  \"12/6\"\n"
-"  \"12/6/6\" (Dec 6 2006)"
-msgstr ""
-
-msgid "Lastly, there is Mercurial's internal format::"
-msgstr ""
-
-msgid "  \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
-msgstr ""
-
-msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
-msgstr ""
-
-msgid "The log command also accepts date ranges::"
-msgstr ""
-
-msgid ""
-"  \"<{datetime}\" - at or before a given date/time\n"
-"  \">{datetime}\" - on or after a given date/time\n"
-"  \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"  \"-{days}\" - within a given number of days of today\n"
-msgstr ""
-
-msgid ""
-"Mercurial's default format for showing changes between two versions of\n"
-"a file is compatible with the unified format of GNU diff, which can be\n"
-"used by GNU patch and many other standard tools."
-msgstr ""
-
-msgid ""
-"While this standard format is often enough, it does not encode the\n"
-"following information:"
-msgstr ""
-
-msgid ""
-"- executable status and other permission bits\n"
-"- copy or rename information\n"
-"- changes in binary files\n"
-"- creation or deletion of empty files"
-msgstr ""
-
-msgid ""
-"Mercurial also supports the extended diff format from the git VCS\n"
-"which addresses these limitations. The git diff format is not produced\n"
-"by default because a few widespread tools still do not understand this\n"
-"format."
-msgstr ""
-
-msgid ""
-"This means that when generating diffs from a Mercurial repository\n"
-"(e.g. with \"hg export\"), you should be careful about things like file\n"
-"copies and renames or other things mentioned above, because when\n"
-"applying a standard diff to a different repository, this extra\n"
-"information is lost. Mercurial's internal operations (like push and\n"
-"pull) are not affected by this, because they use an internal binary\n"
-"format for communicating changes."
-msgstr ""
-
-msgid ""
-"To make Mercurial produce the git extended diff format, use the --git\n"
-"option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your 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."
-msgstr ""
-
-msgid ""
-"HGEDITOR\n"
-"    This is the name of the editor to run when committing. See EDITOR."
-msgstr ""
-
-msgid "    (deprecated, use .hgrc)"
-msgstr ""
-
-msgid ""
-"HGENCODING\n"
-"    This overrides the default locale setting detected by Mercurial.\n"
-"    This setting is used to convert data including usernames,\n"
-"    changeset descriptions, tag names, and branches. This setting can\n"
-"    be overridden with the --encoding command-line option."
-msgstr ""
-
-msgid ""
-"HGENCODINGMODE\n"
-"    This sets Mercurial's behavior for handling unknown characters\n"
-"    while transcoding user input. The default is \"strict\", which\n"
-"    causes Mercurial to abort if it can't map a character. Other\n"
-"    settings include \"replace\", which replaces unknown characters, and\n"
-"    \"ignore\", which drops them. This setting can be overridden with\n"
-"    the --encodingmode command-line option."
-msgstr ""
-
-msgid ""
-"HGMERGE\n"
-"    An executable to use for resolving merge conflicts. The program\n"
-"    will be executed with three arguments: local file, remote file,\n"
-"    ancestor file."
-msgstr ""
-
-msgid ""
-"HGRCPATH\n"
-"    A list of files or directories to search for 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."
-msgstr ""
-
-msgid "    For each element in HGRCPATH:"
-msgstr ""
-
-msgid ""
-"    - if it's a directory, all files ending with .rc are added\n"
-"    - otherwise, the file itself will be added"
-msgstr ""
-
-msgid ""
-"HGUSER\n"
-"    This is the string used as the author of a commit. If not set,\n"
-"    available values will be considered in this order:"
-msgstr ""
-
-msgid ""
-"    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
-"    - EMAIL\n"
-"    - interactive prompt\n"
-"    - LOGNAME (with '@hostname' appended)"
-msgstr ""
-
-msgid ""
-"EMAIL\n"
-"    May be used as the author of a commit; see HGUSER."
-msgstr ""
-
-msgid ""
-"LOGNAME\n"
-"    May be used as the author of a commit; see HGUSER."
-msgstr ""
-
-msgid ""
-"VISUAL\n"
-"    This is the name of the editor to use when committing. See EDITOR."
-msgstr ""
-
-msgid ""
-"EDITOR\n"
-"    Sometimes Mercurial needs to open a text file in an editor for a\n"
-"    user to modify, for example when writing commit messages. The\n"
-"    editor it uses is determined by looking at the environment\n"
-"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-"    non-empty one is chosen. If all of them are empty, the editor\n"
-"    defaults to 'vi'."
-msgstr ""
-
-msgid ""
-"PYTHONPATH\n"
-"    This is used by Python to find imported modules and may need to be\n"
-"    set appropriately if this Mercurial is not installed system-wide.\n"
-msgstr ""
-
-msgid ""
-"Mercurial has the ability to add new features through the use of\n"
-"extensions. Extensions may add new commands, add options to\n"
-"existing commands, change the default behavior of commands, or\n"
-"implement hooks."
-msgstr ""
-
-msgid ""
-"Extensions are not loaded by default for a variety of reasons:\n"
-"they can increase startup overhead; they may be meant for advanced\n"
-"usage only; they may provide potentially dangerous abilities (such\n"
-"as letting you destroy or modify history); they might not be ready\n"
-"for prime time; or they may alter some usual behaviors of stock\n"
-"Mercurial. It is thus up to the user to activate extensions as\n"
-"needed."
-msgstr ""
-
-msgid ""
-"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::"
-msgstr ""
-
-msgid ""
-"  [extensions]\n"
-"  foo ="
-msgstr ""
-
-msgid "You may also specify the full path to an extension::"
-msgstr ""
-
-msgid ""
-"  [extensions]\n"
-"  myfeature = ~/.hgext/myfeature.py"
-msgstr ""
-
-msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
-msgstr ""
-
-msgid ""
-"  [extensions]\n"
-"  # disabling extension bar residing in /path/to/extension/bar.py\n"
-"  bar = !/path/to/extension/bar.py\n"
-"  # ditto, but no path was supplied for extension baz\n"
-"  baz = !\n"
-msgstr ""
-
-msgid ""
-"When Mercurial accepts more than one revision, they may be specified\n"
-"individually, or provided as a topologically continuous range,\n"
-"separated by the \":\" character."
-msgstr ""
-
-msgid ""
-"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
-"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
-"specified, it defaults to revision number 0. If END is not specified,\n"
-"it defaults to the tip. The range \":\" thus means \"all revisions\"."
-msgstr ""
-
-msgid "If BEGIN is greater than END, revisions are treated in reverse order."
-msgstr ""
-
-msgid ""
-"A range acts as a closed interval. This means that a range of 3:5\n"
-"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
-msgstr ""
-
-msgid ""
-"Mercurial accepts several notations for identifying one or more files\n"
-"at a time."
-msgstr ""
-
-msgid ""
-"By default, Mercurial treats filenames as shell-style extended glob\n"
-"patterns."
-msgstr ""
-
-msgid "Alternate pattern notations must be specified explicitly."
-msgstr ""
-
-msgid ""
-"To use a plain path name without any pattern matching, start it with\n"
-"``path:``. These path names must completely match starting at the\n"
-"current repository root."
-msgstr ""
-
-msgid ""
-"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
-"at the current directory; a glob such as ``*.c`` will only match files\n"
-"in the current directory ending with ``.c``."
-msgstr ""
-
-msgid ""
-"The supported glob syntax extensions are ``**`` to match any string\n"
-"across path separators and ``{a,b}`` to mean \"a or b\"."
-msgstr ""
-
-msgid ""
-"To use a Perl/Python regular expression, start a name with ``re:``.\n"
-"Regexp pattern matching is anchored at the root of the repository."
-msgstr ""
-
-msgid "Plain examples::"
-msgstr ""
-
-msgid ""
-"  path:foo/bar   a name bar in a directory named foo in the root\n"
-"                 of the repository\n"
-"  path:path:name a file or directory named \"path:name\""
-msgstr ""
-
-msgid "Glob examples::"
-msgstr ""
-
-msgid ""
-"  glob:*.c       any name ending in \".c\" in the current directory\n"
-"  *.c            any name ending in \".c\" in the current directory\n"
-"  **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                 current directory including itself.\n"
-"  foo/*.c        any name ending in \".c\" in the directory foo\n"
-"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                 including itself."
-msgstr ""
-
-msgid "Regexp examples::"
-msgstr ""
-
-msgid "  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
-msgstr ""
-
-msgid "Mercurial supports several ways to specify individual revisions."
-msgstr ""
-
-msgid ""
-"A plain integer is treated as a revision number. Negative integers are\n"
-"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
-"-2 denoting the revision prior to the tip, and so forth."
-msgstr ""
-
-msgid ""
-"A 40-digit hexadecimal string is treated as a unique revision\n"
-"identifier."
-msgstr ""
-
-msgid ""
-"A hexadecimal string less than 40 characters long is treated as a\n"
-"unique revision identifier and is referred to as a short-form\n"
-"identifier. A short-form identifier is only valid if it is the prefix\n"
-"of exactly one full-length identifier."
-msgstr ""
-
-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 ""
-
-msgid ""
-"The reserved name \"tip\" is a special tag that always identifies the\n"
-"most recent revision."
-msgstr ""
-
-msgid ""
-"The reserved name \"null\" indicates the null revision. This is the\n"
-"revision of an empty repository, and the parent of revision 0."
-msgstr ""
-
-msgid ""
-"The reserved name \".\" indicates the working directory parent. If no\n"
-"working directory is checked out, it is equivalent to null. If an\n"
-"uncommitted merge is in progress, \".\" is the revision of the first\n"
-"parent.\n"
-msgstr ""
-
-msgid ""
-"Mercurial allows you to customize output of commands through\n"
-"templates. You can either pass in a template from the command\n"
-"line, via the --template option, or select an existing\n"
-"template-style (--style)."
-msgstr ""
-
-msgid ""
-"You can customize output for any \"log-like\" command: log,\n"
-"outgoing, incoming, tip, parents, heads and glog."
-msgstr ""
-
-msgid ""
-"Three styles are packaged with Mercurial: default (the style used\n"
-"when no explicit preference is passed), compact and changelog.\n"
-"Usage::"
-msgstr ""
-
-msgid "    $ hg log -r1 --style changelog"
-msgstr ""
-
-msgid ""
-"A template is a piece of text, with markup to invoke variable\n"
-"expansion::"
-msgstr ""
-
-msgid ""
-"    $ hg log -r1 --template \"{node}\\n\"\n"
-"    b56ce7b07c52de7d5fd79fb89701ea538af65746"
-msgstr ""
-
-msgid ""
-"Strings in curly braces are called keywords. The availability of\n"
-"keywords depends on the exact context of the templater. These\n"
-"keywords are usually available for templating a log-like command:"
-msgstr ""
-
-msgid ""
-":author:    String. The unmodified author of the changeset.\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."
-msgstr ""
-
-msgid ""
-"The \"date\" keyword does not produce human-readable output. If you\n"
-"want to use a date in your output, you can use a filter to process\n"
-"it. Filters are functions which return a string based on the input\n"
-"variable. You can also use a chain of filters to get the desired\n"
-"output::"
-msgstr ""
-
-msgid ""
-"   $ hg tip --template \"{date|isodate}\\n\"\n"
-"   2008-08-21 18:22 +0000"
-msgstr ""
-
-msgid "List of filters:"
-msgstr ""
-
-msgid ""
-":addbreaks:   Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"              every line except the last.\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 <[e-mail]>' becomes\n"
-"              'example.com'.\n"
-":email:       Any text. Extracts the first string that looks like\n"
-"              an email address. Example: 'User <[e-mail]>'\n"
-"              becomes '[e-mail]'.\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::"
-msgstr ""
-
-msgid ""
-"  local/filesystem/path[#revision]\n"
-"  file://local/filesystem/path[#revision]\n"
-"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
-"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
-"  ssh://[user[:pass]@]host[:port]/[path][#revision]"
-msgstr ""
-
-msgid ""
-"Paths in the local filesystem can either point to Mercurial\n"
-"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
-"incoming --bundle')."
-msgstr ""
-
-msgid ""
-"An optional identifier after # indicates a particular branch, tag, or\n"
-"changeset to use from the remote repository. See also 'hg help\n"
-"revisions'."
-msgstr ""
-
-msgid ""
-"Some features, such as pushing to http:// and https:// URLs are only\n"
-"possible if the feature is explicitly enabled on the remote Mercurial\n"
-"server."
-msgstr ""
-
-msgid "Some notes about using SSH with Mercurial:"
-msgstr ""
-
-msgid ""
-"- SSH requires an accessible shell account on the destination machine\n"
-"  and a copy of hg in the remote path or specified with as remotecmd.\n"
-"- path is relative to the remote user's home directory by default. Use\n"
-"  an extra slash at the start of a path to specify an absolute path::"
-msgstr ""
-
-msgid "    ssh://example.com//tmp/repository"
-msgstr ""
-
-msgid ""
-"- Mercurial doesn't use its own compression via SSH; the right thing\n"
-"  to do is to configure it in your ~/.ssh/config, e.g.::"
-msgstr ""
-
-msgid ""
-"    Host *.mylocalnetwork.example.com\n"
-"      Compression no\n"
-"    Host *\n"
-"      Compression yes"
-msgstr ""
-
-msgid ""
-"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"  with the --ssh command line option."
-msgstr ""
-
-msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
-msgstr ""
-
-msgid ""
-"  [paths]\n"
-"  alias1 = URL1\n"
-"  alias2 = URL2\n"
-"  ..."
-msgstr ""
-
-msgid ""
-"You can then use the alias for any command that uses a URL (for\n"
-"example 'hg pull alias1' would pull from the 'alias1' path)."
-msgstr ""
-
-msgid ""
-"Two path aliases are special because they are used as defaults when\n"
-"you do not provide the URL to a command:"
-msgstr ""
-
-msgid ""
-"default:\n"
-"  When you create a repository with hg clone, the clone command saves\n"
-"  the location of the source repository as the new repository's\n"
-"  'default' path. This is then used when you omit path from push- and\n"
-"  pull-like commands (including incoming and outgoing)."
-msgstr ""
-
-msgid ""
-"default-push:\n"
-"  The push command will look for a path named 'default-push', and\n"
-"  prefer it over 'default' if both are defined.\n"
-msgstr ""
-
 msgid "hooks for controlling repository access"
 msgstr ""
 
 msgid ""
-"This hook makes it possible to allow or deny write access to portions\n"
-"of a repository when receiving incoming changesets."
+"This hook makes it possible to allow or deny write access to given\n"
+"branches and paths of a repository when receiving incoming changesets\n"
+"via pretxnchangegroup and pretxncommit."
 msgstr ""
 
 msgid ""
 "The authorization is matched based on the local user name on the\n"
 "system where the hook runs, and not the committer of the original\n"
 "changeset (since the latter is merely informative)."
 msgstr ""
 
 msgid ""
 "The acl hook is best used along with a restricted shell like hgsh,\n"
-"preventing authenticating users from doing anything other than\n"
-"pushing or pulling. The hook is not safe to use if users have\n"
-"interactive shell access, as they can then disable the hook.\n"
-"Nor is it safe if remote users share an account, because then there\n"
-"is no way to distinguish them."
-msgstr ""
-
-msgid "To use this hook, configure the acl extension in your hgrc like this::"
-msgstr ""
-
-msgid ""
-"  [extensions]\n"
-"  acl ="
-msgstr ""
-
-msgid ""
-"  [hooks]\n"
+"preventing authenticating users from doing anything other than pushing\n"
+"or pulling. The hook is not safe to use if users have interactive\n"
+"shell access, as they can then disable the hook. Nor is it safe if\n"
+"remote users share an account, because then there is no way to\n"
+"distinguish them."
+msgstr ""
+
+msgid "The order in which access checks are performed is:"
+msgstr ""
+
+msgid ""
+"1) Deny  list for branches (section ``acl.deny.branches``)\n"
+"2) Allow list for branches (section ``acl.allow.branches``)\n"
+"3) Deny  list for paths    (section ``acl.deny``)\n"
+"4) Allow list for paths    (section ``acl.allow``)"
+msgstr ""
+
+msgid "The allow and deny sections take key-value pairs."
+msgstr ""
+
+msgid ""
+"Branch-based Access Control\n"
+"---------------------------"
+msgstr ""
+
+msgid ""
+"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
+"have branch-based access control. Keys in these sections can be\n"
+"either:"
+msgstr ""
+
+msgid ""
+"- a branch name, or\n"
+"- an asterisk, to match any branch;"
+msgstr ""
+
+msgid "The corresponding values can be either:"
+msgstr ""
+
+msgid ""
+"- a comma-separated list containing users and groups, or\n"
+"- an asterisk, to match anyone;"
+msgstr ""
+
+msgid ""
+"Path-based Access Control\n"
+"-------------------------"
+msgstr ""
+
+msgid ""
+"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
+"access control. Keys in these sections accept a subtree pattern (with\n"
+"a glob syntax by default). The corresponding values follow the same\n"
+"syntax as the other sections above."
+msgstr ""
+
+msgid ""
+"Groups\n"
+"------"
+msgstr ""
+
+msgid ""
+"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
+"name has the same effect as specifying all the users in that group."
+msgstr ""
+
+msgid ""
+"You can define group members in the ``acl.groups`` section.\n"
+"If a group name is not defined there, and Mercurial is running under\n"
+"a Unix-like system, the list of users will be taken from the OS.\n"
+"Otherwise, an exception will be raised."
+msgstr ""
+
+msgid ""
+"Example Configuration\n"
+"---------------------"
+msgstr ""
+
+msgid "::"
+msgstr ""
+
+msgid "  [hooks]"
+msgstr ""
+
+msgid ""
+"  # Use this if you want to check access restrictions at commit time\n"
+"  pretxncommit.acl = python:hgext.acl.hook"
+msgstr ""
+
+msgid ""
+"  # Use this if you want to check access restrictions for pull, push,\n"
+"  # bundle and serve.\n"
 "  pretxnchangegroup.acl = python:hgext.acl.hook"
 msgstr ""
 
 msgid ""
 "  [acl]\n"
-"  # Check whether the source of incoming changes is in this list\n"
-"  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
+"  # Allow or deny access for incoming changes only if their source is\n"
+"  # listed here, let them pass otherwise. Source is \"serve\" for all\n"
+"  # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n"
+"  # related commands are run locally.\n"
+"  # Default: serve\n"
 "  sources = serve"
 msgstr ""
 
-msgid ""
-"The allow and deny sections take a subtree pattern as key (with a glob\n"
-"syntax by default), and a comma separated list of users as the\n"
-"corresponding value. The deny list is checked before the allow list\n"
-"is. ::"
+msgid "  [acl.deny.branches]"
+msgstr ""
+
+msgid ""
+"  # Everyone is denied to the frozen branch:\n"
+"  frozen-branch = *"
+msgstr ""
+
+msgid ""
+"  # A bad user is denied on all branches:\n"
+"  * = bad-user"
+msgstr ""
+
+msgid "  [acl.allow.branches]"
+msgstr ""
+
+msgid ""
+"  # A few users are allowed on branch-a:\n"
+"  branch-a = user-1, user-2, user-3"
+msgstr ""
+
+msgid ""
+"  # Only one user is allowed on branch-b:\n"
+"  branch-b = user-1"
+msgstr ""
+
+msgid ""
+"  # The super user is allowed on any branch:\n"
+"  * = super-user"
+msgstr ""
+
+msgid ""
+"  # Everyone is allowed on branch-for-tests:\n"
+"  branch-for-tests = *"
+msgstr ""
+
+msgid ""
+"  [acl.deny]\n"
+"  # This list is checked first. If a match is found, acl.allow is not\n"
+"  # checked. All users are granted access if acl.deny is not present.\n"
+"  # Format for both lists: glob pattern = user, ..., @group, ..."
+msgstr ""
+
+msgid ""
+"  # To match everyone, use an asterisk for the user:\n"
+"  # my/glob/pattern = *"
+msgstr ""
+
+msgid ""
+"  # user6 will not have write access to any file:\n"
+"  ** = user6"
+msgstr ""
+
+msgid ""
+"  # Group \"hg-denied\" will not have write access to any file:\n"
+"  ** = @hg-denied"
+msgstr ""
+
+msgid ""
+"  # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n"
+"  # everyone being able to change all other files. See below.\n"
+"  src/main/resources/DONT-TOUCH-THIS.txt = *"
 msgstr ""
 
 msgid ""
 "  [acl.allow]\n"
-"  # If acl.allow is not present, all users are allowed by default.\n"
-"  # An empty acl.allow section means no users allowed.\n"
-"  docs/** = doc_writer\n"
-"  .hgtags = release_engineer"
-msgstr ""
-
-msgid ""
-"  [acl.deny]\n"
-"  # If acl.deny is not present, no users are refused by default.\n"
-"  # An empty acl.deny section means all users allowed.\n"
-"  glob pattern = user4, user5\n"
-"   ** = user6\n"
-msgstr ""
-
-#, python-format
-msgid "config error - hook type \"%s\" cannot stop incoming changesets"
-msgstr "errore di configurazione - l'hook di tipo \"%s\" non può fermare i changeset in entrata"
+"  # if acl.allow is not present, all users are allowed by default\n"
+"  # empty acl.allow = no users allowed"
+msgstr ""
+
+msgid ""
+"  # User \"doc_writer\" has write access to any file under the \"docs\"\n"
+"  # folder:\n"
+"  docs/** = doc_writer"
+msgstr ""
+
+msgid ""
+"  # User \"jack\" and group \"designers\" have write access to any file\n"
+"  # under the \"images\" folder:\n"
+"  images/** = jack, @designers"
+msgstr ""
+
+msgid ""
+"  # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
+"  # access to any file under the \"resources\" folder (except for 1\n"
+"  # file. See acl.deny):\n"
+"  src/main/resources/** = *"
+msgstr ""
+
+msgid "  .hgtags = release_engineer"
+msgstr ""
+
+#, python-format
+msgid "group '%s' is undefined"
+msgstr ""
+
+#, fuzzy, python-format
+msgid ""
+"config error - hook type \"%s\" cannot stop incoming changesets nor commits"
+msgstr ""
+"errore di configurazione - l'hook di tipo \"%s\" non può fermare i changeset "
+"in entrata"
+
+#, fuzzy, python-format
+msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")"
+msgstr "acl: accesso negato per il changeset %s"
+
+#, python-format
+msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")"
+msgstr ""
 
 #, python-format
 msgid "acl: access denied for changeset %s"
 msgstr "acl: accesso negato per il changeset %s"
 
 msgid "track a line of development with movable markers"
 msgstr "segui una linea di sviluppo con puntatori mobili"
 
 msgid ""
 "Bookmarks are local movable markers to changesets. Every bookmark\n"
 "points to a changeset identified by its hash. If you commit a\n"
 "changeset that is based on a changeset that has a bookmark on it, the\n"
 "bookmark shifts to the new changeset."
 msgstr ""
 "I segnalibri di Mercurial sono puntatori locali e mobili a changeset. Ogni\n"
-"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il commit di un\n"
+"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il "
+"commit di un\n"
 "changeset basato su un changeset che ha un segnalibro, \n"
 "il segnalibro è spostato sul nuovo changeset"
 
-msgid ""
-"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
-"merge, hg update)."
+#, fuzzy
+msgid ""
+"It is possible to use bookmark names in every revision lookup (e.g.\n"
+":hg:`merge`, :hg:`update`)."
 msgstr ""
 "E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es. hg\n"
 "merge, hg update)."
 
 #, fuzzy
 msgid ""
 "By default, when several bookmarks point to the same changeset, they\n"
 "will all move forward together. It is possible to obtain a more\n"
 "git-like experience by adding the following configuration option to\n"
 "your .hgrc::"
 msgstr ""
 "Di default, quando più segnalibri puntano allo stesso changeset, essi\n"
 "avanzeranno tutti assieme. È possibile avere un comportamento più simile\n"
 "a git aggiungendo la seguente opzione di configurazione al tuo .hgrc:"
 
 msgid ""
 "  [bookmarks]\n"
 "  track.current = True"
 msgstr ""
 
 msgid ""
 "This will cause Mercurial to track the bookmark that you are currently\n"
 "using, and only update it. This is similar to git's approach to\n"
 "branching.\n"
 msgstr ""
-"Questo porterà Mercurial a tener traccia del segnalibro su cui sei attualmente, e\n"
-"a limitarsi ad aggiornarlo. Questo è simile all'approccio di branching di git.\n"
+"Questo porterà Mercurial a tener traccia del segnalibro su cui sei "
+"attualmente, e\n"
+"a limitarsi ad aggiornarlo. Questo è simile all'approccio di branching di "
+"git.\n"
 
 msgid ""
 "    Bookmarks are pointers to certain commits that move when\n"
 "    committing. Bookmarks are local. They can be renamed, copied and\n"
-"    deleted. It is possible to use bookmark names in 'hg merge' and\n"
-"    'hg update' to merge and update respectively to a given bookmark."
-msgstr ""
-
-msgid ""
-"    You can use 'hg bookmark NAME' to set a bookmark on the working\n"
+"    deleted. It is possible to use bookmark names in :hg:`merge` and\n"
+"    :hg:`update` to merge and update respectively to a given bookmark."
+msgstr ""
+
+msgid ""
+"    You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
 "    directory's parent revision with the given name. If you specify\n"
 "    a revision using -r REV (where REV may be an existing bookmark),\n"
 "    the bookmark is assigned to that revision.\n"
 "    "
 msgstr ""
 
 msgid "a bookmark of this name does not exist"
 msgstr "non esiste un segnalibro con questo nome"
 
 msgid "a bookmark of the same name already exists"
 msgstr "esiste già un segnalibro con lo stesso nome"
 
 msgid "new bookmark name required"
 msgstr "richiesto nuovo nome per il segnalibro"
 
 msgid "bookmark name required"
 msgstr "richiesto nome per il segnalibro"
 
 msgid "bookmark name cannot contain newlines"
 msgstr "il nome di un segnalibro non può contenere a capo"
 
+#, fuzzy
+msgid "bookmark names cannot consist entirely of whitespace"
+msgstr "il nome di un segnalibro non può contenere a capo"
+
 msgid "a bookmark cannot have the name of an existing branch"
 msgstr "un segnalibro non può avere lo stesso nome di una branch esistente"
 
+msgid "no bookmarks set\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "updating bookmark %s\n"
+msgstr "sto aggiornando a %d:%s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "updating bookmark %s failed!\n"
+msgstr "merge di %s fallito!\n"
+
+#, fuzzy, python-format
+msgid "remote bookmark %s not found!"
+msgstr "repository %s non trovato"
+
+#, fuzzy, python-format
+msgid "importing bookmark %s\n"
+msgstr "patch %s importata\n"
+
+#, python-format
+msgid "exporting bookmark %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "deleting remote bookmark %s\n"
+msgstr "elimina un dato segnalibro"
+
+msgid "searching for changes\n"
+msgstr "sto cercando modifiche\n"
+
+msgid "no changes found\n"
+msgstr "nessuna modifica trovata\n"
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr "sto confrontando con %s\n"
+
+#, fuzzy
+msgid "bookmark to import"
+msgstr "richiesto nome per il segnalibro"
+
+#, fuzzy
+msgid "bookmark to export"
+msgstr "richiesto nome per il segnalibro"
+
+#, fuzzy
+msgid "compare bookmark"
+msgstr "rinomina un dato segnalibro"
+
 msgid "force"
 msgstr "forza"
 
+msgid "REV"
+msgstr ""
+
 msgid "revision"
 msgstr "revisione"
 
 msgid "delete a given bookmark"
 msgstr "elimina un dato segnalibro"
 
+#, fuzzy
+msgid "NAME"
+msgstr "[NOME]"
+
 msgid "rename a given bookmark"
 msgstr "rinomina un dato segnalibro"
 
 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
 msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]"
 
 msgid "hooks for integrating with the Bugzilla bug tracker"
 msgstr ""
 
 msgid ""
 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
 "bug status."
 msgstr ""
 
 msgid ""
 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
 "installations using MySQL are supported."
 msgstr ""
 
 msgid ""
 "The hook relies on a Bugzilla script to send bug change notification\n"
 "emails. That script changes between Bugzilla versions; the\n"
 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
 "be run by Mercurial as the user pushing the change; you will need to\n"
 "ensure the Bugzilla install file permissions are set appropriately."
 msgstr ""
 
 msgid ""
 "The extension is configured through three different configuration\n"
 "sections. These keys are recognized in the [bugzilla] section:"
 msgstr ""
 
 msgid ""
 "host\n"
 "  Hostname of the MySQL server holding the Bugzilla database."
 msgstr ""
 
 msgid ""
 "db\n"
 "  Name of the Bugzilla database in MySQL. Default 'bugs'."
 msgstr ""
 
 msgid ""
 "user\n"
 "  Username to use to access MySQL server. Default 'bugs'."
 msgstr ""
 
 msgid ""
 "password\n"
 "  Password to use to access MySQL server."
 msgstr ""
 
 msgid ""
 "timeout\n"
 "  Database connection timeout (seconds). Default 5."
 msgstr ""
 
 msgid ""
 "version\n"
 "  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
 "  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
 "  to 2.18."
 msgstr ""
 
 msgid ""
 "bzuser\n"
 "  Fallback Bugzilla user name to record comments with, if changeset\n"
 "  committer cannot be found as a Bugzilla user."
 msgstr ""
 
 msgid ""
 "bzdir\n"
 "   Bugzilla install directory. Used by default notify. Default\n"
 "   '/var/www/html/bugzilla'."
 msgstr ""
 
 msgid ""
 "notify\n"
 "  The command to run to get Bugzilla to send bug change notification\n"
 "  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
 "  and 'user' (committer bugzilla email). Default depends on version;\n"
 "  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
 "  %(id)s %(user)s\"."
 msgstr ""
 
 msgid ""
 "regexp\n"
 "  Regular expression to match bug IDs in changeset commit message.\n"
 "  Must contain one \"()\" group. The default expression matches 'Bug\n"
 "  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
 "  1234 and 5678' and variations thereof. Matching is case insensitive."
 msgstr ""
 
 msgid ""
 "style\n"
 "  The style file to use when formatting comments."
 msgstr ""
 
 msgid ""
 "template\n"
 "  Template to use when formatting comments. Overrides style if\n"
 "  specified. In addition to the usual Mercurial keywords, the\n"
 "  extension specifies::"
 msgstr ""
 
 msgid ""
 "    {bug}       The Bugzilla bug ID.\n"
 "    {root}      The full pathname of the Mercurial repository.\n"
 "    {webroot}   Stripped pathname of the Mercurial repository.\n"
 "    {hgweb}     Base URL for browsing Mercurial repositories."
 msgstr ""
 
 msgid ""
 "  Default 'changeset {node|short} in repo {root} refers '\n"
 "          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
 msgstr ""
 
 msgid ""
 "strip\n"
 "  The number of slashes to strip from the front of {root} to produce\n"
 "  {webroot}. Default 0."
 msgstr ""
 
 msgid ""
 "usermap\n"
 "  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
 "  mappings. If specified, the file should contain one mapping per\n"
 "  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
 msgstr ""
 
 msgid ""
 "The [usermap] section is used to specify mappings of Mercurial\n"
 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
 "\"committer\"=\"Bugzilla user\""
 msgstr ""
 
 msgid "Finally, the [web] section supports one entry:"
 msgstr ""
 
 msgid ""
 "baseurl\n"
 "  Base URL for browsing Mercurial repositories. Reference from\n"
 "  templates as {hgweb}."
 msgstr ""
 
 msgid "Activating the extension::"
 msgstr ""
 
 msgid ""
 "    [extensions]\n"
 "    bugzilla ="
 msgstr ""
 
 msgid ""
 "    [hooks]\n"
 "    # run bugzilla hook on every change pulled or pushed in here\n"
 "    incoming.bugzilla = python:hgext.bugzilla.hook"
 msgstr ""
 
 msgid "Example configuration:"
 msgstr ""
 
 msgid ""
 "This example configuration is for a collection of Mercurial\n"
 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
 "installation in /opt/bugzilla-3.2. ::"
 msgstr ""
 
 msgid ""
 "    [bugzilla]\n"
 "    host=localhost\n"
 "    password=XYZZY\n"
 "    version=3.0\n"
 "    bzuser=[e-mail]\n"
 "    bzdir=/opt/bugzilla-3.2\n"
 "    template=Changeset {node|short} in {root|basename}.\n"
 "             {hgweb}/{webroot}/rev/{node|short}\\n\n"
 "             {desc}\\n\n"
 "    strip=5"
 msgstr ""
 
 msgid ""
 "    [web]\n"
 "    baseurl=http://dev.domain.com/hg"
 msgstr ""
 
 msgid ""
 "    [usermap]\n"
 "    [e-mail]=[e-mail]"
 msgstr ""
 
 msgid "Commits add a comment to the Bugzilla bug record of the form::"
 msgstr ""
 
 msgid ""
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
 msgstr ""
 
 msgid "    Changeset commit comment. Bug 1234.\n"
 msgstr ""
 
 #, python-format
 msgid "connecting to %s:%s as %s, password %s\n"
 msgstr "sto connettendomi a %s:%s come %s, password %s\n"
 
 #, python-format
 msgid "query: %s %s\n"
 msgstr "query: %s %s\n"
 
 #, python-format
 msgid "failed query: %s %s\n"
 msgstr "query fallita: %s %s\n"
 
 msgid "unknown database schema"
 msgstr "schema del database sconosciuto"
 
 #, python-format
 msgid "bug %d already knows about changeset %s\n"
 msgstr "il bug %d è già a conoscenza del changeset %s\n"
 
 msgid "telling bugzilla to send mail:\n"
 msgstr "sto dicendo a bugzilla di inviare la mail:\n"
 
 #, python-format
 msgid "  bug %s\n"
 msgstr "  bug %s\n"
 
 #, python-format
 msgid "running notify command %s\n"
 msgstr "sto eseguendo il comando di notifica %s\n"
 
 #, python-format
 msgid "bugzilla notify command %s"
 msgstr "comando di notifica di bugzilla %s"
 
 msgid "done\n"
 msgstr "fatto\n"
 
 #, python-format
 msgid "looking up user %s\n"
 msgstr "ricercando l'utente %s\n"
 
 #, python-format
 msgid "cannot find bugzilla user id for %s"
 msgstr "impossibile trovare nome utente bugzilla per %s"
 
 #, python-format
 msgid "cannot find bugzilla user id for %s or %s"
 msgstr "impossibile trovare nome utente bugzilla per %s o %s"
 
 #, python-format
 msgid "bugzilla version %s not supported"
 msgstr "versione di bugzilla %s non supportata"
 
 msgid ""
 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
 "details:\n"
 "\t{desc|tabindent}"
 msgstr ""
 "changeset {node|short} nel repository {root} si riferisce al bug {bug}.\n"
 "dettagli:\n"
 "\t{desc|tabindent}"
 
 #, python-format
 msgid "python mysql support not available: %s"
 msgstr "il supporto per python per mysql non è disponibile: %s"
 
 #, python-format
 msgid "hook type %s does not pass a changeset id"
 msgstr ""
 
 #, python-format
 msgid "database error: %s"
 msgstr "errore del database: %s"
 
 msgid "command to display child changesets"
 msgstr "comando per mostrare i changeset figli"
 
 msgid "show the children of the given or working directory revision"
-msgstr "mostra i figli della revisione data o di quella della directory di lavoro"
+msgstr ""
+"mostra i figli della revisione data o di quella della directory di lavoro"
 
 msgid ""
 "    Print the children of the working directory's revisions. If a\n"
 "    revision is given via -r/--rev, the children of that revision will\n"
 "    be printed. If a file argument is given, revision in which the\n"
 "    file was last changed (after the working directory revision or the\n"
 "    argument to --rev if given) is printed.\n"
 "    "
 msgstr ""
 "    Stampa le revisioni figlie della directory di lavoro. Se una\n"
 "    revisione è data tramite --rev, verranno stampati i figli di\n"
 "    quella revisione. Se viene fornito un file come argomento,\n"
 "    verrà stampata l'ultima revisione in cui il file è stato\n"
 "    modificato (dopo la revisione della directory di lavoro\n"
 "    o dell'argomento di --rev se fornito).\n"
 "    "
 
 msgid "show children of the specified revision"
 msgstr "mostra i figli della revisione specificata"
 
 msgid "hg children [-r REV] [FILE]"
 msgstr "hg·children·[-r·REV]·[FILE]"
 
 msgid "command to display statistics about repository history"
 msgstr "comando per mostrare statistiche sulla storia del repository"
 
 #, python-format
 msgid "Revision %d is a merge, ignoring...\n"
 msgstr "La revisione %d è un merge, ignoro...\n"
 
-#, python-format
-msgid "generating stats: %d%%"
-msgstr "sto generando le statistiche: %d%%"
+msgid "analyzing"
+msgstr ""
 
 msgid "histogram of changes to the repository"
 msgstr "istogramma delle modifiche al repository"
 
 msgid ""
 "    This command will display a histogram representing the number\n"
 "    of changed lines or revisions, grouped according to the given\n"
 "    template. The default template will group changes by author.\n"
 "    The --dateformat option may be used to group the results by\n"
 "    date instead."
 msgstr ""
 
 msgid ""
 "    Statistics are based on the number of changed lines, or\n"
 "    alternatively the number of matching revisions if the\n"
 "    --changesets option is specified."
 msgstr ""
 
 msgid "    Examples::"
 msgstr ""
 
 msgid ""
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'"
 msgstr ""
 
 msgid ""
 "      # display daily activity graph\n"
 "      hg churn -f '%H' -s -c"
 msgstr ""
 
 msgid ""
 "      # display activity of developers by month\n"
 "      hg churn -f '%Y-%m' -s -c"
 msgstr ""
 
 msgid ""
 "      # display count of lines changed in every year\n"
 "      hg churn -f '%Y' -s"
 msgstr ""
 
 msgid ""
 "    It is possible to map alternate email addresses to a main address\n"
 "    by providing a file using the following format::"
 msgstr ""
 
-msgid "      <alias email> <actual email>"
+msgid "      <alias email> = <actual email>"
 msgstr ""
 
 msgid ""
 "    Such a file may be specified with the --aliases option, otherwise\n"
 "    a .hgchurn file will be looked for in the working directory root.\n"
 "    "
 msgstr ""
 
 msgid "count rate for the specified revision or range"
 msgstr "misura velocità per le revisioni o il range specificati"
 
+msgid "DATE"
+msgstr ""
+
 msgid "count rate for revisions matching date spec"
 msgstr "misura velocità per le revisioni che corrispondono ad una data fornita"
 
+msgid "TEMPLATE"
+msgstr ""
+
 msgid "template to group changesets"
 msgstr ""
 
+msgid "FORMAT"
+msgstr ""
+
 msgid "strftime-compatible format for grouping by date"
 msgstr ""
 
 msgid "count rate by number of changesets"
 msgstr "misura velocità dal numero di changeset"
 
 msgid "sort by key (default: sort by count)"
 msgstr "ordina per chiave (default: ordina per conteggio)"
 
+msgid "display added/removed lines separately"
+msgstr ""
+
+msgid "FILE"
+msgstr "FILE"
+
 msgid "file with email aliases"
 msgstr "file con alias email"
 
-msgid "show progress"
-msgstr "mostra progresso"
-
-msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
+#, fuzzy
+msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]"
 msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [--progress] [FILE]"
 
 msgid "colorize output from some commands"
 msgstr ""
 
 msgid ""
-"This extension modifies the status command to add color to its output\n"
-"to reflect file status, the qseries command to add color to reflect\n"
+"This extension modifies the status and resolve commands to add color to "
+"their\n"
+"output to reflect file status, the qseries command to add color to reflect\n"
 "patch status (applied, unapplied, missing), and to diff-related\n"
 "commands to highlight additions, removals, diff headers, and trailing\n"
 "whitespace."
 msgstr ""
 
 msgid ""
 "Other effects in addition to color, like bold and underlined text, are\n"
 "also available. Effects are rendered with the ECMA-48 SGR control\n"
 "function (aka ANSI escape codes). This module also provides the\n"
 "render_text function, which can be used to add effects to any text."
 msgstr ""
 
 msgid "Default effects may be overridden from the .hgrc file::"
 msgstr ""
 
 msgid ""
 "  [color]\n"
 "  status.modified = blue bold underline red_background\n"
 "  status.added = green bold\n"
 "  status.removed = red bold blue_background\n"
 "  status.deleted = cyan bold underline\n"
 "  status.unknown = magenta bold underline\n"
 "  status.ignored = black bold"
 msgstr ""
 
 msgid ""
 "  # 'none' turns off all effects\n"
 "  status.clean = none\n"
 "  status.copied = none"
 msgstr ""
 
 msgid ""
 "  qseries.applied = blue bold underline\n"
 "  qseries.unapplied = black bold\n"
 "  qseries.missing = red bold"
 msgstr ""
 
 msgid ""
 "  diff.diffline = bold\n"
 "  diff.extended = cyan bold\n"
 "  diff.file_a = red bold\n"
 "  diff.file_b = green bold\n"
 "  diff.hunk = magenta\n"
 "  diff.deleted = red\n"
 "  diff.inserted = green\n"
 "  diff.changed = white\n"
-"  diff.trailingwhitespace = bold red_background\n"
+"  diff.trailingwhitespace = bold red_background"
+msgstr ""
+
+msgid ""
+"  resolve.unresolved = red bold\n"
+"  resolve.resolved = green bold"
+msgstr ""
+
+msgid "  bookmarks.current = green"
+msgstr ""
+
+msgid ""
+"The color extension will try to detect whether to use ANSI codes or\n"
+"Win32 console APIs, unless it is made explicit::"
+msgstr ""
+
+msgid ""
+"  [color]\n"
+"  mode = ansi"
+msgstr ""
+
+msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
+msgstr ""
+
+#, python-format
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr ""
+
+msgid "win32console not found, please install pywin32\n"
 msgstr ""
 
 msgid "when to colorize (always, auto, or never)"
 msgstr "quando colorare (sempre, auto o mai)"
 
-msgid "don't colorize output (DEPRECATED)"
-msgstr "non colorare l'output (DEPRECATO)"
-
-#, python-format
-msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgid "TYPE"
 msgstr ""
 
 msgid "import revisions from foreign VCS repositories into Mercurial"
 msgstr "importa revisioni da repository di altri VCS in Mercurial"
 
 msgid "convert a foreign SCM repository to a Mercurial one."
 msgstr ""
 
 msgid "    Accepted source formats [identifiers]:"
 msgstr ""
 
 msgid ""
 "    - Mercurial [hg]\n"
 "    - CVS [cvs]\n"
 "    - Darcs [darcs]\n"
 "    - git [git]\n"
 "    - Subversion [svn]\n"
 "    - Monotone [mtn]\n"
 "    - GNU Arch [gnuarch]\n"
 "    - Bazaar [bzr]\n"
 "    - Perforce [p4]"
 msgstr ""
 
 msgid "    Accepted destination formats [identifiers]:"
 msgstr ""
 
 msgid ""
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (history on branches is not preserved)"
 msgstr ""
 
 msgid ""
 "    If no revision is given, all revisions will be converted.\n"
 "    Otherwise, convert will only import up to the named revision\n"
 "    (given in a format understood by the source)."
 msgstr ""
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
 "    basename of the source with '-hg' appended. If the destination\n"
 "    repository doesn't exist, it will be created."
 msgstr ""
 
 msgid ""
 "    By default, all sources except Mercurial will use --branchsort.\n"
 "    Mercurial uses --sourcesort to preserve original revision numbers\n"
 "    order. Sort modes have the following effects:"
 msgstr ""
 
 msgid ""
 "    --branchsort  convert from parent to child revision when possible,\n"
 "                  which means branches are usually converted one after\n"
 "                  the other. It generates more compact repositories."
 msgstr ""
 
 msgid ""
 "    --datesort    sort revisions by date. Converted repositories have\n"
 "                  good-looking changelogs but are often an order of\n"
 "                  magnitude larger than the same ones generated by\n"
 "                  --branchsort."
 msgstr ""
 
 msgid ""
 "    --sourcesort  try to preserve source revisions order, only\n"
 "                  supported by Mercurial sources."
 msgstr ""
 
 msgid ""
 "    If <REVMAP> isn't given, it will be put in a default location\n"
 "    (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
 "    that maps each source commit ID to the destination ID for that\n"
 "    revision, like so::"
 msgstr ""
 
 msgid "      <source ID> <destination ID>"
 msgstr ""
 
 msgid ""
 "    If the file doesn't exist, it's automatically created. It's\n"
 "    updated on each commit copied, so convert-repo can be interrupted\n"
 "    and can be run repeatedly to copy new commits."
 msgstr ""
 
 msgid ""
 "    The [username mapping] file is a simple text file that maps each\n"
 "    source commit author to a destination commit author. It is handy\n"
 "    for source SCMs that use unix logins to identify authors (eg:\n"
 "    CVS). One line per author mapping and the line format is:\n"
 "    srcauthor=whatever string you want"
 msgstr ""
 
 msgid ""
 "    The filemap is a file that allows filtering and remapping of files\n"
-"    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives::"
-msgstr ""
-
-msgid "      include path/to/file"
-msgstr ""
-
-msgid "      exclude path/to/file"
-msgstr ""
-
-msgid "      rename from/file to/file"
+"    and directories. Each line can contain one of the following\n"
+"    directives::"
+msgstr ""
+
+msgid "      include path/to/file-or-dir"
+msgstr ""
+
+msgid "      exclude path/to/file-or-dir"
+msgstr ""
+
+msgid "      rename path/to/source path/to/destination"
+msgstr ""
+
+msgid ""
+"    Comment lines start with '#'. A specificed path matches if it\n"
+"    equals the full relative name of a file or one of its parent\n"
+"    directories. The 'include' or 'exclude' directive with the longest\n"
+"    matching path applies, so line order does not matter."
 msgstr ""
 
 msgid ""
 "    The 'include' directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
 "    exclusion of all other files and directories not explicitly\n"
 "    included. The 'exclude' directive causes files or directories to\n"
-"    be omitted. The 'rename' directive renames a file or directory. To\n"
-"    rename from a subdirectory into the root of the repository, use\n"
-"    '.' as the path to rename to."
+"    be omitted. The 'rename' directive renames a file or directory if\n"
+"    is converted. To rename from a subdirectory into the root of the\n"
+"    repository, use '.' as the path to rename to."
 msgstr ""
 
 msgid ""
 "    The splicemap is a file that allows insertion of synthetic\n"
 "    history, letting you specify the parents of a revision. This is\n"
 "    useful if you want to e.g. give a Subversion merge two parents, or\n"
 "    graft two disconnected series of history together. Each entry\n"
 "    contains a key, followed by a space, followed by one or two\n"
 "    comma-separated values. The key is the revision ID in the source\n"
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
-"    should be used as the new parents for that node."
+"    should be used as the new parents for that node. For example, if\n"
+"    you have merged \"release-1.0\" into \"trunk\", then you should\n"
+"    specify the revision on \"trunk\" as the first parent and the one on\n"
+"    the \"release-1.0\" branch as the second."
 msgstr ""
 
 msgid ""
 "    The branchmap is a file that allows you to rename a branch when it is\n"
 "    being brought in from whatever external repository. When used in\n"
 "    conjunction with a splicemap, it allows for a powerful combination\n"
 "    to help fix even the most badly mismanaged repositories and turn them\n"
 "    into nicely structured Mercurial repositories. The branchmap contains\n"
 "    lines of the form \"original_branch_name new_branch_name\".\n"
 "    \"original_branch_name\" is the name of the branch in the source\n"
 "    repository, and \"new_branch_name\" is the name of the branch is the\n"
 "    destination repository. This can be used to (for instance) move code\n"
 "    in one repository from \"default\" to a named branch."
 msgstr ""
 
 msgid ""
 "    Mercurial Source\n"
 "    ----------------"
 msgstr ""
 
 msgid ""
 "    --config convert.hg.ignoreerrors=False    (boolean)\n"
 "        ignore integrity errors when reading. Use it to fix Mercurial\n"
 "        repositories with missing revlogs, by converting from and to\n"
 "        Mercurial.\n"
 "    --config convert.hg.saverev=False         (boolean)\n"
 "        store original revision ID in changeset (forces target IDs to\n"
 "        change)\n"
 "    --config convert.hg.startrev=0            (hg revision identifier)\n"
 "        convert start revision and its descendants"
 msgstr ""
 
 msgid ""
 "    CVS Source\n"
 "    ----------"
 msgstr ""
 
 msgid ""
 "    CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
 "    to indicate the starting point of what will be converted. Direct\n"
 "    access to the repository files is not needed, unless of course the\n"
 "    repository is :local:. The conversion uses the top level directory\n"
 "    in the sandbox to find the CVS repository, and then uses CVS rlog\n"
 "    commands to find files to convert. This means that unless a\n"
 "    filemap is given, all files under the starting directory will be\n"
 "    converted, and that any directory reorganization in the CVS\n"
 "    sandbox is ignored."
 msgstr ""
 
 msgid "    The options shown are the defaults."
 msgstr ""
 
 msgid ""
 "    --config convert.cvsps.cache=True         (boolean)\n"
 "        Set to False to disable remote log caching, for testing and\n"
 "        debugging purposes.\n"
 "    --config convert.cvsps.fuzz=60            (integer)\n"
 "        Specify the maximum time (in seconds) that is allowed between\n"
 "        commits with identical user and log message in a single\n"
 "        changeset. When very large files were checked in as part of a\n"
 "        changeset then the default may not be long enough.\n"
 "    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
 "        Specify a regular expression to which commit log messages are\n"
 "        matched. If a match occurs, then the conversion process will\n"
 "        insert a dummy revision merging the branch on which this log\n"
 "        message occurs to the branch indicated in the regex.\n"
 "    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
 "        Specify a regular expression to which commit log messages are\n"
 "        matched. If a match occurs, then the conversion process will\n"
 "        add the most recent revision on the branch indicated in the\n"
-"        regex as the second parent of the changeset."
+"        regex as the second parent of the changeset.\n"
+"    --config hook.cvslog\n"
+"        Specify a Python function to be called at the end of gathering\n"
+"        the CVS log. The function is passed a list with the log entries,\n"
+"        and can modify the entries in-place, or add or delete them.\n"
+"    --config hook.cvschangesets\n"
+"        Specify a Python function to be called after the changesets\n"
+"        are calculated from the the CVS log. The function is passed\n"
+"        a list with the changeset entries, and can modify the changesets\n"
+"        in-place, or add or delete them."
 msgstr ""
 
 msgid ""
 "    An additional \"debugcvsps\" Mercurial command allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
 "    parameters and output are similar to that of cvsps 2.1. Please see\n"
 "    the command help for more details."
 msgstr ""
 
 msgid ""
 "    Subversion Source\n"
 "    -----------------"
 msgstr ""
 
 msgid ""
 "    Subversion source detects classical trunk/branches/tags layouts.\n"
 "    By default, the supplied \"svn://repo/path/\" source URL is\n"
 "    converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
 "    replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
 "    its subdirectories are listed as possible branches. If\n"
 "    \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
 "    converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
 "    can be overridden with following options. Set them to paths\n"
 "    relative to the source URL, or leave them blank to disable auto\n"
 "    detection."
 msgstr ""
 
 msgid ""
 "    --config convert.svn.branches=branches    (directory name)\n"
 "        specify the directory containing branches\n"
 "    --config convert.svn.tags=tags            (directory name)\n"
 "        specify the directory containing tags\n"
 "    --config convert.svn.trunk=trunk          (directory name)\n"
 "        specify the name of the trunk branch"
 msgstr ""
 
 msgid ""
 "    Source history can be retrieved starting at a specific revision,\n"
 "    instead of being integrally converted. Only single branch\n"
 "    conversions are supported."
 msgstr ""
 
 msgid ""
 "    --config convert.svn.startrev=0           (svn revision number)\n"
 "        specify start Subversion revision."
 msgstr ""
 
 msgid ""
 "    Perforce Source\n"
 "    ---------------"
 msgstr ""
 
 msgid ""
 "    The Perforce (P4) importer can be given a p4 depot path or a\n"
 "    client specification as source. It will convert all files in the\n"
 "    source to a flat Mercurial repository, ignoring labels, branches\n"
 "    and integrations. Note that when a depot path is given you then\n"
 "    usually should specify a target directory, because otherwise the\n"
 "    target may be named ...-hg."
 msgstr ""
 
 msgid ""
 "    It is possible to limit the amount of source history to be\n"
 "    converted by specifying an initial Perforce revision."
 msgstr ""
 
 msgid ""
 "    --config convert.p4.startrev=0            (perforce changelist number)\n"
 "        specify initial Perforce revision."
 msgstr ""
 
 msgid ""
 "    Mercurial Destination\n"
 "    ---------------------"
 msgstr ""
 
 msgid ""
 "    --config convert.hg.clonebranches=False   (boolean)\n"
 "        dispatch source branches in separate clones.\n"
 "    --config convert.hg.tagsbranch=default    (branch name)\n"
 "        tag revisions branch name\n"
 "    --config convert.hg.usebranchnames=True   (boolean)\n"
 "        preserve branch names"
 msgstr ""
 
 msgid "    "
 msgstr ""
 
 msgid "create changeset information from CVS"
 msgstr ""
 
 msgid ""
 "    This command is intended as a debugging tool for the CVS to\n"
 "    Mercurial converter, and can be used as a direct replacement for\n"
 "    cvsps."
 msgstr ""
 
 msgid ""
 "    Hg debugcvsps reads the CVS rlog for current directory (or any\n"
 "    named directory) in the CVS repository, and converts the log to a\n"
 "    series of changesets based on matching commit log entries and\n"
 "    dates."
 msgstr ""
 
 msgid "username mapping filename"
 msgstr "nome del file con il mapping degli username"
 
 msgid "destination repository type"
 msgstr "tipo di repository di destinazione"
 
 msgid "remap file names using contents of file"
 msgstr "rimappa i nomi dei file usando il contenuto dei file"
 
 msgid "import up to target revision REV"
 msgstr "importa fino alla revisione target REV"
 
 msgid "source repository type"
 msgstr "tipo del repository sorgente"
 
 msgid "splice synthesized history into place"
 msgstr ""
 
 msgid "change branch names while converting"
 msgstr ""
 
 msgid "try to sort changesets by branches"
 msgstr "prova ad ordinare i changeset per branch"
 
 msgid "try to sort changesets by date"
 msgstr "prova ad ordinare i changeset per data"
 
 msgid "preserve source changesets order"
 msgstr "preserva l'ordine dei changeset nella sorgente"
 
 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
 msgstr "hg convert [OPZIONI]... SORGENTE [DEST [REVMAP]]"
 
 msgid "only return changes on specified branches"
 msgstr "restituisce solo le modifiche relative alle branch specificate"
 
 msgid "prefix to remove from file names"
 msgstr "prefisso da rimuovere dai nomi dei file"
 
 msgid "only return changes after or between specified tags"
 msgstr "restituisce solo le modifiche dopo o tra le tag specificate"
 
 msgid "update cvs log cache"
 msgstr "aggiorna la cache dei log di cvs"
 
 msgid "create new cvs log cache"
 msgstr "crea una nuova cache dei log cvs"
 
 msgid "set commit time fuzz in seconds"
 msgstr "imposta il lasso temporale del commit in secondi"
 
 msgid "specify cvsroot"
 msgstr "specifica la cvsroot"
 
 msgid "show parent changesets"
 msgstr "mostra i changeset genitori"
 
 msgid "show current changeset in ancestor branches"
 msgstr "mostra il changeset corrente nei rami degli antenati"
 
 msgid "ignored for compatibility"
 msgstr "ignorato per compatibilità"
 
 msgid "hg debugcvsps [OPTION]... [PATH]..."
 msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..."
 
-msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
+#, fuzzy, python-format
+msgid "%s does not look like a Bazaar repository"
+msgstr "%s non sembra essere un repository GNU Arch"
+
+#, fuzzy
+msgid "Bazaar modules could not be loaded"
+msgstr "Non è stato possibile caricare i binding python per Subversion"
+
+msgid ""
+"warning: lightweight checkouts may cause conversion failures, try with a "
+"regular branch instead.\n"
 msgstr ""
 
 msgid "bzr source type could not be determined\n"
 msgstr ""
 
 #, python-format
 msgid "%s is not a valid revision in current branch"
 msgstr "%s non è una revisione valida nella branch corrente"
 
 #, python-format
 msgid "%s is not available in %s anymore"
 msgstr "%s non è più disponibile in %s"
 
 #, python-format
 msgid "%s.%s symlink has no target"
 msgstr ""
 
 #, python-format
 msgid "cannot find required \"%s\" tool"
 msgstr "impossibile trovare il tool richiesto \"%s\""
 
 #, python-format
 msgid "%s error:\n"
 msgstr "%s errore:\n"
 
 #, python-format
 msgid "syntax error in %s(%d): key/value pair expected"
 msgstr ""
 
 #, python-format
 msgid "could not open map file %r: %s"
 msgstr "impossibile aprire il file di associazione %r: %s"
 
+#, fuzzy, python-format
+msgid "%s: invalid source repository type"
+msgstr "tipo del repository sorgente"
+
 #, python-format
 msgid "%s: missing or unsupported repository"
 msgstr "%s: repository mancante o non supportato"
 
+#, fuzzy, python-format
+msgid "%s: invalid destination repository type"
+msgstr "tipo di repository di destinazione"
+
 #, python-format
 msgid "convert: %s\n"
 msgstr "convert: %s\n"
 
 #, python-format
 msgid "%s: unknown repository type"
 msgstr "%s: tipo di repository sconosciuto"
 
+#, fuzzy
+msgid "getting files"
+msgstr "sto ottenendo %s\n"
+
+#, fuzzy
+msgid "revisions"
+msgstr "revisione"
+
+msgid "scanning"
+msgstr ""
+
 #, python-format
 msgid "unknown sort mode: %s"
 msgstr "modalità di ordinamento sconosciuta: %s"
 
 #, python-format
 msgid "cycle detected between %s and %s"
 msgstr "ciclo rilevato tra %s e %s"
 
 msgid "not all revisions were sorted"
 msgstr "non tutte le revisioni erano ordinate"
 
 #, python-format
 msgid "Writing author map file %s\n"
 msgstr "Scrivo il file di associazione degli autori %s\n"
 
 #, python-format
 msgid "Ignoring bad line in author map file %s: %s\n"
 msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n"
 
 #, python-format
 msgid "mapping author %s to %s\n"
 msgstr "sto associando l'autore %s a %s\n"
 
 #, python-format
 msgid "overriding mapping for author %s, was %s, will be %s\n"
 msgstr "rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n"
 
 #, python-format
 msgid "spliced in %s as parents of %s\n"
 msgstr "inserito %s come genitore di %s\n"
 
 msgid "scanning source...\n"
 msgstr "sto effettuando la scansione della sorgente...\n"
 
 msgid "sorting...\n"
 msgstr "sto ordinando...\n"
 
 msgid "converting...\n"
 msgstr "sto effettuando la conversione...\n"
 
 #, python-format
 msgid "source: %s\n"
 msgstr "sorgente: %s\n"
 
+#, fuzzy
+msgid "converting"
+msgstr "sto effettuando la conversione...\n"
+
 #, python-format
 msgid "assuming destination %s\n"
 msgstr "assumo destinazione %s\n"
 
 msgid "more than one sort mode specified"
 msgstr "più di una modalità di ordinamento specificata"
 
 msgid "--sourcesort is not supported by this data source"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "%s does not look like a CVS checkout"
+msgstr "%s non sembra essere un repository GNU Arch"
+
 #, python-format
 msgid "revision %s is not a patchset number"
 msgstr "la revisione %s non è un numero di patchset"
 
 #, python-format
 msgid "connecting to %s\n"
 msgstr "sto connettendomi a %s\n"
 
 msgid "CVS pserver authentication failed"
 msgstr "autenticazione pserver CVS fallita"
 
 #, python-format
-msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
 msgstr ""
 
 #, python-format
 msgid "%d bytes missing from remote file"
 msgstr "%d byte mancanti dal file remoto"
 
+msgid "malformed response from CVS"
+msgstr ""
+
 #, python-format
 msgid "cvs server: %s\n"
 msgstr "server cvs: %s\n"
 
 #, python-format
 msgid "unknown CVS response: %s"
 msgstr "risposta CVS sconosciuta: %s"
 
 msgid "collecting CVS rlog\n"
 msgstr "sto collezionando gli rlog CVS\n"
 
+msgid "not a CVS sandbox"
+msgstr ""
+
 #, python-format
 msgid "reading cvs log cache %s\n"
 msgstr "sto leggendo la cache dei log cvs %s\n"
 
 #, python-format
 msgid "cache has %d log entries\n"
 msgstr "la cache ha %d voci di log\n"
 
 #, python-format
 msgid "error reading cache: %r\n"
 msgstr "errore durante la lettura della cache: %r\n"
 
 #, python-format
 msgid "running %s\n"
 msgstr "sto eseguendo %s\n"
 
 msgid "RCS file must be followed by working file"
 msgstr "Il file RCS deve essere seguito da un file funzionante"
 
 msgid "must have at least some revisions"
 msgstr "è necessario avere almeno alcune revisioni"
 
 msgid "expected revision number"
 msgstr "numero di revisione atteso"
 
 msgid "revision must be followed by date line"
 msgstr "la revisione deve essere seguita da una riga con la data"
 
+msgid "log cache overlaps with new log entries, re-run without cache."
+msgstr ""
+
 #, python-format
 msgid "writing cvs log cache %s\n"
 msgstr "sto scrivendo la cache dei log cvs %s\n"
 
 #, python-format
 msgid "%d log entries\n"
 msgstr "%d voci di log\n"
 
 msgid "creating changesets\n"
 msgstr "sto creando i changeset\n"
 
 msgid "synthetic changeset cannot have multiple parents"
 msgstr "changeset sintetici non possono avere genitori multipli"
 
 #, python-format
 msgid ""
 "warning: CVS commit message references non-existent branch %r:\n"
 "%s\n"
 msgstr ""
 
 #, python-format
 msgid "%d changeset entries\n"
 msgstr "%d voci di changeset\n"
 
+#, fuzzy, python-format
+msgid "%s does not look like a darcs repository"
+msgstr "%s non sembra essere un repository GNU Arch"
+
 #, python-format
 msgid "darcs version 2.1 or newer needed (found %r)"
 msgstr ""
 
 msgid "Python ElementTree module is not available"
 msgstr "il modulo Python ElementTree non è disponibile"
 
 msgid "internal calling inconsistency"
 msgstr "inconsistenza nella chiamata interna"
 
 msgid "errors in filemap"
 msgstr "errori nel filemap"
 
 #, python-format
 msgid "%s:%d: %r already in %s list\n"
 msgstr "%s:%d: %r esiste già nell'elenco %s\n"
 
 #, python-format
 msgid "%s:%d: unknown directive %r\n"
 msgstr "%s:%d: direttiva sconosciuta %r\n"
 
 msgid "source repository doesn't support --filemap"
 msgstr "il repository sorgente non supporta --filemap"
 
-#, python-format
-msgid "%s does not look like a GNU Arch repo"
+#, fuzzy, python-format
+msgid "%s does not look like a Git repository"
+msgstr "%s non sembra essere un repository GNU Arch"
+
+msgid "cannot retrieve git heads"
+msgstr ""
+
+#, python-format
+msgid "cannot read %r object at %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "cannot read changes in %s"
+msgstr "effettuato il commit del changeset %d:%s\n"
+
+#, python-format
+msgid "cannot read tags from %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "%s does not look like a GNU Arch repository"
 msgstr "%s non sembra essere un repository GNU Arch"
 
 msgid "cannot find a GNU Arch tool"
 msgstr "impossibile trovare un tool GNU Arch"
 
 #, python-format
 msgid "analyzing tree version %s...\n"
 msgstr "sto analizzando la versione dell'albero %s...\n"
 
 #, python-format
-msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
+msgid ""
+"tree analysis stopped because it points to an unregistered archive %s...\n"
 msgstr ""
 "analisi dell'albero interrotta in quanto punta ad un archivio non\n"
 "      registrato %s...\n"
 
 #, python-format
 msgid "could not parse cat-log of %s"
 msgstr ""
 
-#, python-format
-msgid "%s is not a local Mercurial repo"
+#, fuzzy, python-format
+msgid "%s is not a local Mercurial repository"
 msgstr "%s non è un repository locale Mercurial"
 
 #, python-format
 msgid "initializing destination %s repository\n"
 msgstr "sto inizializzando il repository destinatario %s\n"
 
+#, fuzzy, python-format
+msgid "could not create hg repository %s as sink"
+msgstr "impossibile creare un nuovo repository http"
+
 #, python-format
 msgid "pulling from %s into %s\n"
 msgstr "sto effettuando il pull da %s a %s\n"
 
 #, fuzzy
 msgid "filtering out empty revision\n"
 msgstr "stampa la data revisione"
 
 msgid "updating tags\n"
 msgstr "sto aggiornando le tag\n"
 
 #, python-format
 msgid "%s is not a valid start revision"
 msgstr "%s non è una revisione iniziale valida"
 
 #, python-format
 msgid "ignoring: %s\n"
 msgstr "sto ignorando: %s\n"
 
-#, python-format
-msgid "%s does not look like a monotone repo"
+#, fuzzy, python-format
+msgid "%s does not look like a monotone repository"
 msgstr "%s non sembra essere un repository monotone"
 
 #, python-format
 msgid "copying file in renamed directory from '%s' to '%s'"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "%s does not look like a P4 repository"
+msgstr "%s non sembra essere un repository GNU Arch"
+
 msgid "reading p4 views\n"
 msgstr "sto leggendo le viste p4\n"
 
 msgid "collecting p4 changelists\n"
 msgstr "sto raccogliendo le changelist p4\n"
 
 msgid "Mercurial failed to run itself, check hg executable is in PATH"
 msgstr ""
 
+msgid ""
+"svn: cannot probe remote repository, assume it could be a subversion "
+"repository. Use --source-type if you know better.\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "%s does not look like a Subversion repository"
+msgstr "%s non sembra essere un repository monotone"
+
 msgid "Subversion python bindings could not be loaded"
 msgstr "Non è stato possibile caricare i binding python per Subversion"
 
 #, python-format
 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
-msgstr "Trovati binding python per Subversion %d.%d, richiesti 1.4 o successivi"
+msgstr ""
+"Trovati binding python per Subversion %d.%d, richiesti 1.4 o successivi"
 
 msgid "Subversion python bindings are too old, 1.4 or later required"
-msgstr "I binding python per Subversion sono troppo vecchi, richiesti 1.4 o successivi"
+msgstr ""
+"I binding python per Subversion sono troppo vecchi, richiesti 1.4 o "
+"successivi"
 
 #, python-format
 msgid "svn: revision %s is not an integer"
 msgstr "svn: la revisione %s non è un intero"
 
 #, python-format
 msgid "svn: start revision %s is not an integer"
 msgstr "svn: la revisione iniziale %s non è un intero"
 
 #, python-format
 msgid "no revision found in module %s"
 msgstr "nessuna revisione trovata nel modulo %s"
 
 #, python-format
 msgid "expected %s to be at %r, but not found"
 msgstr "mi aspettavo di trovare %s in %r, ma non esiste"
 
 #, python-format
 msgid "found %s at %r\n"
 msgstr "trovato %s in %r\n"
 
 #, python-format
 msgid "ignoring empty branch %s\n"
 msgstr "ignoro branch vuota %s\n"
 
 #, python-format
 msgid "found branch %s at %d\n"
 msgstr "trovata branch %s in %d\n"
 
 msgid "svn: start revision is not supported with more than one branch"
 msgstr "svn: con più di una branch non è supportata una revisione iniziale"
 
 #, python-format
 msgid "svn: no revision found after start revision %d"
 msgstr "svn: nessuna revisione trovata dopo la revisione iniziale %d"
 
 #, python-format
-msgid "no tags found at revision %d\n"
-msgstr "nessuna tag trovata alla revisione %d\n"
-
-#, python-format
 msgid "%s not found up to revision %d"
 msgstr "%s non trovato fino alla revisione %d"
 
+#, fuzzy
+msgid "scanning paths"
+msgstr "sto effettuando la scansione della sorgente...\n"
+
 #, python-format
 msgid "found parent of branch %s at %d: %s\n"
 msgstr "trovato genitore della branch %s in %d: %s\n"
 
 #, python-format
 msgid "fetching revision log for \"%s\" from %d to %d\n"
 msgstr ""
 
 #, python-format
 msgid "svn: branch has no revision %s"
 msgstr "svn: la branch non ha nessuna revisione %s"
 
-#, python-format
-msgid "initializing svn repo %r\n"
+#, fuzzy, python-format
+msgid "initializing svn repository %r\n"
 msgstr "inizializzo il repository svn %r\n"
 
-#, python-format
-msgid "initializing svn wc %r\n"
+#, fuzzy, python-format
+msgid "initializing svn working copy %r\n"
 msgstr "inizializzo svn wc %r\n"
 
 msgid "unexpected svn output:\n"
 msgstr "output svn inatteso:\n"
 
 msgid "unable to cope with svn output"
 msgstr ""
 
 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
 msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n"
 
+msgid "automatically manage newlines in repository files"
+msgstr ""
+
+msgid ""
+"This extension allows you to manage the type of line endings (CRLF or\n"
+"LF) that are used in the repository and in the local working\n"
+"directory. That way you can get CRLF line endings on Windows and LF on\n"
+"Unix/Mac, thereby letting everybody use their OS native line endings."
+msgstr ""
+
+msgid ""
+"The extension reads its configuration from a versioned ``.hgeol``\n"
+"configuration file every time you run an ``hg`` command. The\n"
+"``.hgeol`` file use the same syntax as all other Mercurial\n"
+"configuration files. It uses two sections, ``[patterns]`` and\n"
+"``[repository]``."
+msgstr ""
+
+msgid ""
+"The ``[patterns]`` section specifies the line endings used in the\n"
+"working directory. The format is specified by a file pattern. The\n"
+"first match is used, so put more specific patterns first. The\n"
+"available line endings are ``LF``, ``CRLF``, and ``BIN``."
+msgstr ""
+
+msgid ""
+"Files with the declared format of ``CRLF`` or ``LF`` are always\n"
+"checked out in that format and files declared to be binary (``BIN``)\n"
+"are left unchanged. Additionally, ``native`` is an alias for the\n"
+"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n"
+"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n"
+"endings) is Mercurial's default behaviour; it is only needed if you\n"
+"need to override a later, more general pattern."
+msgstr ""
+
+msgid ""
+"The optional ``[repository]`` section specifies the line endings to\n"
+"use for files stored in the repository. It has a single setting,\n"
+"``native``, which determines the storage line endings for files\n"
+"declared as ``native`` in the ``[patterns]`` section. It can be set to\n"
+"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n"
+"that on Windows, files configured as ``native`` (``CRLF`` by default)\n"
+"will be converted to ``LF`` when stored in the repository. Files\n"
+"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n"
+"are always stored as-is in the repository."
+msgstr ""
+
+msgid "Example versioned ``.hgeol`` file::"
+msgstr ""
+
+msgid ""
+"  [patterns]\n"
+"  **.py = native\n"
+"  **.vcproj = CRLF\n"
+"  **.txt = native\n"
+"  Makefile = LF\n"
+"  **.jpg = BIN"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"  [repository]\n"
+"  native = LF"
+msgstr "il repository non è imparentato"
+
+msgid ""
+"The extension uses an optional ``[eol]`` section in your hgrc file\n"
+"(not the ``.hgeol`` file) for settings that control the overall\n"
+"behavior. There are two settings:"
+msgstr ""
+
+msgid ""
+"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
+"  ``CRLF`` override the default interpretation of ``native`` for\n"
+"  checkout. This can be used with :hg:`archive` on Unix, say, to\n"
+"  generate an archive where files have line endings for Windows."
+msgstr ""
+
+msgid ""
+"- ``eol.only-consistent`` (default True) can be set to False to make\n"
+"  the extension convert files with inconsistent EOLs. Inconsistent\n"
+"  means that there is both ``CRLF`` and ``LF`` present in the file.\n"
+"  Such files are normally not touched under the assumption that they\n"
+"  have mixed EOLs on purpose."
+msgstr ""
+
+msgid ""
+"See :hg:`help patterns` for more information about the glob patterns\n"
+"used.\n"
+msgstr ""
+
+#, python-format
+msgid "%s should not have CRLF line endings"
+msgstr ""
+
+#, python-format
+msgid "%s should not have LF line endings"
+msgstr ""
+
+msgid "the eol extension is incompatible with the win32text extension"
+msgstr ""
+
+#, python-format
+msgid "ignoring unknown EOL style '%s' from %s\n"
+msgstr ""
+
+#, python-format
+msgid "inconsistent newline style in %s\n"
+msgstr ""
+
 msgid "command to allow external programs to compare revisions"
 msgstr ""
 
 msgid ""
 "The extdiff Mercurial extension allows you to use external programs\n"
 "to compare revisions, or revision with working directory. The external\n"
 "diff programs are called with a configurable set of options and two\n"
 "non-option arguments: paths to directories containing snapshots of\n"
 "files to compare."
 msgstr ""
 
 msgid ""
 "The extdiff extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always. ::"
+"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
 msgstr ""
 
 msgid ""
 "  [extdiff]\n"
 "  # add new command that runs GNU diff(1) in 'context diff' mode\n"
 "  cdiff = gdiff -Nprc5\n"
 "  ## or the old way:\n"
 "  #cmd.cdiff = gdiff\n"
 "  #opts.cdiff = -Nprc5"
 msgstr ""
 
 msgid ""
 "  # add new command called vdiff, runs kdiff3\n"
 "  vdiff = kdiff3"
 msgstr ""
 
 msgid ""
 "  # add new command called meld, runs meld (no need to name twice)\n"
 "  meld ="
 msgstr ""
 
 msgid ""
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
 "  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
 "  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
 "  # your .vimrc\n"
 "  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
 msgstr ""
 
-msgid ""
-"You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The extdiff extension makes snapshots of only needed\n"
-"files, so running the external diff program will actually be pretty\n"
-"fast (at least faster than having to compare the entire tree).\n"
+msgid "Tool arguments can include variables that are expanded at runtime::"
+msgstr ""
+
+msgid ""
+"  $parent1, $plabel1 - filename, descriptive label of first parent\n"
+"  $child,   $clabel  - filename, descriptive label of child revision\n"
+"  $parent2, $plabel2 - filename, descriptive label of second parent\n"
+"  $parent is an alias for $parent1."
+msgstr ""
+
+msgid ""
+"The extdiff extension will look in your [diff-tools] and [merge-tools]\n"
+"sections for diff tool arguments, when none are specified in [extdiff]."
+msgstr ""
+
+msgid ""
+"  [extdiff]\n"
+"  kdiff3 ="
+msgstr ""
+
+msgid ""
+"  [diff-tools]\n"
+"  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
+msgstr ""
+
+msgid ""
+"You can use -I/-X and list of file or directory names like normal\n"
+":hg:`diff` command. The extdiff extension makes snapshots of only\n"
+"needed files, so running the external diff program will actually be\n"
+"pretty fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
 
 #, python-format
 msgid "making snapshot of %d files from rev %s\n"
 msgstr ""
 
 #, python-format
 msgid "making snapshot of %d files from working directory\n"
 msgstr ""
 
 msgid "cannot specify --rev and --change at the same time"
 msgstr "impossibile specificare sia --rev sia --change"
 
 msgid "cleaning up temp directory\n"
 msgstr "sto ripulendo la directory temporanea\n"
 
 msgid "use external program to diff repository (or selected files)"
 msgstr ""
 
 msgid ""
 "    Show differences between revisions for the specified files, using\n"
 "    an external program. The default program used is diff, with\n"
 "    default options \"-Npru\"."
 msgstr ""
 
 msgid ""
 "    To select a different program, use the -p/--program option. The\n"
 "    program will be passed the names of two directories to compare. To\n"
 "    pass additional options to the program, use -o/--option. These\n"
 "    will be passed before the names of the directories to compare."
 msgstr ""
 
 msgid ""
 "    When two revision arguments are given, then changes are shown\n"
 "    between those revisions. If only one revision is specified then\n"
 "    that revision is compared to the working directory, and, when no\n"
 "    revisions are specified, the working directory files are compared\n"
 "    to its parent."
 msgstr ""
 
+msgid "CMD"
+msgstr ""
+
 msgid "comparison program to run"
 msgstr "programma per i confronti da eseguire"
 
+#, fuzzy
+msgid "OPT"
+msgstr "OPZIONI"
+
 msgid "pass option to comparison program"
 msgstr "passa l'opzione al programma per i confronti"
 
 msgid "change made by revision"
 msgstr "modifica effettuata dalla revisione"
 
 msgid "hg extdiff [OPT]... [FILE]..."
 msgstr "hg extdiff [OPT]... [FILE]..."
 
 #, python-format
 msgid "use %(path)s to diff repository (or selected files)"
 msgstr ""
 
-#, python-format
-msgid ""
-"    Show differences between revisions for the specified files, using the\n"
-"    %(path)s program."
-msgstr ""
-
-#, python-format
-msgid ""
-"    When two revision arguments are given, then changes are shown between\n"
-"    those revisions. If only one revision is specified then that revision is\n"
-"    compared to the working directory, and, when no revisions are specified,\n"
-"    the working directory files are compared to its parent."
-msgstr ""
+#, fuzzy, python-format
+msgid ""
+"    Show differences between revisions for the specified files, using\n"
+"    the %(path)s program."
+msgstr ""
+"show revision history of entire repository or files\n"
+"\n"
+"    Print the revision history of the specified files or the entire\n"
+"    project.\n"
+"\n"
+"    File history is shown without following rename or copy history of\n"
+"    files. Use -f/--follow with a file name to follow history across\n"
+"    renames and copies. --follow without a file name will only show\n"
+"    ancestors or descendants of the starting revision. --follow-first\n"
+"    only follows the first parent of merge revisions.\n"
+"\n"
+"    If no revision range is specified, the default is tip:0 unless\n"
+"    --follow is set, in which case the working directory parent is\n"
+"    used as the starting revision.\n"
+"\n"
+"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
+"\n"
+"    By default this command outputs: changeset id and hash, tags,\n"
+"    non-trivial parents, user, date and time, and a summary for each\n"
+"    commit. When the -v/--verbose switch is used, the list of changed\n"
+"    files and full commit message is shown.\n"
+"\n"
+"    NOTE: log -p may generate unexpected diff output for merge\n"
+"    changesets, as it will compare the merge changeset against its\n"
+"    first parent only. Also, the files: list will only reflect files\n"
+"    that are different from BOTH parents.\n"
+"\n"
+"    "
 
 #, python-format
 msgid "hg %s [OPTION]... [FILE]..."
 msgstr "hg %s [OPZIONI]... [FILE]..."
 
 #, fuzzy
 msgid "pull, update and merge in one command"
 msgstr "pull, update e merge in un comando"
 
 #, fuzzy
 msgid "pull changes from a remote repository, merge new changes if needed."
-msgstr "effettua il pull delle modifiche da un repository remoto, effettua il merge delle nuove modifiche se necessario."
+msgstr ""
+"effettua il pull delle modifiche da un repository remoto, effettua il merge "
+"delle nuove modifiche se necessario."
 
 #, fuzzy
 msgid ""
 "    This finds all changes from the repository at the specified path\n"
 "    or URL and adds them to the local repository."
 msgstr ""
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
 "    e le aggiunge al repository locale."
 
 #, fuzzy
 msgid ""
 "    If the pulled changes add a new branch head, the head is\n"
 "    automatically merged, and the result of the merge is committed.\n"
 "    Otherwise, the working directory is updated to include the new\n"
 "    changes."
 msgstr ""
-"    Se le modifiche ottenute aggiungono una nuova head, il merge di questa viene effettuato\n"
+"    Se le modifiche ottenute aggiungono una nuova head, il merge di questa "
+"viene effettuato\n"
 "    automaticamente e si effettua il commit del merge. Altrimenti, la\n"
 "    directory di lavoro viene aggiornata per includere le nuove modifiche."
 
 #, fuzzy
 msgid ""
 "    When a merge occurs, the newly pulled changes are assumed to be\n"
 "    \"authoritative\". The head of the new changes is used as the first\n"
 "    parent, with local changes as the second. To switch the merge\n"
 "    order, use --switch-parent."
 msgstr ""
-"    Quando si verifica un merge, si assume che le modifiche appena ottenute siano\n"
+"    Quando si verifica un merge, si assume che le modifiche appena ottenute "
+"siano\n"
 "    \"autoritarie\". La head delle nuove modifiche è usata come primo\n"
 "    genitore, con le modifiche locali come secondo. Per invertire l'ordine\n"
 "    di merge, usare --switch-parent."
 
 #, fuzzy
 msgid ""
-"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
+"    See :hg:`help dates` for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "    "
 
-msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
+msgid ""
+"working dir not at branch tip (use \"hg update\" to check out branch tip)"
 msgstr ""
 "directory di lavoro non al tip della branch (usa \"hg update\" per\n"
 "      fare il check out della tip della branch)"
 
 msgid "outstanding uncommitted merge"
 msgstr "c'è un merge in sospeso di cui non si è effettuato il commit"
 
 msgid "outstanding uncommitted changes"
 msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit"
 
 msgid "working directory is missing some files"
 msgstr "alla directory di lavoro mancano alcuni file"
 
-msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
+msgid ""
+"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
 msgstr ""
 "head multiple in questa branch (usa \"hg heads .\" e \"hg merge\"\n"
 "      per fare il merge"
 
 #, python-format
 msgid "pulling from %s\n"
 msgstr "sto facendo pull da %s\n"
 
-msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
-msgstr "L'altro repository non supporta la ricerca di revisioni, quindi una revisione non può essere specificata."
-
-#, python-format
-msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
+msgid ""
+"Other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+"L'altro repository non supporta la ricerca di revisioni, quindi una "
+"revisione non può essere specificata."
+
+#, python-format
+msgid ""
+"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
+"\" to merge them)\n"
 msgstr ""
 
 #, python-format
 msgid "updating to %d:%s\n"
 msgstr "sto aggiornando a %d:%s\n"
 
 #, python-format
 msgid "merging with %d:%s\n"
 msgstr "sto facendo il merge con %d:%s\n"
 
 #, python-format
 msgid "new changeset %d:%s merges remote changes with local\n"
-msgstr "il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle locali\n"
+msgstr ""
+"il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle "
+"locali\n"
 
 msgid "a specific revision you would like to pull"
 msgstr "una specifica revisione di cui si desidera fare il pull"
 
 msgid "edit commit message"
 msgstr "modifica il messaggio di commit"
 
 msgid "edit commit message (DEPRECATED)"
 msgstr "modifica il messaggio di commit (DEPRECATO)"
 
 msgid "switch parents when merging"
 msgstr "inverte i genitori durante il merge"
 
 msgid "hg fetch [SOURCE]"
 msgstr "hg fetch [SORGENTE]"
 
 #, fuzzy
 msgid "commands to sign and verify changesets"
 msgstr "elenca i changeset firmati"
 
 msgid "error while verifying signature"
 msgstr "errore durante la verifica della firma"
 
 #, python-format
 msgid "%s Bad signature from \"%s\"\n"
 msgstr "%s Firma non valida da \"%s\"\n"
 
 #, python-format
 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
 msgstr "%s Nota: La firma è scaduta (firmato da: \"%s\")\n"
 
 #, python-format
 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
 msgstr "%s Nota: Questa chiave è scaduta (firmato da: \"%s\")\n"
 
 msgid "list signed changesets"
 msgstr "elenca i changeset firmati"
 
 #, python-format
 msgid "%s:%d node does not exist\n"
 msgstr "il nodo %s:%d non esiste\n"
 
 msgid "verify all the signatures there may be for a particular revision"
-msgstr "verifica tutte le firme che potrebbero esistere per una particolare revisione"
+msgstr ""
+"verifica tutte le firme che potrebbero esistere per una particolare revisione"
 
 #, python-format
 msgid "No valid signature for %s\n"
 msgstr "Nessuna firma valida per %s\n"
 
 msgid "add a signature for the current or given revision"
 msgstr "aggiunge una firma per la revisione corrente o data"
 
 msgid ""
 "    If no revision is given, the parent of the working directory is used,\n"
 "    or tip if no revision is checked out."
 msgstr ""
 "    Se nessuna revisione è stata specificata, viene usato il genitore\n"
 "    della directory di lavoro, oppure tip se non si è eseguito il\n"
 "    checkout di nessuna revisione."
 
 msgid "uncommitted merge - please provide a specific revision"
-msgstr "merge di cui non si è effettuato il commit - si prega di fornire una revisione specifica"
+msgstr ""
+"merge di cui non si è effettuato il commit - si prega di fornire una "
+"revisione specifica"
+
+#, fuzzy, python-format
+msgid "Signing %d:%s\n"
+msgstr "sto ignorando: %s\n"
 
 msgid "Error while signing"
 msgstr "Errore durante la firma"
 
-msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
-msgstr "la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit manualmente di .hgsigs o usare --force)"
+msgid ""
+"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
+"force)"
+msgstr ""
+"la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit "
+"manualmente di .hgsigs o usare --force)"
 
 msgid "unknown signature version"
 msgstr "versione della firma sconosciuta"
 
 msgid "make the signature local"
 msgstr "rende la firma locale"
 
 msgid "sign even if the sigfile is modified"
 msgstr "firma anche se il sigfile è stato modificato"
 
 msgid "do not commit the sigfile after signing"
 msgstr "non effettuare il commit del sigfile dopo la firma"
 
+msgid "ID"
+msgstr ""
+
 msgid "the key id to sign with"
 msgstr "l'id della chiave con cui firmare"
 
+msgid "TEXT"
+msgstr ""
+
 msgid "commit message"
 msgstr "messaggio di commit"
 
 msgid "hg sign [OPTION]... [REVISION]..."
 msgstr "hg sign [OPZIONI]... [REVISIONE]..."
 
 msgid "hg sigcheck REVISION"
 msgstr "hg sigcheck REVISIONE"
 
 msgid "hg sigs"
 msgstr "hg sigs"
 
 msgid "command to view revision graphs from a shell"
 msgstr ""
 
 msgid ""
 "This extension adds a --graph option to the incoming, outgoing and log\n"
 "commands. When this options is given, an ASCII representation of the\n"
 "revision graph is also shown.\n"
 msgstr ""
 
 #, python-format
 msgid "--graph option is incompatible with --%s"
 msgstr "l'opzione --graph è incompatibile con --%s"
 
 msgid "show revision history alongside an ASCII revision graph"
 msgstr ""
 
 msgid ""
 "    Print a revision history alongside a revision graph drawn with\n"
 "    ASCII characters."
 msgstr ""
 
 msgid ""
 "    Nodes printed as an @ character are parents of the working\n"
 "    directory.\n"
 "    "
 msgstr ""
 
-#, python-format
-msgid "comparing with %s\n"
-msgstr "sto confrontando con %s\n"
-
-msgid "no changes found\n"
-msgstr "nessuna modifica trovata\n"
-
 msgid "show the revision DAG"
 msgstr ""
 
+msgid "NUM"
+msgstr ""
+
 msgid "limit number of changes displayed"
 msgstr ""
 
 msgid "show patch"
 msgstr "mostra patch"
 
 msgid "show the specified revision or range"
 msgstr ""
 
 msgid "hg glog [OPTION]... [FILE]"
 msgstr "hg glog [OPZIONI]... [FILE]"
 
 msgid "hooks for integrating with the CIA.vc notification service"
 msgstr ""
 
 msgid ""
 "This is meant to be run as a changegroup or incoming hook. To\n"
 "configure it, set the following options in your hgrc::"
 msgstr ""
 
 msgid ""
 "  [cia]\n"
 "  # your registered CIA user name\n"
 "  user = foo\n"
 "  # the name of the project in CIA\n"
 "  project = foo\n"
 "  # the module (subproject) (optional)\n"
 "  #module = foo\n"
 "  # Append a diffstat to the log message (optional)\n"
 "  #diffstat = False\n"
 "  # Template to use for log messages (optional)\n"
 "  #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
 "  # Style to use (optional)\n"
 "  #style = foo\n"
 "  # The URL of the CIA notification service (optional)\n"
 "  # You can use mailto: URLs to send by email, eg\n"
 "  # mailto:[e-mail]\n"
 "  # Make sure to set email.from if you do this.\n"
 "  #url = http://cia.vc/\n"
 "  # print message instead of sending it (optional)\n"
 "  #test = False"
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  # one of these:\n"
 "  changegroup.cia = python:hgcia.hook\n"
 "  #incoming.cia = python:hgcia.hook"
 msgstr ""
 
 msgid ""
 "  [web]\n"
 "  # If you want hyperlinks (optional)\n"
 "  baseurl = http://server/path/to/repo\n"
 msgstr ""
 
 #, python-format
+msgid "%s returned an error: %s"
+msgstr ""
+
+#, python-format
 msgid "hgcia: sending update to %s\n"
 msgstr ""
 
 msgid "email.from must be defined when sending by email"
 msgstr "email.from deve essere definito quando si mandano mail"
 
 msgid "browse the repository in a graphical way"
 msgstr ""
 
 msgid ""
 "The hgk extension allows browsing the history of a repository in a\n"
 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
 "distributed with Mercurial.)"
 msgstr ""
 
 msgid ""
 "hgk consists of two parts: a Tcl script that does the displaying and\n"
 "querying of information, and an extension to Mercurial named hgk.py,\n"
 "which provides hooks for hgk to get information. hgk can be found in\n"
 "the contrib directory, and the extension is shipped in the hgext\n"
 "repository, and needs to be enabled."
 msgstr ""
 
 msgid ""
-"The hg view command will launch the hgk Tcl script. For this command\n"
+"The :hg:`view` command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
 "the path to hgk in your .hgrc file::"
 msgstr ""
 
 msgid ""
 "  [hgk]\n"
 "  path=/location/of/hgk"
 msgstr ""
 
 msgid ""
 "hgk can make use of the extdiff extension to visualize revisions.\n"
 "Assuming you had already configured extdiff vdiff command, just add::"
 msgstr ""
 
 msgid ""
 "  [hgk]\n"
 "  vdiff=vdiff"
 msgstr ""
 
 msgid ""
 "Revisions context menu will now display additional entries to fire\n"
 "vdiff on hovered and selected revisions.\n"
 msgstr ""
 
 msgid "diff trees from two commits"
 msgstr "mostra le differenze tra alberi di due commit"
 
 msgid "output common ancestor information"
 msgstr "stampa in output informazioni sull'antenato comune"
 
 msgid "cat a specific revision"
 msgstr "stampa a video una specifica revisione"
 
 msgid "cat-file: type or revision not supplied\n"
 msgstr "cat-file: tipo o revisione non forniti\n"
 
 msgid "aborting hg cat-file only understands commits\n"
 msgstr ""
 
 msgid "parse given revisions"
 msgstr "parsifica le revisioni date"
 
 msgid "print revisions"
 msgstr "stampa revisioni"
 
 msgid "print extension options"
 msgstr "stampa le opzioni dell'estensione"
 
 msgid "start interactive history viewer"
 msgstr "avvia visualizzatore interattivo della storia"
 
 msgid "hg view [-l LIMIT] [REVRANGE]"
 msgstr "hg view [-l LIMITE] [INTERVALLOREV]"
 
 msgid "generate patch"
 msgstr "genera patch"
 
 msgid "recursive"
 msgstr "ricorsivo"
 
 msgid "pretty"
 msgstr ""
 
 msgid "stdin"
 msgstr "stdin"
 
 msgid "detect copies"
 msgstr "rileva copie"
 
 msgid "search"
 msgstr "ricerca"
 
 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
 msgstr "hg git-diff-tree [OPZIONI]... NODO1 NODO2 [FILE]..."
 
 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
 msgstr "hg debug-cat-file [OPZIONI]... TIPO FILE"
 
 msgid "hg debug-config"
 msgstr "hg debug-config"
 
 #, fuzzy
 msgid "hg debug-merge-base REV REV"
 msgstr "hg debug-rev-parse REV"
 
 msgid "ignored"
 msgstr "ignorato"
 
 msgid "hg debug-rev-parse REV"
 msgstr "hg debug-rev-parse REV"
 
 msgid "header"
 msgstr "intestazione"
 
 msgid "topo-order"
 msgstr "ordine topologico"
 
 msgid "parents"
 msgstr "genitori"
 
 msgid "max-count"
 msgstr "conto massimo"
 
 #, fuzzy
 msgid "hg debug-rev-list [OPTION]... REV..."
 msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..."
 
 msgid "syntax highlighting for hgweb (requires Pygments)"
 msgstr ""
 
 msgid ""
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/"
 msgstr ""
 
 msgid "There is a single configuration option::"
 msgstr ""
 
 msgid ""
 "  [web]\n"
 "  pygments_style = <style>"
 msgstr ""
 
 msgid "The default is 'colorful'.\n"
 msgstr ""
 
 msgid "accelerate status report using Linux's inotify service"
 msgstr ""
 
 msgid "start an inotify server for this repository"
 msgstr "avvia un server inotify per questo repository"
 
 msgid "debugging information for inotify extension"
 msgstr ""
 
 msgid ""
 "    Prints the list of directories being watched by the inotify server.\n"
 "    "
 msgstr ""
 
 msgid "directories being watched:\n"
 msgstr ""
 
 msgid "run server in background"
 msgstr "avvia il server in background"
 
 msgid "used internally by daemon mode"
 msgstr "usato internamente dalla modalità demone"
 
 msgid "minutes to sit idle before exiting"
 msgstr "minuti per cui stare in attesa prima di uscire"
 
 msgid "name of file to write process ID to"
 msgstr "nome del file in cui scrivere l'ID del processo"
 
 #, fuzzy
 msgid "hg inserve [OPTION]..."
 msgstr "hg inserve [OPT]..."
 
-msgid "(found dead inotify server socket; removing it)\n"
+#, fuzzy
+msgid "inotify-client: found dead inotify server socket; removing it\n"
 msgstr "(trovato socket morto del server inotify; lo rimuovo)\n"
 
-#, python-format
-msgid "could not start inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: could not start inotify server: %s\n"
 msgstr "impossibile avviare il server inotify: %s\n"
 
-#, python-format
-msgid "could not talk to new inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: could not talk to new inotify server: %s\n"
 msgstr "impossibile comunicare con il nuovo server inotify: %s\n"
 
-#, python-format
-msgid "failed to contact inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: failed to contact inotify server: %s\n"
 msgstr "non sono riuscito a contattare il server inotify: %s\n"
 
 #, fuzzy
-msgid "received empty answer from inotify server"
+msgid "inotify-client: received empty answer from inotify server"
 msgstr "Risposta inaspettata dal server remoto:"
 
 #, python-format
 msgid "(inotify: received response from incompatible server version %d)\n"
 msgstr ""
 
 #, python-format
 msgid "(inotify: received '%s' response when expecting '%s')\n"
 msgstr ""
 
 msgid "this system does not seem to support inotify"
 msgstr "questo sistema sembra non supportare inotify"
 
 #, python-format
 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
 msgstr ""
 
 msgid "*** this limit is too low to watch every directory in this repository\n"
 msgstr ""
 
 msgid "*** counting directories: "
 msgstr "*** sto contando le directory: "
 
 #, python-format
 msgid "found %d\n"
 msgstr "trovato %d\n"
 
 #, python-format
 msgid "*** to raise the limit from %d to %d (run as root):\n"
 msgstr ""
 
 #, python-format
 msgid "***  echo %d > %s\n"
 msgstr "***  echo %d > %s\n"
 
 #, python-format
 msgid "cannot watch %s until inotify watch limit is raised"
-msgstr "impossibile controllare %s finchè il limite di controlli di inotify non verrà aumentato"
+msgstr ""
+"impossibile controllare %s finchè il limite di controlli di inotify non "
+"verrà aumentato"
 
 #, python-format
 msgid "inotify service not available: %s"
 msgstr "servizio inotify non disponibile: %s"
 
 #, python-format
 msgid "watching %r\n"
 msgstr "sto controllando %r\n"
 
 #, python-format
 msgid "watching directories under %r\n"
 msgstr "sto controllando le directory sotto %r\n"
 
 #, python-format
-msgid "status: %r %s -> %s\n"
-msgstr "status: %r %s -> %s\n"
-
-#, python-format
-msgid "%s dirstate reload\n"
-msgstr ""
-
-#, python-format
-msgid "%s end dirstate reload\n"
-msgstr ""
-
-msgid "rescanning due to .hgignore change\n"
-msgstr ""
-
-#, python-format
 msgid "%s event: created %s\n"
 msgstr "evento %s: creato %s\n"
 
 #, python-format
 msgid "%s event: deleted %s\n"
 msgstr "evento %s: cancellato %s\n"
 
 #, python-format
 msgid "%s event: modified %s\n"
 msgstr "evento %s: modificato %s\n"
 
 #, python-format
 msgid "filesystem containing %s was unmounted\n"
 msgstr "il filesystem contenente %s era smontato\n"
 
 #, python-format
 msgid "%s readable: %d bytes\n"
 msgstr "%s leggibile: %d byte\n"
 
 #, python-format
 msgid "%s below threshold - unhooking\n"
 msgstr ""
 
 #, python-format
 msgid "%s reading %d events\n"
 msgstr ""
 
 #, python-format
 msgid "%s hooking back up with %d bytes readable\n"
 msgstr ""
 
-#, python-format
-msgid "could not start server: %s"
+msgid "finished setup\n"
+msgstr ""
+
+#, python-format
+msgid "status: %r %s -> %s\n"
+msgstr "status: %r %s -> %s\n"
+
+msgid "rescanning due to .hgignore change\n"
+msgstr ""
+
+msgid "cannot start: socket is already bound"
+msgstr ""
+
+msgid ""
+"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
+"inotify.sock already exists"
 msgstr ""
 
 #, python-format
 msgid "answering query for %r\n"
 msgstr ""
 
 #, python-format
 msgid "received query from incompatible client version %d\n"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "unrecognized query type: %s\n"
 msgstr "risposta non riconosciuta\n"
 
-msgid "finished setup\n"
-msgstr ""
-
 msgid "expand expressions into changelog and summaries"
 msgstr ""
 
 msgid ""
 "This extension allows the use of a special syntax in summaries, which\n"
 "will be automatically expanded into links or any other arbitrary\n"
 "expression, much like InterWiki does."
 msgstr ""
 
 msgid ""
 "A few example patterns (link to bug tracking, etc.) that may be used\n"
 "in your hgrc::"
 msgstr ""
 
 msgid ""
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
-"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
+"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
+"i\n"
 "  boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
 msgstr ""
 
 #, python-format
 msgid "interhg: invalid pattern for %s: %s\n"
 msgstr ""
 
 #, python-format
 msgid "interhg: invalid regexp for %s: %s\n"
 msgstr ""
 
 msgid "expand keywords in tracked files"
 msgstr ""
 
 msgid ""
 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
 "tracked text files selected by your configuration."
 msgstr ""
 
 msgid ""
 "Keywords are only expanded in local repositories and not stored in the\n"
 "change history. The mechanism can be regarded as a convenience for the\n"
 "current user or for archive distribution."
 msgstr ""
 
 msgid ""
-"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
-"hgrc files."
+"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
+"sections of hgrc files."
 msgstr ""
 
 msgid "Example::"
 msgstr ""
 
 msgid ""
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore"
 msgstr ""
 
 msgid ""
+"    [keywordset]\n"
+"    # prefer svn- over cvs-like default keywordmaps\n"
+"    svn = True"
+msgstr ""
+
+msgid ""
 "NOTE: the more specific you are in your filename patterns the less you\n"
 "lose speed in huge repositories."
 msgstr ""
 
 msgid ""
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n"
 "available templates and filters."
 msgstr ""
 
-msgid ""
-"An additional date template filter {date|utcdate} is provided. It\n"
-"returns a date like \"2006/09/18 15:13:13\"."
-msgstr ""
-
-msgid ""
-"The default template mappings (view with \"hg kwdemo -d\") can be\n"
-"replaced with customized keywords and templates. Again, run \"hg\n"
-"kwdemo\" to control the results of your config changes."
-msgstr ""
-
-msgid ""
-"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
+msgid "Three additional date template filters are provided::"
+msgstr ""
+
+msgid ""
+"    utcdate      \"2006/09/18 15:13:13\"\n"
+"    svnutcdate   \"2006-09-18 15:13:13Z\"\n"
+"    svnisodate   \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgstr ""
+
+msgid ""
+"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
+"replaced with customized keywords and templates. Again, run\n"
+":hg:`kwdemo` to control the results of your config changes."
+msgstr ""
+
+msgid ""
+"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n"
 "the risk of inadvertently storing expanded keywords in the change\n"
 "history."
 msgstr ""
 
 msgid ""
 "To force expansion after enabling it, or a configuration change, run\n"
-"\"hg kwexpand\"."
-msgstr ""
-
-msgid ""
-"Also, when committing with the record extension or using mq's qrecord,\n"
-"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
-"the files in question to update keyword expansions after all changes\n"
-"have been checked in."
+":hg:`kwexpand`."
 msgstr ""
 
 msgid ""
 "Expansions spanning more than one line and incremental expansions,\n"
 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
 "{desc}\" expands to the first line of the changeset description.\n"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "overwriting %s expanding keywords\n"
 msgstr "sovrascrivi %s parziale %s\n"
 
 #, python-format
 msgid "overwriting %s shrinking keywords\n"
 msgstr ""
 
 msgid "[keyword] patterns cannot match"
 msgstr ""
 
 msgid "no [keyword] patterns configured"
 msgstr ""
 
 msgid "print [keywordmaps] configuration and an expansion example"
 msgstr ""
 
 msgid ""
 "    Show current, custom, or default keyword template maps and their\n"
 "    expansions."
 msgstr ""
 
 msgid ""
 "    Extend the current configuration by specifying maps as arguments\n"
 "    and using -f/--rcfile to source an external hgrc file."
 msgstr ""
 
 msgid "    Use -d/--default to disable current configuration."
 msgstr ""
 
-msgid ""
-"    See \"hg help templates\" for information on templates and filters.\n"
-"    "
-msgstr ""
+#, fuzzy
+msgid ""
+"    See :hg:`help templates` for information on templates and filters.\n"
+"    "
+msgstr ""
+"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
+"    "
 
 #, fuzzy, python-format
 msgid "creating temporary repository at %s\n"
 msgstr "lock del repository remoto fallito"
 
 msgid ""
 "\n"
 "\tconfiguration using custom keyword template maps\n"
 msgstr ""
 
 msgid "\textending current template maps\n"
 msgstr ""
 
 msgid "\toverriding default template maps\n"
 msgstr ""
 
 msgid ""
 "\n"
 "\tconfiguration using default keyword template maps\n"
 msgstr ""
 
 #, fuzzy
 msgid "\tdisabling current template maps\n"
 msgstr "mostra usando un file mappa template"
 
 msgid ""
 "\n"
 "\tconfiguration using current keyword template maps\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "\n"
 "keywords written to %s:\n"
 msgstr ""
 
-msgid "unhooked all commit hooks\n"
+msgid "hg keyword configuration and expansion example"
 msgstr ""
 
 msgid ""
 "\n"
 "\tkeywords expanded\n"
 msgstr ""
 
 msgid "expand keywords in the working directory"
 msgstr ""
 
 msgid "    Run after (re)enabling keyword expansion."
 msgstr ""
 
 msgid ""
 "    kwexpand refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid "show files configured for keyword expansion"
 msgstr ""
 
 msgid ""
 "    List which files in the working directory are matched by the\n"
 "    [keyword] configuration patterns."
 msgstr ""
 
 msgid ""
 "    Useful to prevent inadvertent keyword expansion and to speed up\n"
 "    execution by including only files that are actual candidates for\n"
 "    expansion."
 msgstr ""
 
 msgid ""
-"    See \"hg help keyword\" on how to construct patterns both for\n"
+"    See :hg:`help keyword` on how to construct patterns both for\n"
 "    inclusion and exclusion of files."
 msgstr ""
 
 msgid ""
 "    With -A/--all and -v/--verbose the codes used to show the status\n"
 "    of files are::"
 msgstr ""
 
 msgid ""
 "      K = keyword expansion candidate\n"
 "      k = keyword expansion candidate (not tracked)\n"
 "      I = ignored\n"
 "      i = ignored (not tracked)\n"
 "    "
 msgstr ""
 
 msgid "revert expanded keywords in the working directory"
 msgstr ""
 
 msgid ""
 "    Run before changing/disabling active keywords or if you experience\n"
-"    problems with \"hg import\" or \"hg merge\"."
+"    problems with :hg:`import` or :hg:`merge`."
 msgstr ""
 
 msgid ""
 "    kwshrink refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid "show default keyword template maps"
 msgstr ""
 
 msgid "read maps from rcfile"
 msgstr ""
 
 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
 msgstr ""
 
 msgid "hg kwexpand [OPTION]... [FILE]..."
 msgstr "hg kwexpand [OPZIONI]... [FILE]..."
 
 msgid "show keyword status flags of all files"
 msgstr ""
 
 msgid "show files excluded from expansion"
 msgstr ""
 
 #, fuzzy
 msgid "only show unknown (not tracked) files"
 msgstr "mostra solo i file sconosciuti (non tracciati)"
 
-#, fuzzy
-msgid "show keyword status flags of all files (DEPRECATED)"
-msgstr "mostra lo stato di tutti i file"
-
-msgid "only show untracked files (DEPRECATED)"
-msgstr ""
-
 msgid "hg kwfiles [OPTION]... [FILE]..."
 msgstr "hg kwfiles [OPZIONI]... [FILE]..."
 
 msgid "hg kwshrink [OPTION]... [FILE]..."
 msgstr "hg kwshrink [OPZIONI]... [FILE]..."
 
 msgid "manage a stack of patches"
 msgstr ""
 
 msgid ""
 "This extension lets you work with a stack of patches in a Mercurial\n"
 "repository. It manages two stacks of patches - all known patches, and\n"
 "applied patches (subset of known patches)."
 msgstr ""
 
 msgid ""
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets."
 msgstr ""
 
-msgid "Common tasks (use \"hg help command\" for more details)::"
-msgstr ""
-
-msgid ""
-"  prepare repository to work with patches   qinit\n"
+msgid "Common tasks (use :hg:`help command` for more details)::"
+msgstr ""
+
+msgid ""
 "  create new patch                          qnew\n"
 "  import existing patch                     qimport"
 msgstr ""
 
 msgid ""
 "  print patch series                        qseries\n"
 "  print applied patches                     qapplied"
 msgstr ""
 
 msgid ""
 "  add known patch to applied stack          qpush\n"
 "  remove patch from applied stack           qpop\n"
-"  refresh contents of top applied patch     qrefresh\n"
+"  refresh contents of top applied patch     qrefresh"
+msgstr ""
+
+msgid ""
+"By default, mq will automatically use git patches when required to\n"
+"avoid losing file mode changes, copy records, binary files or empty\n"
+"files creations or deletions. This behaviour can be configured with::"
+msgstr ""
+
+msgid ""
+"  [mq]\n"
+"  git = auto/keep/yes/no"
+msgstr ""
+
+msgid ""
+"If set to 'keep', mq will obey the [diff] section configuration while\n"
+"preserving existing git patches upon qrefresh. If set to 'yes' or\n"
+"'no', mq will override the [diff] section and always generate git or\n"
+"regular patches, possibly losing data in the second case."
+msgstr ""
+
+msgid ""
+"You will by default be managing a patch queue named \"patches\". You can\n"
+"create other, independent patch queues with the :hg:`qqueue` command.\n"
+msgstr ""
+
+#, python-format
+msgid "mq.git option can be auto/keep/yes/no got %s"
 msgstr ""
 
 #, python-format
 msgid "%s appears more than once in %s"
 msgstr "%s compare più di una volta in %s"
 
 msgid "guard cannot be an empty string"
 msgstr "una guardia non può essere una stringa vuota"
 
 #, python-format
 msgid "guard %r starts with invalid character: %r"
 msgstr "la guardia %r inizia con un carattere non valido: %r"
 
 #, python-format
 msgid "invalid character in guard %r: %r"
 msgstr "carattere non valido nella guardia %r: %r"
 
 #, python-format
 msgid "guard %r too short"
 msgstr "la guardia %r è troppo corta"
 
 #, python-format
 msgid "guard %r starts with invalid char"
 msgstr "la guardia %r inizia con un carattere non valido"
 
 #, python-format
 msgid "allowing %s - no guards in effect\n"
 msgstr ""
 
 #, python-format
 msgid "allowing %s - no matching negative guards\n"
 msgstr ""
 
 #, python-format
 msgid "allowing %s - guarded by %r\n"
 msgstr ""
 
 #, python-format
 msgid "skipping %s - guarded by %r\n"
 msgstr "sto saltando %s - controllato da %r\n"
 
 #, python-format
 msgid "skipping %s - no matching guards\n"
 msgstr "sto saltando %s - nessuna guardia corrispondente\n"
 
 #, python-format
 msgid "error removing undo: %s\n"
 msgstr ""
 
 #, python-format
 msgid "apply failed for patch %s"
 msgstr "applicazione della patch %s fallita"
 
 #, python-format
 msgid "patch didn't work out, merging %s\n"
 msgstr ""
 
 #, python-format
 msgid "update returned %d"
 msgstr "l'aggiornamento ha restituito %d"
 
 msgid "repo commit failed"
 msgstr "commit del repository fallito"
 
 #, python-format
 msgid "unable to read %s"
 msgstr "impossibile leggere %s"
 
 #, python-format
 msgid "patch %s does not exist\n"
 msgstr "la patch %s non esiste\n"
 
 #, python-format
 msgid "patch %s is not applied\n"
 msgstr "la patch %s non è applicata\n"
 
 msgid "patch failed, unable to continue (try -v)\n"
 msgstr "patch fallita, impossibile continuare (provare con -v)\n"
 
 #, python-format
 msgid "applying %s\n"
 msgstr "sto applicando %s\n"
 
 #, fuzzy, python-format
 msgid "unable to read %s\n"
 msgstr "impossibile leggere %s"
 
 #, python-format
-msgid "imported patch %s\n"
-msgstr "patch %s importata\n"
-
-#, python-format
-msgid ""
-"\n"
-"imported patch %s"
-msgstr ""
-"\n"
-"patch %s importata"
-
-#, python-format
 msgid "patch %s is empty\n"
 msgstr "la patch %s è vuota\n"
 
 msgid "patch failed, rejects left in working dir\n"
 msgstr ""
 
 msgid "fuzz found when applying patch, stopping\n"
 msgstr ""
 
 #, python-format
 msgid "revision %d is not managed"
 msgstr ""
 
 #, python-format
 msgid "cannot delete revision %d above applied patches"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "patch %s finalized without changeset message\n"
 msgstr "mostra solo i file senza modifiche"
 
 msgid "qdelete requires at least one revision or patch name"
 msgstr ""
 
 #, python-format
 msgid "cannot delete applied patch %s"
 msgstr ""
 
 #, python-format
 msgid "patch %s not in series file"
 msgstr ""
 
 msgid "no patches applied"
 msgstr ""
 
 msgid "working directory revision is not qtip"
 msgstr ""
 
 msgid "local changes found, refresh first"
 msgstr ""
 
 msgid "local changes found"
 msgstr ""
 
 #, python-format
 msgid "\"%s\" cannot be used as the name of a patch"
 msgstr ""
 
 #, python-format
 msgid "patch \"%s\" already exists"
 msgstr "la patch \"%s\" esiste già"
 
+#, fuzzy
+msgid "cannot manage merge changesets"
+msgstr "misura velocità dal numero di changeset"
+
 #, python-format
 msgid "error unlinking %s\n"
 msgstr ""
 
 #, python-format
 msgid "patch name \"%s\" is ambiguous:\n"
 msgstr "il nome della patch \"%s\"  ambiguo:\n"
 
 #, python-format
 msgid "patch %s not in series"
 msgstr "la patch %s non è nella serie"
 
 #, fuzzy
 msgid "(working directory not at a head)\n"
 msgstr "(directory di lavoro non è a una tip)\n"
 
 msgid "no patches in series\n"
 msgstr "nessuna patch nella serie\n"
 
 #, python-format
 msgid "cannot push to a previous patch: %s"
 msgstr "impossibile fare push su una patch precedente: %s"
 
 #, python-format
 msgid "qpush: %s is already at the top\n"
 msgstr "qpush: %s è già in cima\n"
 
 #, python-format
 msgid "guarded by %r"
 msgstr "controllato da %r"
 
 msgid "no matching guards"
 msgstr "nessuna guardia corrispondente"
 
 #, python-format
 msgid "cannot push '%s' - %s\n"
 msgstr "impossibile fare push di '%s' - %s\n"
 
 msgid "all patches are currently applied\n"
 msgstr "tutte le patch sono correntemente applicate\n"
 
 msgid "patch series already fully applied\n"
 msgstr "la serie di patch è già stata applicata completamente\n"
 
+#, fuzzy
+msgid "please specify the patch to move"
+msgstr "Si prega di specificare uno username."
+
 msgid "cleaning up working directory..."
 msgstr "sto pulendo la directory di lavoro..."
 
 #, python-format
 msgid "errors during apply, please fix and refresh %s\n"
-msgstr "errori durante l'applicazione, si prega di correggere e aggiornare %s\n"
+msgstr ""
+"errori durante l'applicazione, si prega di correggere e aggiornare %s\n"
 
 #, python-format
 msgid "now at: %s\n"
 msgstr "ora a: %s\n"
 
 #, python-format
 msgid "patch %s is not applied"
 msgstr "la patch %s non è applicata"
 
 msgid "no patches applied\n"
 msgstr "nessuna patch applicata\n"
 
 #, python-format
 msgid "qpop: %s is already at the top\n"
 msgstr ""
 
 msgid "qpop: forcing dirstate update\n"
 msgstr ""
 
 #, python-format
 msgid "trying to pop unknown node %s"
 msgstr ""
 
 msgid "popping would remove a revision not managed by this patch queue"
 msgstr ""
 
 msgid "deletions found between repo revs"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "popping %s\n"
 msgstr "sto applicando %s\n"
 
 msgid "patch queue now empty\n"
 msgstr ""
 
 msgid "cannot refresh a revision with children"
 msgstr ""
 
-msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
+msgid ""
+"refresh interrupted while patch was popped! (revert --all, qpush to "
+"recover)\n"
 msgstr ""
 
 msgid "patch queue directory already exists"
 msgstr ""
 
 #, python-format
 msgid "patch %s is not in series file"
 msgstr ""
 
 msgid "No saved patch data found\n"
 msgstr ""
 
 #, python-format
 msgid "restoring status: %s\n"
 msgstr "sto ripristinando lo stato: %s\n"
 
 msgid "save entry has children, leaving it alone\n"
 msgstr ""
 
 #, python-format
 msgid "removing save entry %s\n"
 msgstr ""
 
 #, python-format
 msgid "saved queue repository parents: %s %s\n"
 msgstr ""
 
 msgid "queue directory updating\n"
 msgstr ""
 
 msgid "Unable to load queue repository\n"
 msgstr "Impossibile caricare il repository della coda\n"
 
 msgid "save: no patches applied, exiting\n"
 msgstr ""
 
 msgid "status is already saved\n"
 msgstr "lo status è già stato salvato\n"
 
 msgid "hg patches saved state"
 msgstr ""
 
 msgid "repo commit failed\n"
 msgstr "commit del repository fallito\n"
 
 #, python-format
 msgid "patch %s is already in the series file"
 msgstr "la patch %s è già nel file series"
 
 msgid "option \"-r\" not valid when importing files"
 msgstr "l'opzione \"-r\" non è valida quando si importano file"
 
 msgid "option \"-n\" not valid when importing multiple patches"
 msgstr "l'opzione \"-n\" non è valida quando si importano patch multiple"
 
 #, python-format
 msgid "revision %d is the root of more than one branch"
 msgstr ""
 
 #, python-format
 msgid "revision %d is already managed"
 msgstr ""
 
 #, python-format
 msgid "revision %d is not the parent of the queue"
 msgstr ""
 
 #, python-format
 msgid "revision %d has unmanaged children"
 msgstr ""
 
 #, python-format
 msgid "cannot import merge revision %d"
 msgstr ""
 
 #, python-format
 msgid "revision %d is not the parent of %d"
 msgstr "la revisione %d non è il genitore di %d"
 
 msgid "-e is incompatible with import from -"
 msgstr "-e è incompatibile con l'import da -"
 
 #, python-format
 msgid "patch %s does not exist"
 msgstr "la patch %s non esiste"
 
 msgid "need --name to import a patch from -"
 msgstr "necessario --name per importare una patch da -"
 
+#, fuzzy, python-format
+msgid "unable to read file %s"
+msgstr "impossibile leggere %s"
+
 #, python-format
 msgid "adding %s to series file\n"
 msgstr "sto aggiungendo %s al file series\n"
 
 msgid "remove patches from queue"
 msgstr ""
 
 msgid ""
-"    The patches must not be applied, and at least one patch is required. With\n"
+"    The patches must not be applied, and at least one patch is required. "
+"With\n"
 "    -k/--keep, the patch files are preserved in the patch directory."
 msgstr ""
 
 msgid ""
 "    To stop managing a patch and move it into permanent history,\n"
-"    use the qfinish command."
+"    use the :hg:`qfinish` command."
 msgstr ""
 
 msgid "print the patches already applied"
 msgstr "stampa le patch già applicate"
 
 msgid "only one patch applied\n"
 msgstr " stata applicata solo una patch\n"
 
 msgid "print the patches not yet applied"
 msgstr "stampa le patch non ancora applicate"
 
 msgid "all patches applied\n"
 msgstr "tutte le patch sono state applicate\n"
 
 msgid "import a patch"
 msgstr ""
 
 msgid ""
 "    The patch is inserted into the series after the last applied\n"
 "    patch. If no patches have been applied, qimport prepends the patch\n"
 "    to the series."
 msgstr ""
 
 msgid ""
 "    The patch will have the same name as its source file unless you\n"
 "    give it a new one with -n/--name."
 msgstr ""
 
 msgid ""
 "    You can register an existing patch inside the patch directory with\n"
 "    the -e/--existing flag."
 msgstr ""
 
 msgid ""
 "    With -f/--force, an existing patch of the same name will be\n"
 "    overwritten."
 msgstr ""
 
 msgid ""
 "    An existing changeset may be placed under mq control with -r/--rev\n"
 "    (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
 "    With -g/--git, patches imported with --rev will use the git diff\n"
 "    format. See the diffs help topic for information on why this is\n"
 "    important for preserving rename/copy information and permission\n"
 "    changes."
 msgstr ""
 
 msgid ""
 "    To import a patch from standard input, pass - as the patch file.\n"
 "    When importing from standard input, a patch name must be specified\n"
 "    using the --name flag.\n"
 "    "
 msgstr ""
 
 #, fuzzy
-msgid "init a new queue repository"
+msgid "init a new queue repository (DEPRECATED)"
 msgstr "inizializza un nuovo repository della coda"
 
 #, fuzzy
 msgid ""
 "    The queue repository is unversioned by default. If\n"
 "    -c/--create-repo is specified, qinit will create a separate nested\n"
 "    repository for patches (qinit -c may also be run later to convert\n"
 "    an unversioned patch repository into a versioned one). You can use\n"
 "    qcommit to commit changes to this queue repository."
 msgstr ""
 "    Il repository della coda di default non è sotto controllo di\n"
 "    versione. Se viene specificato -c, qinit creerà un separato\n"
 "    repository annidato per le patch (qinit -c potrebbe anche essere\n"
 "    eseguito in seguito per convertire un repository non gestito in\n"
 "    uno gestito).\n"
 "    Si può usare qcommit per effettuare il commit delle modifiche in\n"
 "    questo repository della coda."
 
+msgid ""
+"    This command is deprecated. Without -c, it's implied by other relevant\n"
+"    commands. With -c, use :hg:`init --mq` instead."
+msgstr ""
+
 msgid "clone main and patch repository at same time"
 msgstr ""
 
 msgid ""
 "    If source is local, destination will have no patches applied. If\n"
 "    source is remote, this command can not check if patches are\n"
 "    applied in source, so cannot guarantee that patches are not\n"
 "    applied in destination. If you clone remote repository, be sure\n"
 "    before that it has no patches applied."
 msgstr ""
 
 msgid ""
 "    Source patch repository is looked for in <src>/.hg/patches by\n"
 "    default. Use -p <url> to change."
 msgstr ""
 
 msgid ""
 "    The patch directory must be a nested Mercurial repository, as\n"
-"    would be created by qinit -c.\n"
-"    "
-msgstr ""
-
-msgid "versioned patch repository not found (see qinit -c)"
-msgstr "repository delle patch sotto controllo di versione non trovato (vedere qinit -c)"
+"    would be created by :hg:`init --mq`.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "versioned patch repository not found (see init --mq)"
+msgstr ""
+"repository delle patch sotto controllo di versione non trovato (vedere qinit "
+"-c)"
 
 #, fuzzy
 msgid "cloning main repository\n"
 msgstr "sto clonando il repository principale\n"
 
 #, fuzzy
 msgid "cloning patch repository\n"
 msgstr "sto clonando il repository delle patch\n"
 
 #, fuzzy
 msgid "stripping applied patches from destination repository\n"
 msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n"
 
 #, fuzzy
 msgid "updating destination repository\n"
 msgstr "sto aggiornando il repository di destinazione\n"
 
-msgid "commit changes in the queue repository"
+#, fuzzy
+msgid "commit changes in the queue repository (DEPRECATED)"
 msgstr "effettua il commit delle modifiche nel repository della coda"
 
+msgid "    This command is deprecated; use :hg:`commit --mq` instead."
+msgstr ""
+
 msgid "print the entire series file"
 msgstr "stampa l'intero file series"
 
 msgid "print the name of the current patch"
 msgstr "stampa il nome della patch corrente"
 
 msgid "print the name of the next patch"
 msgstr "stampa il nome della patch seguente"
 
 msgid "print the name of the previous patch"
 msgstr "stampa il nome della patch precedente"
 
 #, fuzzy
 msgid "create a new patch"
 msgstr "crea una nuova patch"
 
 #, fuzzy
 msgid ""
 "    qnew creates a new patch on top of the currently-applied patch (if\n"
-"    any). It will refuse to run if there are any outstanding changes\n"
-"    unless -f/--force is specified, in which case the patch will be\n"
-"    initialized with them. You may also use -I/--include,\n"
+"    any). The patch will be initialized with any outstanding changes\n"
+"    in the working directory. You may also use -I/--include,\n"
 "    -X/--exclude, and/or a list of files after the patch name to add\n"
 "    only changes to matching files to the new patch, leaving the rest\n"
 "    as uncommitted modifications."
 msgstr ""
 "    qnew crea una nuova patch sopra alla patch correntemente applicata\n"
 "    (seesiste).\n"
 "    Si rifiuter di farlo se ci sono modifiche pendenti a meno che -f\n"
 "    non sia stato specificato, nel qual caso la patch sar\n"
 "    inizializzata con tali modifiche. Si potrebbe anche usare -I, -X,\n"
 "    e/o una lista di file dopo il nome della patch per aggiungere alla\n"
 "    patch solamente le modifiche a tali file, lasciando il resto come\n"
 "    cambiamenti non salvati."
 
 #, fuzzy
 msgid ""
 "    -u/--user and -d/--date can be used to set the (given) user and\n"
 "    date, respectively. -U/--currentuser and -D/--currentdate set user\n"
 "    to current user and date to current date."
 msgstr ""
 "    -u e -d possono essere usati per impostare rispettivamente un dato\n"
 "    utente e data.\n"
 "    -U e -D impostano l'utente all'utente corrente e la data alla data\n"
 "    corrente."
 
 #, fuzzy
 msgid ""
 "    -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
 "    well as the commit message. If none is specified, the header is\n"
 "    empty and the commit message is '[mq]: PATCH'."
 msgstr ""
 "    -e, -m o -l impostano l'intestazione della patch cos come il\n"
 "    messaggio di commit. Se nulla stato specificato, l'intestazione\n"
 "    sar vuota e il messaggio di commit '[mq]: PATCH'."
 
 #, fuzzy
 msgid ""
 "    Use the -g/--git option to keep the patch in the git extended diff\n"
 "    format. Read the diffs help topic for more information on why this\n"
 "    is important for preserving permission changes and copy/rename\n"
 "    information.\n"
 "    "
 msgstr ""
 "    Usa l'opzione --git per mantenere la patch nel formato diff esteso\n"
 "    git. Leggere le informazioni di aiuto sui diff per maggiori\n"
 "    informazioni sul motivo per cui quest'opzione importante per\n"
 "    preservare modifiche di permessi e informazioni su copie/rinomine.\n"
 "    "
 
 msgid "update the current patch"
 msgstr ""
 
 msgid ""
 "    If any file patterns are provided, the refreshed patch will\n"
 "    contain only the modifications that match those patterns; the\n"
 "    remaining modifications will remain in the working directory."
 msgstr ""
 
 msgid ""
 "    If -s/--short is specified, files currently included in the patch\n"
 "    will be refreshed just like matched files and remain in the patch."
 msgstr ""
 
 msgid ""
 "    hg add/remove/copy/rename work as usual, though you might want to\n"
 "    use git-style patches (-g/--git or [diff] git=1) to track copies\n"
 "    and renames. See the diffs help topic for more information on the\n"
 "    git diff format.\n"
 "    "
 msgstr ""
 
 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
 msgstr "l'opzione \"-e\" è incompatibile con \"-m\" o \"-l\""
 
 msgid "diff of the current patch and subsequent modifications"
 msgstr ""
 
 msgid ""
 "    Shows a diff which includes the current patch as well as any\n"
 "    changes which have been made in the working directory since the\n"
 "    last refresh (thus showing what the current patch would become\n"
 "    after a qrefresh)."
 msgstr ""
 
 msgid ""
-"    Use 'hg diff' if you only want to see the changes made since the\n"
-"    last qrefresh, or 'hg export qtip' if you want to see changes made\n"
-"    by the current patch without including changes made since the\n"
+"    Use :hg:`diff` if you only want to see the changes made since the\n"
+"    last qrefresh, or :hg:`export qtip` if you want to see changes\n"
+"    made by the current patch without including changes made since the\n"
 "    qrefresh.\n"
 "    "
 msgstr ""
 
 msgid "fold the named patches into the current patch"
 msgstr ""
 
 msgid ""
 "    Patches must not yet be applied. Each patch will be successively\n"
 "    applied to the current patch in the order given. If all the\n"
 "    patches apply successfully, the current patch will be refreshed\n"
 "    with the new cumulative patch, and the folded patches will be\n"
 "    deleted. With -k/--keep, the folded patch files will not be\n"
 "    removed afterwards."
 msgstr ""
 
 msgid ""
 "    The header for each folded patch will be concatenated with the\n"
 "    current patch header, separated by a line of '* * *'."
 msgstr ""
 
 msgid "qfold requires at least one patch name"
 msgstr ""
 
 msgid "No patches applied"
 msgstr "Nessuna patch applicata"
 
 #, python-format
 msgid "Skipping already folded patch %s"
 msgstr "Salto patch già ripiegata %s"
 
 #, python-format
 msgid "qfold cannot fold already applied patch %s"
 msgstr "qfold non può ripiegare la patch già applicata %s"
 
 #, python-format
 msgid "Error folding patch %s"
 msgstr "Errore nel ripiegare la patch %s"
 
 msgid "push or pop patches until named patch is at top of stack"
 msgstr ""
 
 msgid "set or print guards for a patch"
 msgstr ""
 
 msgid ""
 "    Guards control whether a patch can be pushed. A patch with no\n"
 "    guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
-"    pushed only if the qselect command has activated it. A patch with\n"
-"    a negative guard (\"-foo\") is never pushed if the qselect command\n"
+"    pushed only if the :hg:`qselect` command has activated it. A patch with\n"
+"    a negative guard (\"-foo\") is never pushed if the :hg:`qselect` "
+"command\n"
 "    has activated it."
 msgstr ""
 
 msgid ""
 "    With no arguments, print the currently active guards.\n"
 "    With arguments, set guards for the named patch.\n"
 "    NOTE: Specifying negative guards now requires '--'."
 msgstr ""
 
-msgid ""
-"    To set guards on another patch:\n"
-"      hg qguard -- other.patch +2.6.17 -stable\n"
+msgid "    To set guards on another patch::"
+msgstr ""
+
+msgid ""
+"      hg qguard other.patch -- +2.6.17 -stable\n"
 "    "
 msgstr ""
 
 msgid "cannot mix -l/--list with options or arguments"
 msgstr ""
 
 msgid "no patch to work with"
 msgstr ""
 
 #, python-format
 msgid "no patch named %s"
 msgstr ""
 
 msgid "print the header of the topmost or specified patch"
 msgstr ""
 
 msgid "push the next patch onto the stack"
 msgstr ""
 
 msgid ""
 "    When -f/--force is applied, all local changes in patched files\n"
 "    will be lost.\n"
 "    "
 msgstr ""
 
 msgid "no saved queues found, please use -n\n"
 msgstr ""
 
 #, python-format
 msgid "merging with queue at: %s\n"
 msgstr ""
 
 msgid "pop the current patch off the stack"
 msgstr ""
 
 msgid ""
 "    By default, pops off the top of the patch stack. If given a patch\n"
 "    name, keeps popping off patches until the named patch is at the\n"
 "    top of the stack.\n"
 "    "
 msgstr ""
 
 #, python-format
 msgid "using patch queue: %s\n"
 msgstr ""
 
 msgid "rename a patch"
 msgstr "rinomina una patch"
 
 msgid ""
 "    With one argument, renames the current patch to PATCH1.\n"
 "    With two arguments, renames PATCH1 to PATCH2."
 msgstr ""
 "    Con un argomento rinomina la patch corrente in PATCH1.\n"
 "    Con due argomenti rinomina PATCH1 in PATCH2."
 
 #, python-format
 msgid "%s already exists"
 msgstr "%s esiste già"
 
 #, python-format
 msgid "A patch named %s already exists in the series file"
 msgstr "Una patch chiamata %s esiste già nel file series"
 
-#, fuzzy
-msgid "restore the queue state saved by a revision"
+#, fuzzy, python-format
+msgid "renaming %s to %s\n"
+msgstr "sto spostando %s in %s\n"
+
+#, fuzzy
+msgid "restore the queue state saved by a revision (DEPRECATED)"
 msgstr "ripristina lo stato della coda salvato da una revisione"
 
-msgid "save current queue state"
+msgid "    This command is deprecated, use rebase --mq instead."
+msgstr ""
+
+#, fuzzy
+msgid "save current queue state (DEPRECATED)"
 msgstr "salva lo stato corrente della coda"
 
 #, python-format
 msgid "destination %s exists and is not a directory"
 msgstr "la destinazione %s esiste e non è una directory"
 
 #, python-format
 msgid "destination %s exists, use -f to force"
 msgstr "la destinazione %s esiste, usare -f per forzare l'operazione"
 
 #, python-format
 msgid "copy %s to %s\n"
 msgstr "copia %s a %s\n"
 
 #, fuzzy
-msgid "strip a revision and all its descendants from the repository"
+msgid "strip a changeset and all its descendants from the repository"
 msgstr "elimina una revisione e tutti i suoi discendenti dal repository"
 
-#, fuzzy
-msgid ""
-"    If one of the working directory's parent revisions is stripped, the\n"
-"    working directory will be updated to the parent of the stripped\n"
-"    revision.\n"
-"    "
+msgid ""
+"    The strip command removes all changesets whose local revision\n"
+"    number is greater than or equal to REV, and then restores any\n"
+"    changesets that are not descendants of REV. If the working\n"
+"    directory has uncommitted changes, the operation is aborted unless\n"
+"    the --force flag is supplied."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    If a parent of the working directory is stripped, then the working\n"
+"    directory will automatically be updated to the most recent\n"
+"    available ancestor of the stripped parent after the operation\n"
+"    completes."
 msgstr ""
 "    Se una delle revisioni genitore della directory di lavoro\n"
 "    viene rimossa, la directory di lavorò sarà aggiornata al\n"
 "    genitore della revisione rimossa.\n"
 "    "
 
+msgid ""
+"    Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
+"    bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
+"    be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n"
+"    where BUNDLE is the bundle file created by the strip. Note that\n"
+"    the local revision numbers will in general be different after the\n"
+"    restore."
+msgstr ""
+
+msgid ""
+"    Use the --nobackup option to discard the backup bundle once the\n"
+"    operation completes.\n"
+"    "
+msgstr ""
+
 msgid "set or print guarded patches to push"
 msgstr ""
 
 msgid ""
-"    Use the qguard command to set or print guards on patch, then use\n"
+"    Use the :hg:`qguard` command to set or print guards on patch, then use\n"
 "    qselect to tell mq which guards to use. A patch will be pushed if\n"
 "    it has no guards or any positive guards match the currently\n"
 "    selected guard, but will not be pushed if any negative guards\n"
-"    match the current guard. For example:"
+"    match the current guard. For example::"
 msgstr ""
 
 msgid ""
 "        qguard foo.patch -stable    (negative guard)\n"
 "        qguard bar.patch +stable    (positive guard)\n"
 "        qselect stable"
 msgstr ""
 
 msgid ""
 "    This activates the \"stable\" guard. mq will skip foo.patch (because\n"
 "    it has a negative match) but push bar.patch (because it has a\n"
 "    positive match)."
 msgstr ""
 
 msgid ""
 "    With no arguments, prints the currently active guards.\n"
 "    With one argument, sets the active guard."
 msgstr ""
 
 msgid ""
 "    Use -n/--none to deactivate guards (no other arguments needed).\n"
 "    When no guards are active, patches with positive guards are\n"
 "    skipped and patches with negative guards are pushed."
 msgstr ""
 
 msgid ""
 "    qselect can change the guards on applied patches. It does not pop\n"
 "    guarded patches by default. Use --pop to pop back to the last\n"
 "    applied patch that is not guarded. Use --reapply (which implies\n"
 "    --pop) to push back to the current patch afterwards, but skip\n"
 "    guarded patches."
 msgstr ""
 
 msgid ""
 "    Use -s/--series to print a list of all guards in the series file\n"
 "    (no other arguments needed). Use -v for more information."
 msgstr ""
 
 msgid "guards deactivated\n"
 msgstr "guardie disattivate\n"
 
 #, python-format
 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
-msgstr "il numero di patch non applicate, senza guardia è cambiato da %d a %d\n"
+msgstr ""
+"il numero di patch non applicate, senza guardia è cambiato da %d a %d\n"
 
 #, python-format
 msgid "number of guarded, applied patches has changed from %d to %d\n"
 msgstr "il numero di patch applicate aventi guardia è cambiato da %d a %d\n"
 
 msgid "guards in series file:\n"
 msgstr "guardie nel file series:\n"
 
 msgid "no guards in series file\n"
 msgstr "nessuna guardia nel file series\n"
 
 msgid "active guards:\n"
 msgstr "guardie attive:\n"
 
 msgid "no active guards\n"
 msgstr "nessuna guardia attiva\n"
 
 msgid "popping guarded patches\n"
 msgstr "sto disapplicando patch che hanno una guardia\n"
 
 msgid "reapplying unguarded patches\n"
 msgstr "sto riapplicando patch che non hanno guardia\n"
 
 msgid "move applied patches into repository history"
 msgstr ""
 
 msgid ""
 "    Finishes the specified revisions (corresponding to applied\n"
 "    patches) by moving them out of mq control into regular repository\n"
 "    history."
 msgstr ""
 
 msgid ""
 "    Accepts a revision range or the -a/--applied option. If --applied\n"
 "    is specified, all applied mq revisions are removed from mq\n"
 "    control. Otherwise, the given revisions must be at the base of the\n"
 "    stack of applied patches."
 msgstr ""
 
 msgid ""
 "    This can be especially useful if your changes have been applied to\n"
 "    an upstream repository, or if you are about to push your changes\n"
 "    to upstream.\n"
 "    "
 msgstr ""
 
 msgid "no revisions specified"
 msgstr "nessuna revisione specificata"
 
+msgid "manage multiple patch queues"
+msgstr ""
+
+msgid ""
+"    Supports switching between different patch queues, as well as creating\n"
+"    new patch queues and deleting existing ones."
+msgstr ""
+
+msgid ""
+"    Omitting a queue name or specifying -l/--list will show you the "
+"registered\n"
+"    queues - by default the \"normal\" patches queue is registered. The "
+"currently\n"
+"    active queue will be marked with \"(active)\"."
+msgstr ""
+
+msgid ""
+"    To create a new queue, use -c/--create. The queue is automatically made\n"
+"    active, except in the case where there are applied patches from the\n"
+"    currently active queue in the repository. Then the queue will only be\n"
+"    created and switching will fail."
+msgstr ""
+
+msgid ""
+"    To delete an existing queue, use --delete. You cannot delete the "
+"currently\n"
+"    active queue.\n"
+"    "
+msgstr ""
+
+msgid "patches applied - cannot set new queue active"
+msgstr ""
+
+msgid " (active)\n"
+msgstr ""
+
+msgid "invalid queue name, may not contain the characters \":\\/.\""
+msgstr ""
+
+#, fuzzy, python-format
+msgid "queue \"%s\" already exists"
+msgstr "%s esiste già"
+
+msgid "cannot delete queue that does not exist"
+msgstr ""
+
+msgid "cannot delete currently active queue"
+msgstr ""
+
+msgid "use --create to create a new queue"
+msgstr ""
+
 msgid "cannot commit over an applied mq patch"
 msgstr "impossibile effettuare commit su una patch mq applicata"
 
 msgid "source has mq patches applied"
 msgstr "la sorgente ha patch mq applicate"
 
 #, python-format
 msgid "mq status file refers to unknown node %s\n"
 msgstr "il file dello stato di mq fa riferimento al nodo sconosciuto %s\n"
 
 #, python-format
 msgid "Tag %s overrides mq patch of the same name\n"
 msgstr "La tag %s annulla una patch mq con lo stesso nome\n"
 
 msgid "cannot import over an applied patch"
 msgstr "impossibile importare sopra ad una patch applicata"
 
+#, fuzzy
+msgid "only a local queue repository may be initialized"
+msgstr "Impossibile caricare il repository della coda\n"
+
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
+
+#, fuzzy
+msgid "no queue repository"
+msgstr "crea il repository della coda"
+
+#, fuzzy, python-format
+msgid "%d applied"
+msgstr "%s non aggiunto!\n"
+
+#, fuzzy, python-format
+msgid "%d unapplied"
+msgstr "non risolti"
+
+msgid "mq:     (empty queue)\n"
+msgstr ""
+
+#, fuzzy
+msgid "operate on patch repository"
+msgstr "sto clonando il repository delle patch\n"
+
 msgid "print first line of patch header"
 msgstr "stampa la prima riga dell'intestazione della patch"
 
 #, fuzzy
 msgid "show only the last patch"
 msgstr "mostra solo i file aggiunti"
 
 #, fuzzy
 msgid "hg qapplied [-1] [-s] [PATCH]"
 msgstr "hg qapplied [-s] [PATCH]"
 
 msgid "use pull protocol to copy metadata"
 msgstr "usa il protocollo pull per copiare i metadati"
 
 msgid "do not update the new working directories"
 msgstr "non aggiornare le nuove directory di lavoro"
 
 msgid "use uncompressed transfer (fast over LAN)"
 msgstr "usa trasferimento non compresso (veloce su LAN)"
 
+msgid "REPO"
+msgstr ""
+
 #, fuzzy
 msgid "location of source patch repository"
 msgstr "posizione del repository delle patch sorgente"
 
 msgid "hg qclone [OPTION]... SOURCE [DEST]"
 msgstr "hg qclone [OPZIONI]... SORGENTE [DEST]"
 
 msgid "hg qcommit [OPTION]... [FILE]..."
 msgstr "hg qcommit [OPZIONI]... [FILE]..."
 
 msgid "hg qdiff [OPTION]... [FILE]..."
 msgstr "hg qdiff [OPZIONI]... [FILE]..."
 
 msgid "keep patch file"
 msgstr "mantieni il file della patch"
 
 #, fuzzy
 msgid "stop managing a revision (DEPRECATED)"
 msgstr "smetti di gestire una revisione"
 
 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
 
 msgid "edit patch header"
 msgstr "modifica l'intestazione della patch"
 
 msgid "keep folded patch files"
 msgstr ""
 
 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
 msgstr "hg qfold [-e] [-k] [-m TESTO] [-l FILE] PATCH..."
 
 msgid "overwrite any local changes"
 msgstr "sovrascrivi ogni modifica locale"
 
 msgid "hg qgoto [OPTION]... PATCH"
 msgstr "hg qgoto [OPZIONI]... PATCH"
 
 msgid "list all patches and guards"
 msgstr "elenca tutte le patch e le guardie"
 
 msgid "drop all guards"
 msgstr "scarta tutte le guardie"
 
-msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
+#, fuzzy
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
 msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARDIA]... [-GUARDIA]..."
 
 msgid "hg qheader [PATCH]"
 msgstr "hg qheader [PATCH]"
 
 #, fuzzy
 msgid "import file in patch directory"
 msgstr "importa il file nella directory delle patch"
 
 #, fuzzy
 msgid "name of patch file"
 msgstr "mantieni il file della patch"
 
 msgid "overwrite existing files"
 msgstr "sovrascrive i file esistenti"
 
 msgid "place existing revisions under mq control"
 msgstr "metti le revisioni esistenti sotto il controllo di mq"
 
 msgid "use git extended diff format"
 msgstr "usa il formato diff git esteso"
 
 msgid "qpush after importing"
 msgstr ""
 
 #, fuzzy
 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
 msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-r REV]... FILE..."
 
 msgid "create queue repository"
 msgstr "crea il repository della coda"
 
 msgid "hg qinit [-c]"
 msgstr "hg qinit [-c]"
 
-msgid "import uncommitted changes into patch"
-msgstr "importa nella patch le modifiche di cui non si è effettuato il commit"
+#, fuzzy
+msgid "import uncommitted changes (DEPRECATED)"
+msgstr "modifica il messaggio di commit (DEPRECATO)"
 
 msgid "add \"From: <current user>\" to patch"
 msgstr "aggiunge \"Da: <utente corrente>\" alla patch"
 
-msgid "add \"From: <given user>\" to patch"
+msgid "USER"
+msgstr ""
+
+#, fuzzy
+msgid "add \"From: <USER>\" to patch"
 msgstr "aggiunge \"Da: <utente fornito>\" alla patch"
 
 msgid "add \"Date: <current date>\" to patch"
 msgstr "aggiunge \"Data: <data corrente>\" alla patch"
 
-msgid "add \"Date: <given date>\" to patch"
+#, fuzzy
+msgid "add \"Date: <DATE>\" to patch"
 msgstr "aggiunge \"Data: <data fornita>\" alla patch"
 
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
+#, fuzzy
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
 msgstr "hg qnew [-e] [-m TESTO] [-l FILE] [-f] PATCH [FILE]..."
 
 msgid "hg qnext [-s]"
 msgstr "hg qnext [-s]"
 
 msgid "hg qprev [-s]"
 msgstr "hg qprev [-s]"
 
 msgid "pop all patches"
 msgstr "disapplica tutte le patch"
 
-msgid "queue name to pop"
+#, fuzzy
+msgid "queue name to pop (DEPRECATED)"
 msgstr "nome della coda da disapplicare"
 
 #, fuzzy
 msgid "forget any local changes to patched files"
 msgstr "dimentica ogni modifica locale"
 
 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
 msgstr "hg qpop [-a] [-n NOME] [-f] [PATCH | INDEX]"
 
 msgid "apply if the patch has rejects"
 msgstr ""
 
 msgid "list patch name in commit text"
 msgstr "elenca il nome della patch nel testo di commit"
 
 msgid "apply all patches"
 msgstr "applica tutte le patch"
 
-msgid "merge from another queue"
+#, fuzzy
+msgid "merge from another queue (DEPRECATED)"
 msgstr "effettua il merge da un'altra coda"
 
-msgid "merge queue name"
+#, fuzzy
+msgid "merge queue name (DEPRECATED)"
 msgstr "nome della coda del merge"
 
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
+msgid "reorder patch series and apply only the patch"
+msgstr ""
+
+#, fuzzy
+msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [PATCH | INDICE]"
 
 msgid "refresh only files already in the patch and specified files"
 msgstr "aggiorna solo file già nella patch e quelli specificati"
 
 msgid "add/update author field in patch with current user"
 msgstr ""
 
 msgid "add/update author field in patch with given user"
 msgstr ""
 
 #, fuzzy
 msgid "add/update date field in patch with current date"
 msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)"
 
 #, fuzzy
 msgid "add/update date field in patch with given date"
 msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)"
 
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
 msgstr "hg qrefresh [-I] [-X] [-e] [-m TESTO] [-l FILE] [-s] [FILE]..."
 
 msgid "hg qrename PATCH1 [PATCH2]"
 msgstr "hg qrename PATCH1 [PATCH2]"
 
 msgid "delete save entry"
 msgstr "elimina la voce salvata"
 
 #, fuzzy
 msgid "update queue working directory"
 msgstr "aggiorna la directory di lavoro della coda"
 
 msgid "hg qrestore [-d] [-u] REV"
 msgstr "hg qrestore [-d] [-u] REV"
 
 msgid "copy patch directory"
 msgstr "copia la directory delle patch"
 
 msgid "copy directory name"
 msgstr "copia il nome della directory"
 
 msgid "clear queue status file"
 msgstr "pulisce il file di stato della coda"
 
 msgid "force copy"
 msgstr "forza la copia"
 
 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
 msgstr "hg qsave [-m TESTO] [-l FILE] [-c] [-n NOME] [-e] [-f]"
 
 msgid "disable all guards"
 msgstr "disabilita tutte le guardie"
 
 msgid "list all guards in series file"
 msgstr "elenca tutte le guardie nel file series"
 
 msgid "pop to before first guarded applied patch"
 msgstr "disapplica fino alla prima patch con guardia applicata"
 
 msgid "pop, then reapply patches"
 msgstr "disapplica e poi riapplica le patch"
 
 msgid "hg qselect [OPTION]... [GUARD]..."
 msgstr "hg qselect [OPZIONE]... [GUARDIA]..."
 
 msgid "print patches not in series"
 msgstr "stampa le patch non in series"
 
 msgid "hg qseries [-ms]"
 msgstr "hg qseries [-ms]"
 
-msgid "force removal with local changes"
-msgstr "forza la rimozione con modifiche locali"
-
-msgid "bundle unrelated changesets"
+msgid ""
+"force removal of changesets even if the working directory has uncommitted "
+"changes"
+msgstr ""
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
 msgstr ""
 
 msgid "no backups"
 msgstr "nessun backup"
 
-msgid "hg strip [-f] [-b] [-n] REV"
+#, fuzzy
+msgid "hg strip [-f] [-n] REV"
 msgstr "hg strip [-f] [-b] [-n] REV"
 
 msgid "hg qtop [-s]"
 msgstr "hg qtop [-s]"
 
 #, fuzzy
 msgid "show only the first patch"
 msgstr "mostra solo i file aggiunti"
 
 #, fuzzy
 msgid "hg qunapplied [-1] [-s] [PATCH]"
 msgstr "hg qunapplied [-s] [PATCH]"
 
 msgid "finish all applied changesets"
 msgstr "finalizza tutti i changeset applicati"
 
 #, fuzzy
 msgid "hg qfinish [-a] [REV]..."
 msgstr "hg qfinish [-a] [REV...]"
 
+msgid "list all available queues"
+msgstr ""
+
+#, fuzzy
+msgid "create new queue"
+msgstr "creata una nuova head\n"
+
+msgid "delete reference to queue"
+msgstr ""
+
+#, fuzzy
+msgid "[OPTION] [QUEUE]"
+msgstr "[OPZIONI]... [FILE]"
+
 msgid "hooks for sending email notifications at commit/push time"
 msgstr ""
 
 msgid ""
 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
 "print messages to stdout, for testing and configuring."
 msgstr ""
 
 msgid ""
 "To use, configure the notify extension and enable it in hgrc like\n"
 "this::"
 msgstr ""
 
 msgid ""
 "  [extensions]\n"
 "  notify ="
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  # one email for each incoming changeset\n"
 "  incoming.notify = python:hgext.notify.hook\n"
 "  # batch emails when many changesets incoming at one time\n"
 "  changegroup.notify = python:hgext.notify.hook"
 msgstr ""
 
 msgid ""
 "  [notify]\n"
 "  # config items go here"
 msgstr ""
 
 msgid "Required configuration items::"
 msgstr ""
 
 msgid "  config = /path/to/file # file containing subscriptions"
 msgstr ""
 
 msgid "Optional configuration items::"
 msgstr ""
 
 msgid ""
 "  test = True            # print messages to stdout for testing\n"
 "  strip = 3              # number of slashes to strip for url paths\n"
 "  domain = example.com   # domain to use if committer missing domain\n"
 "  style = ...            # style file to use when formatting email\n"
 "  template = ...         # template to use when formatting email\n"
 "  incoming = ...         # template to use when run as incoming hook\n"
 "  changegroup = ...      # template when run as changegroup hook\n"
 "  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
 "  maxsubject = 67        # truncate subject line longer than this\n"
 "  diffstat = True        # add a diffstat before the diff content\n"
-"  sources = serve        # notify if source of incoming changes in this list\n"
+"  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 = [e-mail]   # email address to send as if none given\n"
 "  [web]\n"
 "  baseurl = http://hgserver/... # root of hg web site for browsing commits"
 msgstr ""
 
 msgid ""
 "The notify config file has same format as a regular hgrc file. It has\n"
 "two sections so you can express subscriptions in whatever way is\n"
 "handier for you."
 msgstr ""
 
-msgid "::"
-msgstr ""
-
 msgid ""
 "  [usersubs]\n"
 "  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
 "  user@host = pattern"
 msgstr ""
 
 msgid ""
 "  [reposubs]\n"
 "  # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
 "  pattern = user@host"
 msgstr ""
 
 msgid "Glob patterns are matched against path to repository root."
 msgstr ""
 
 msgid ""
 "If you like, you can put notify config file in repository that users\n"
 "can push changes to, they can manage their own subscriptions.\n"
 msgstr ""
 
 #, python-format
 msgid "%s: %d new changesets"
 msgstr "%s: %d nuovi changeset"
 
 #, python-format
 msgid "notify: sending %d subscribers %d changes\n"
 msgstr "notify: sto inviando a %d sottoscritti %d modifiche\n"
 
 #, python-format
 msgid ""
 "\n"
 "diffs (truncated from %d to %d lines):"
 msgstr ""
 "\n"
 "diff (troncati da %d linee a %d):"
 
 #, python-format
 msgid ""
 "\n"
 "diffs (%d lines):"
 msgstr ""
 "\n"
 "diff (%d linee):"
 
 #, python-format
 msgid "notify: suppressing notification for merge %d:%s\n"
 msgstr ""
 
 msgid "browse command output with an external pager"
 msgstr ""
 
 msgid "To set the pager that should be used, set the application variable::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
 "  pager = LESS='FSRX' less"
 msgstr ""
 
 msgid ""
 "If no pager is set, the pager extensions uses the environment variable\n"
 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
 msgstr ""
 
 msgid ""
 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
 "setting::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
 "  quiet = True"
 msgstr ""
 
 msgid ""
 "You can disable the pager for certain commands by adding them to the\n"
 "pager.ignore list::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
 "  ignore = version, help, update"
 msgstr ""
 
 msgid ""
 "You can also enable the pager only for certain commands using\n"
-"pager.attend::"
+"pager.attend. Below is the default list of commands to be paged::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
-"  attend = log"
+"  attend = annotate, cat, diff, export, glog, log, qdiff"
+msgstr ""
+
+msgid ""
+"Setting pager.attend to an empty value will cause all commands to be\n"
+"paged."
 msgstr ""
 
 msgid "If pager.attend is present, pager.ignore will be ignored."
 msgstr ""
 
 msgid ""
-"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
-"specify them in the global .hgrc\n"
+"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
+"to specify them in the global .hgrc\n"
 msgstr ""
 
 msgid "interpret suffixes to refer to ancestor revisions"
 msgstr ""
 
 msgid ""
 "This extension allows you to use git-style suffixes to refer to the\n"
 "ancestors of a specific revision."
 msgstr ""
 
 msgid "For example, if you can refer to a revision as \"foo\", then::"
 msgstr ""
 
 msgid ""
 "  foo^N = Nth parent of foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = first parent of foo\n"
 "  foo^2 = second parent of foo\n"
 "  foo^  = foo^1"
 msgstr ""
 
 msgid ""
 "  foo~N = Nth first grandparent of foo\n"
 "  foo~0 = foo\n"
 "  foo~1 = foo^1 = foo^ = first parent of foo\n"
 "  foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
 msgstr ""
 
 msgid "command to send changesets as (a series of) patch emails"
 msgstr ""
 
 msgid ""
 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
 "describes the series as a whole."
 msgstr ""
 
 msgid ""
 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
 "first line of the changeset description as the subject text. The\n"
 "message contains two or three body parts:"
 msgstr ""
 
 msgid ""
 "- The changeset description.\n"
 "- [Optional] The result of running diffstat on the patch.\n"
-"- The patch itself, as generated by \"hg export\"."
+"- The patch itself, as generated by :hg:`export`."
 msgstr ""
 
 msgid ""
 "Each message refers to the first in the series using the In-Reply-To\n"
 "and References headers, so they will show up as a sequence in threaded\n"
 "mail and news readers, and in mail archives."
 msgstr ""
 
 msgid ""
 "With the -d/--diffstat option, you will be prompted for each changeset\n"
 "with a diffstat summary and the changeset summary, so you can be sure\n"
 "you are sending the right changes."
 msgstr ""
 
 msgid ""
 "To configure other defaults, add a section like this to your hgrc\n"
 "file::"
 msgstr ""
 
 msgid ""
 "  [email]\n"
 "  from = My Name <my@email>\n"
 "  to = recipient1, recipient2, ...\n"
 "  cc = cc1, cc2, ...\n"
-"  bcc = bcc1, bcc2, ..."
-msgstr ""
-
-msgid ""
-"Then you can use the \"hg email\" command to mail a series of changesets\n"
-"as a patchbomb."
+"  bcc = bcc1, bcc2, ...\n"
+"  reply-to = address1, address2, ..."
+msgstr ""
+
+msgid ""
+"Use ``[patchbomb]`` as configuration section name if you need to\n"
+"override global ``[email]`` address settings."
+msgstr ""
+
+msgid ""
+"Then you can use the :hg:`email` command to mail a series of\n"
+"changesets as a patchbomb."
 msgstr ""
 
 msgid ""
 "To avoid sending patches prematurely, it is a good idea to first run\n"
-"the \"email\" command with the \"-n\" option (test only). You will be\n"
+"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
 "prompted for an email recipient address, a subject and an introductory\n"
 "message describing the patches of your patchbomb. Then when all is\n"
 "done, patchbomb messages are displayed. If the PAGER environment\n"
 "variable is set, your pager will be fired up once for each patchbomb\n"
 "message, so you can verify everything is alright."
 msgstr ""
 
 msgid ""
 "The -m/--mbox option is also very useful. Instead of previewing each\n"
 "patchbomb message in a pager or sending the messages directly, it will\n"
 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
 "can be previewed with any mail user agent which supports UNIX mbox\n"
 "files, e.g. with mutt::"
 msgstr ""
 
 msgid "  % mutt -R -f mbox"
 msgstr ""
 
 msgid ""
 "When you are previewing the patchbomb messages, you can use ``formail``\n"
 "(a utility that is commonly installed as part of the procmail\n"
 "package), to send each message out::"
 msgstr ""
 
 msgid "  % formail -s sendmail -bm -t < mbox"
 msgstr ""
 
 msgid "That should be all. Now your patchbomb is on its way out."
 msgstr ""
 
 msgid ""
 "You can also either configure the method option in the email section\n"
 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
 "that the patchbomb extension can automatically send patchbombs\n"
 "directly from the commandline. See the [email] and [smtp] sections in\n"
 "hgrc(5) for details.\n"
 msgstr ""
 
 #, fuzzy, python-format
-msgid "%sPlease enter a valid value"
+msgid "%s Please enter a valid value"
 msgstr "Si prega di inserire un valore valido.\n"
 
 msgid "Please enter a valid value.\n"
 msgstr "Si prega di inserire un valore valido.\n"
 
-msgid "does the diffstat above look okay? "
+#, fuzzy
+msgid "does the diffstat above look okay?"
 msgstr "il diffstat di sopra sembra corretto? "
 
 msgid "diffstat rejected"
 msgstr "diffstat rifiutato"
 
 msgid "send changesets by email"
 msgstr ""
 
 msgid ""
-"    By default, diffs are sent in the format generated by hg export,\n"
-"    one per message. The series starts with a \"[PATCH 0 of N]\"\n"
-"    introduction, which describes the series as a whole."
+"    By default, diffs are sent in the format generated by\n"
+"    :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
+"    of N]\" introduction, which describes the series as a whole."
 msgstr ""
 
 msgid ""
 "    Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
 "    the first line of the changeset description as the subject text.\n"
 "    The message contains two or three parts. First, the changeset\n"
 "    description. Next, (optionally) if the diffstat program is\n"
 "    installed and -d/--diffstat is used, the result of running\n"
 "    diffstat on the patch. Finally, the patch itself, as generated by\n"
-"    \"hg export\"."
+"    :hg:`export`."
 msgstr ""
 
 msgid ""
 "    By default the patch is included as text in the email body for\n"
 "    easy reviewing. Using the -a/--attach option will instead create\n"
 "    an attachment for the patch. With -i/--inline an inline attachment\n"
 "    will be created."
 msgstr ""
 
 msgid ""
 "    With -o/--outgoing, emails will be generated for patches not found\n"
 "    in the destination repository (or only those which are ancestors\n"
 "    of the specified revisions if any are provided)"
 msgstr ""
 
 msgid ""
 "    With -b/--bundle, changesets are selected as for --outgoing, but a\n"
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent."
 msgstr ""
 
 msgid ""
 "      hg email -r 3000          # send patch 3000 only\n"
 "      hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
 "      hg email -r 3000:3005     # send patches 3000 through 3005\n"
 "      hg email 3000             # send patch 3000 (deprecated)"
 msgstr ""
 
 msgid ""
 "      hg email -o               # send all patches not in default\n"
 "      hg email -o DEST          # send all patches not in DEST\n"
 "      hg email -o -r 3000       # send all ancestors of 3000 not in default\n"
 "      hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST"
 msgstr ""
 
 msgid ""
 "      hg email -b               # send bundle of all patches not in default\n"
 "      hg email -b DEST          # send bundle of all patches not in DEST\n"
-"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in default\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
+"default\n"
 "      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST"
 msgstr ""
 
 msgid ""
 "    Before using this command, you will need to enable email in your\n"
 "    hgrc. See the [email] section in hgrc(5) for details.\n"
 "    "
 msgstr ""
 
 msgid "specify at least one changeset with -r or -o"
 msgstr ""
 
 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
 msgstr ""
 
 msgid "too many destinations"
 msgstr "troppe destinazioni"
 
 msgid "use only one form to specify the revision"
 msgstr "usa solo un formato per specificare la revisione"
 
 msgid ""
 "\n"
 "Write the introductory message for the patch series."
 msgstr ""
 "\n"
 "Scrivi il messaggio introduttivo per la serie di patch."
 
 #, python-format
 msgid "This patch series consists of %d patches."
 msgstr "Questa serie di patch consiste di %d patch."
 
 msgid "Final summary:\n"
 msgstr "Sommario finale:\n"
 
 msgid "Displaying "
 msgstr "Sto mostrando "
 
 msgid "Writing "
 msgstr "Sto scrivendo "
 
 msgid "Sending "
 msgstr "Sto inviando "
 
 msgid "send patches as attachments"
 msgstr "invia patch come allegati"
 
 msgid "send patches as inline attachments"
 msgstr "invia patch come allegati in linea"
 
 msgid "email addresses of blind carbon copy recipients"
 msgstr "indirizzi mail dei destinatari in copia nascosta"
 
 msgid "email addresses of copy recipients"
 msgstr "indirizzi mail dei destinatari in copia"
 
 msgid "add diffstat output to messages"
 msgstr "aggiungi l'output del diffstat ai messaggi"
 
 msgid "use the given date as the sending date"
 msgstr "usa la data fornita come data di invio"
 
 msgid "use the given file as the series description"
 msgstr "usa il file fornito come descrizione della serie"
 
 msgid "email address of sender"
 msgstr "indirizzo email del mittente"
 
 msgid "print messages that would be sent"
 msgstr "stampa i messaggi che verrebbero inviati"
 
 msgid "write messages to mbox file instead of sending them"
 msgstr "scrive i messaggi nel file mbox invece di inviarli"
 
+#, fuzzy
+msgid "email addresses replies should be sent to"
+msgstr "indirizzi mail dei destinatari"
+
 msgid "subject of first message (intro or single patch)"
 msgstr "soggetto del primo messaggio (introduzione o patch singola)"
 
 msgid "message identifier to reply to"
 msgstr ""
 
 msgid "flags to add in subject prefixes"
 msgstr ""
 
 msgid "email addresses of recipients"
 msgstr "indirizzi mail dei destinatari"
 
 msgid "omit hg patch header"
 msgstr "ometti l'intestazione della patch hg"
 
 msgid "send changes not found in the target repository"
 msgstr "invia le modifiche non trovate nel repository di destinazione"
 
 msgid "send changes not in target as a binary bundle"
 msgstr "invia le modifiche non in target come bundle binario"
 
 #, fuzzy
 msgid "name of the bundle attachment file"
 msgstr "nome del file dell'allegato bundle"
 
 msgid "a revision to send"
 msgstr "una revisione da inviare"
 
 #, fuzzy
 msgid "run even when remote repository is unrelated (with -b/--bundle)"
 msgstr "esegui anche quando il repository remoto non è collegato (con -b)"
 
 #, fuzzy
 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
 msgstr "un changeset base da specificare invece di una destinazione (con -b)"
 
 msgid "send an introduction email for a single patch"
 msgstr "invia una mail introduttiva per una patch singola"
 
 msgid "hg email [OPTION]... [DEST]..."
 msgstr "hg email [OPZIONI]... [DEST]..."
 
+msgid "show progress bars for some actions"
+msgstr ""
+
+msgid ""
+"This extension uses the progress information logged by hg commands\n"
+"to draw progress bars that are as informative as possible. Some progress\n"
+"bars only offer indeterminate information, while others have a definite\n"
+"end point."
+msgstr ""
+
+msgid "The following settings are available::"
+msgstr ""
+
+msgid ""
+"  [progress]\n"
+"  delay = 3 # number of seconds (float) before showing the progress bar\n"
+"  refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
+"  format = topic bar number # format of the progress bar\n"
+"  width = <none> # if set, the maximum width of the progress information\n"
+"                 # (that is, min(width, term width) will be used)\n"
+"  clear-complete = True # clear the progress bar after it's done\n"
+"  disable = False # if true, don't show a progress bar\n"
+"  assume-tty = False # if true, ALWAYS show a progress bar, unless\n"
+"                     # disable is given"
+msgstr ""
+
+msgid ""
+"Valid entries for the format field are topic, bar, number, unit, and\n"
+"item. item defaults to the last 20 characters of the item, but this\n"
+"can be changed by adding either ``-<num>`` which would take the last\n"
+"num characters, or ``+<num>`` for the first num characters.\n"
+msgstr ""
+
 #, fuzzy
 msgid "command to delete untracked files from the working directory"
 msgstr "non effettuare il commit, aggiorna solo la directory di lavoro"
 
 msgid "removes files not tracked by Mercurial"
 msgstr ""
 
 msgid ""
 "    Delete files not known to Mercurial. This is useful to test local\n"
 "    and uncommitted changes in an otherwise-clean source tree."
 msgstr ""
 
 msgid "    This means that purge will delete:"
 msgstr ""
 
 msgid ""
-"    - Unknown files: files marked with \"?\" by \"hg status\"\n"
+"    - Unknown files: files marked with \"?\" by :hg:`status`\n"
 "    - Empty directories: in fact Mercurial ignores directories unless\n"
 "      they contain files under source control management"
 msgstr ""
 
 msgid "    But it will leave untouched:"
 msgstr ""
 
 msgid ""
 "    - Modified and unmodified tracked files\n"
 "    - Ignored files (unless --all is specified)\n"
-"    - New files added to the repository (with \"hg add\")"
+"    - New files added to the repository (with :hg:`add`)"
 msgstr ""
 
 msgid ""
 "    If directories are given on the command line, only files in these\n"
 "    directories are considered."
 msgstr ""
 
 msgid ""
 "    Be careful with purge, as you could irreversibly delete some files\n"
 "    you forgot to add to the repository. If you only want to print the\n"
 "    list of files that this program would delete, use the --print\n"
 "    option.\n"
 "    "
 msgstr ""
 
 #, python-format
 msgid "%s cannot be removed"
 msgstr "%s non può essere rimosso"
 
 #, python-format
 msgid "warning: %s\n"
 msgstr "attenzione: %s\n"
 
 #, python-format
 msgid "Removing file %s\n"
 msgstr "Sto rimuovendo il file %s\n"
 
 #, python-format
 msgid "Removing directory %s\n"
 msgstr "Sto rimuovendo la directory %s\n"
 
 msgid "abort if an error occurs"
 msgstr "abortisce se si verifica un errore"
 
 msgid "purge ignored files too"
 msgstr "rimuove anche i file ignorati"
 
 #, fuzzy
 msgid "print filenames instead of deleting them"
 msgstr "stampa i nomi dei file invece di cancellarli"
 
 #, fuzzy
 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
 msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)"
 
 msgid "hg purge [OPTION]... [DIR]..."
 msgstr "hg purge [OPZIONI]... [DIR]..."
 
 #, fuzzy
 msgid "command to move sets of revisions to a different ancestor"
 msgstr "sposta insiemi di revisioni su un antenato differente"
 
 #, fuzzy
 msgid ""
 "This extension lets you rebase changesets in an existing Mercurial\n"
 "repository."
 msgstr ""
 "Questa estensione consente di effettuare il rebase di changeset in un\n"
 "repository Mercurial esistente."
 
 #, fuzzy
 msgid ""
 "For more information:\n"
 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 "Per maggiori informazioni:\n"
 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
 
 #, fuzzy
 msgid "move changeset (and descendants) to a different branch"
 msgstr "sposta changeset (e discendenti) su una branch differente"
 
 #, fuzzy
 msgid ""
 "    Rebase uses repeated merging to graft changesets from one part of\n"
-"    history onto another. This can be useful for linearizing local\n"
-"    changes relative to a master development tree."
+"    history (the source) onto another (the destination). This can be\n"
+"    useful for linearizing *local* changes relative to a master\n"
+"    development tree."
 msgstr ""
 "    Rebase usa merge ripetuti per trapiantare changeset da una parte\n"
 "    della storia in un'altra. Questo può essere utile per linearizzare\n"
 "    modifiche locali relative ad un albero di sviluppo principale."
 
+msgid ""
+"    You should not rebase changesets that have already been shared\n"
+"    with others. Doing so will force everybody else to perform the\n"
+"    same rebase or they will end up with duplicated changesets after\n"
+"    pulling in your rebased changesets."
+msgstr ""
+
+msgid ""
+"    If you don't specify a destination changeset (``-d/--dest``),\n"
+"    rebase uses the tipmost head of the current named branch as the\n"
+"    destination. (The destination changeset is not modified by\n"
+"    rebasing, but new changesets are added as its descendants.)"
+msgstr ""
+
+msgid ""
+"    You can specify which changesets to rebase in two ways: as a\n"
+"    \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
+"    for a topologically related set of changesets (the \"source\n"
+"    branch\"). If you specify source (``-s/--source``), rebase will\n"
+"    rebase that changeset and all of its descendants onto dest. If you\n"
+"    specify base (``-b/--base``), rebase will select ancestors of base\n"
+"    back to but not including the common ancestor with dest. Thus,\n"
+"    ``-b`` is less precise but more convenient than ``-s``: you can\n"
+"    specify any changeset in the source branch, and rebase will select\n"
+"    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
+"    uses the parent of the working directory as the base."
+msgstr ""
+
+msgid ""
+"    By default, rebase recreates the changesets in the source branch\n"
+"    as descendants of dest and then destroys the originals. Use\n"
+"    ``--keep`` to preserve the original source changesets. Some\n"
+"    changesets in the source branch (e.g. merges from the destination\n"
+"    branch) may be dropped if they no longer contribute any change."
+msgstr ""
+
+msgid ""
+"    One result of the rules for selecting the destination changeset\n"
+"    and source branch is that, unlike ``merge``, rebase will do\n"
+"    nothing if you are at the latest (tipmost) head of a named branch\n"
+"    with two heads. You need to explicitly specify source and/or\n"
+"    destination (or ``update`` to the other head, if it's the head of\n"
+"    the intended source branch)."
+msgstr ""
+
 #, fuzzy
 msgid ""
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
-"    continued with --continue/-c or aborted with --abort/-a.\n"
-"    "
+"    continued with --continue/-c or aborted with --abort/-a."
 msgstr ""
 "    Se un rebase viene interrotto per risolvere manualmente un merge,\n"
 "    può essere ripreso con --continue o abortito con --abort.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if nothing to rebase.\n"
+"    "
+msgstr ""
+
 msgid "cannot use both abort and continue"
 msgstr "non è possibile usare sia abort sia continue"
 
 msgid "cannot use collapse with continue or abort"
 msgstr "non è possibile usare collapse con continue o abort"
 
+#, fuzzy
+msgid "cannot use detach with continue or abort"
+msgstr "non è possibile usare collapse con continue o abort"
+
 msgid "abort and continue do not allow specifying revisions"
 msgstr "abort e continue non consentono di specificare revisioni"
 
 msgid "cannot specify both a revision and a base"
 msgstr "non è possibile specificare sia una revisione sia una base"
 
+msgid "detach requires a revision to be specified"
+msgstr ""
+
+#, fuzzy
+msgid "cannot specify a base with detach"
+msgstr "impossibile specificare sia --rev sia --change"
+
 msgid "nothing to rebase\n"
 msgstr "niente di cui effettuare il rebase\n"
 
 msgid "cannot use both keepbranches and extrafn"
 msgstr "non è possibile usare sia keepbranches sia extrafn"
 
+msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
+msgstr ""
+"correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --"
+"continue"
+
+#, python-format
+msgid "no changes, revision %d skipped\n"
+msgstr "nessuna modifica, revisione %d saltata\n"
+
 msgid "rebase merging completed\n"
 msgstr "merge del rebase completato\n"
 
 msgid "warning: new changesets detected on source branch, not stripping\n"
-msgstr "attenzione: nuovi changeset rilevati sulla branch sorgente, non li rimuovo\n"
+msgstr ""
+"attenzione: nuovi changeset rilevati sulla branch sorgente, non li rimuovo\n"
 
 msgid "rebase completed\n"
 msgstr "rebase completato\n"
 
 #, python-format
 msgid "%d revisions have been skipped\n"
 msgstr "%d revisioni sono state saltate\n"
 
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr "correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --continue"
-
-#, python-format
-msgid "no changes, revision %d skipped\n"
-msgstr "nessuna modifica, revisione %d saltata\n"
+msgid "unable to collapse, there is more than one external parent"
+msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno"
 
 #, python-format
 msgid "cannot use revision %d as base, result would have 3 parents"
-msgstr "non è possibile usare la revisione %d come base, il risultato avrebbe 3 genitori"
+msgstr ""
+"non è possibile usare la revisione %d come base, il risultato avrebbe 3 "
+"genitori"
 
 msgid "no rebase in progress"
 msgstr "nessun rebase in corso"
 
-msgid "warning: new changesets detected on target branch, not stripping\n"
-msgstr "attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
+#, fuzzy
+msgid "warning: new changesets detected on target branch, can't abort\n"
+msgstr ""
+"attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
 
 msgid "rebase aborted\n"
 msgstr "rebase abortito\n"
 
 msgid "cannot rebase onto an applied mq patch"
 msgstr "non è possibile effettuare il rebase su una patch mq applicata"
 
 #, fuzzy
 msgid "source is ancestor of destination"
 msgstr "nessuna sorgente o destinazione specificata"
 
 msgid "source is descendant of destination"
 msgstr ""
 
-msgid "unable to collapse, there is more than one external parent"
-msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno"
-
 msgid "rebase working directory to branch head"
 msgstr "effettua il rebase della directory di lavoro sulla head della branch"
 
-msgid "rebase from a given revision"
-msgstr "rebase da una data revisione"
-
-msgid "rebase from the base of a given revision"
-msgstr "rebase dalla base di una data revisione"
-
-msgid "rebase onto a given revision"
-msgstr "rebase su una data revisione"
+#, fuzzy
+msgid "rebase from the specified changeset"
+msgstr "mostra i genitori della revisione specificata"
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
+
+#, fuzzy
+msgid "rebase onto the specified changeset"
+msgstr "rev %d punta al changeset inatteso %d"
 
 #, fuzzy
 msgid "collapse the rebased changesets"
 msgstr "collassa le revisioni di cui si effettua il rebase"
 
 #, fuzzy
 msgid "keep original changesets"
 msgstr "mantiene le branch originali"
 
 #, fuzzy
 msgid "keep original branch names"
 msgstr "mantiene le branch originali"
 
+msgid "force detaching of source from its original branch"
+msgstr ""
+
 msgid "continue an interrupted rebase"
 msgstr "continua un rebase interrotto"
 
 msgid "abort an interrupted rebase"
 msgstr "abortisce un rebase interrotto"
 
 #, fuzzy
-msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
-msgstr "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
 
 #, fuzzy
 msgid "commands to interactively select changes for commit/qrefresh"
 msgstr "cambia interattivamente la selezione durante un commit o qrefresh"
 
 msgid "this modifies a binary file (all or nothing)\n"
 msgstr "questo modifica un file binario (tutto o niente)\n"
 
 msgid "this is a binary file\n"
 msgstr "questo è un file binario\n"
 
 #, python-format
 msgid "%d hunks, %d lines changed\n"
 msgstr ""
 
 msgid "[Ynsfdaq?]"
 msgstr "[Ynsfdaq?]"
 
 #, fuzzy
 msgid "&Yes, record this change"
 msgstr "y - registra questa modifica"
 
 #, fuzzy
 msgid "&No, skip this change"
 msgstr "salta il changeset di test"
 
 msgid "&Skip remaining changes to this file"
 msgstr ""
 
 msgid "Record remaining changes to this &file"
 msgstr ""
 
 msgid "&Done, skip remaining changes and files"
 msgstr ""
 
 #, fuzzy
 msgid "Record &all changes to all remaining files"
 msgstr "registra cancellazione per i file mancanti"
 
 #, fuzzy
 msgid "&Quit, recording no changes"
 msgstr "y - registra questa modifica"
 
 #, fuzzy
 msgid "&?"
 msgstr "?"
 
-msgid "y - record this change"
-msgstr "y - registra questa modifica"
-
 msgid "user quit"
 msgstr ""
 
 #, python-format
 msgid "examine changes to %s?"
 msgstr ""
 
 msgid " and "
 msgstr " e "
 
-msgid "y"
-msgstr "y"
-
 #, python-format
 msgid "record this change to %r?"
 msgstr "registrare questa modifica a %r?"
 
 #, fuzzy, python-format
 msgid "record change %d/%d to %r?"
 msgstr "registrare questa modifica a %r?"
 
 #, fuzzy
 msgid "interactively select changes to commit"
 msgstr "seleziona interattivamente le modifiche di cui eseguire il commit"
 
 #, fuzzy
 msgid ""
-"    If a list of files is omitted, all changes reported by \"hg status\"\n"
+"    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be candidates for recording."
 msgstr ""
 "    Se viene omesso un elenco di file, tutte le modifiche\n"
 "    riportate da \"hg status\" saranno candidati per la\n"
 "    registrazione."
 
 #, fuzzy
-msgid "    See 'hg help dates' for a list of formats valid for -d/--date."
+msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Vedere 'hg help dates' per un elenco di formati\n"
 "    validi per -d/--date."
 
 #, fuzzy
 msgid ""
 "    You will be prompted for whether to record changes to each\n"
 "    modified file, and for files with multiple changes, for each\n"
 "    change to use. For each query, the following responses are\n"
 "    possible::"
 msgstr ""
 "    Si verrà interrogati su quali modifiche registrare\n"
 "    per ogni file modificato e, per file con modifiche\n"
 "    multiple, per ogni modifica da usare. Per ogni domanda\n"
 "    sono possibili le seguenti risposte:"
 
 #, fuzzy
 msgid ""
 "      y - record this change\n"
 "      n - skip this change"
 msgstr ""
 "    y - registra questa modifica\n"
 "    n - salta questa modifica"
 
 #, fuzzy
 msgid ""
 "      s - skip remaining changes to this file\n"
 "      f - record remaining changes to this file"
 msgstr ""
 "    s - salta le modifiche rimanenti di questo file\n"
 "    f - registra le modifiche rimanenti di questo file"
 
 #, fuzzy
 msgid ""
 "      d - done, skip remaining changes and files\n"
 "      a - record all changes to all remaining files\n"
 "      q - quit, recording no changes"
 msgstr ""
 "    d - fatto, salta le modifiche e i file rimanenti\n"
 "    a - registra tutte le modifiche a tutti i file rimanenti\n"
 "    q - esci, non registrare alcuna modifica"
 
 #, fuzzy
 msgid "      ? - display help"
 msgstr "    ? - mostra il messaggio di aiuto"
 
+msgid "    This command is not available when committing a merge."
+msgstr ""
+
 msgid "'mq' extension not loaded"
 msgstr "estensione 'mq' non caricata"
 
 msgid "running non-interactively, use commit instead"
 msgstr ""
 
+msgid "cannot partially commit a merge (use hg commit instead)"
+msgstr ""
+
 msgid "no changes to record\n"
 msgstr "nessuna modifica da registrare\n"
 
 msgid "patch failed to apply"
 msgstr ""
 
 msgid "hg record [OPTION]... [FILE]..."
 msgstr "hg record [OPZIONI]... [FILE]..."
 
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..."
 
+msgid "recreates hardlinks between repository clones"
+msgstr ""
+
+msgid "recreate hardlinks between two repositories"
+msgstr ""
+
+msgid ""
+"    When repositories are cloned locally, their data files will be\n"
+"    hardlinked so that they only use the space of a single repository."
+msgstr ""
+
+msgid ""
+"    Unfortunately, subsequent pulls into either repository will break\n"
+"    hardlinks for any files touched by the new changesets, even if\n"
+"    both repositories end up pulling the same changes."
+msgstr ""
+
+msgid ""
+"    Similarly, passing --rev to \"hg clone\" will fail to use any\n"
+"    hardlinks, falling back to a complete copy of the source\n"
+"    repository."
+msgstr ""
+
+msgid ""
+"    This command lets you recreate those hardlinks and reclaim that\n"
+"    wasted space."
+msgstr ""
+
+msgid ""
+"    This repository will be relinked to share space with ORIGIN, which\n"
+"    must be on the same local disk. If ORIGIN is omitted, looks for\n"
+"    \"default-relink\", then \"default\", in [paths]."
+msgstr ""
+
+msgid ""
+"    Do not attempt any read operations on this repository while the\n"
+"    command is running. (Both repositories will be locked against\n"
+"    writes.)\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "hardlinks are not supported on this system"
+msgstr "Hardlink non supportati"
+
+#, fuzzy, python-format
+msgid "relinking %s to %s\n"
+msgstr "sto ottenendo %s in %s\n"
+
+#, python-format
+msgid "tip has %d files, estimated total number of files: %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "collecting"
+msgstr "sto collezionando gli rlog CVS\n"
+
+#, fuzzy
+msgid "files"
+msgstr "file:"
+
+#, python-format
+msgid "collected %d candidate storage files\n"
+msgstr ""
+
+#, fuzzy
+msgid "source and destination are on different devices"
+msgstr "nessuna sorgente o destinazione specificata"
+
+#, fuzzy, python-format
+msgid "not linkable: %s\n"
+msgstr "non nel dirstate: %s\n"
+
+#, fuzzy
+msgid " files"
+msgstr "file:"
+
+#, fuzzy
+msgid "pruning"
+msgstr "sto eseguendo %s\n"
+
+#, python-format
+msgid "pruned down to %d probably relinkable files\n"
+msgstr ""
+
+msgid "relinking"
+msgstr ""
+
+#, python-format
+msgid "relinked %d files (%d bytes reclaimed)\n"
+msgstr ""
+
+msgid "[ORIGIN]"
+msgstr ""
+
+msgid "extend schemes with shortcuts to repository swarms"
+msgstr ""
+
+msgid ""
+"This extension allows you to specify shortcuts for parent URLs with a\n"
+"lot of repositories to act like a scheme, for example::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  py = http://code.python.org/hg/"
+msgstr ""
+
+msgid "After that you can use it like::"
+msgstr ""
+
+msgid "  hg clone py://trunk/"
+msgstr ""
+
+msgid ""
+"Additionally there is support for some more complex schemas, for\n"
+"example used by Google Code::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  gcode = http://{1}.googlecode.com/hg/"
+msgstr ""
+
+msgid ""
+"The syntax is taken from Mercurial templates, and you have unlimited\n"
+"number of variables, starting with ``{1}`` and continuing with\n"
+"``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n"
+"supplied, split by ``/``. Anything not specified as ``{part}`` will be\n"
+"just appended to an URL."
+msgstr ""
+
+msgid "For convenience, the extension adds these schemes by default::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  py = http://hg.python.org/\n"
+"  bb = https://bitbucket.org/\n"
+"  bb+ssh = ssh://[e-mail]/\n"
+"  gcode = https://{1}.googlecode.com/hg/\n"
+"  kiln = https://{1}.kilnhg.com/Repo/"
+msgstr ""
+
+msgid ""
+"You can override a predefined scheme by defining a new scheme with the\n"
+"same name.\n"
+msgstr ""
+
 msgid "share a common history between several working directories"
 msgstr ""
 
-msgid "create a new shared repository (experimental)"
-msgstr ""
+#, fuzzy
+msgid "create a new shared repository"
+msgstr "crea il repository della coda"
 
 msgid ""
 "    Initialize a new repository and working directory that shares its\n"
 "    history with another repository."
 msgstr ""
 
 msgid ""
-"    NOTE: actions that change history such as rollback or moving the\n"
-"    source may confuse sharers.\n"
+"    NOTE: using rollback or extensions that destroy/modify history\n"
+"    (mq, rebase, etc.) can cause considerable confusion with shared\n"
+"    clones. In particular, if two shared clones are both updated to\n"
+"    the same changeset, and one of them destroys that changeset with\n"
+"    rollback, the other clone will suddenly stop working: all\n"
+"    operations will fail with \"abort: working directory has unknown\n"
+"    parent\". The only known workaround is to use debugsetparents on\n"
+"    the broken clone to reset it to a changeset that still exists\n"
+"    (e.g. tip).\n"
 "    "
 msgstr ""
 
 #, fuzzy
 msgid "do not create a working copy"
 msgstr "non aggiornare le nuove directory di lavoro"
 
 #, fuzzy
 msgid "[-U] SOURCE [DEST]"
 msgstr "[OPZIONI]... SORGENTE [DEST]"
 
 msgid "command to transplant changesets from another branch"
 msgstr ""
 
 msgid "This extension allows you to transplant patches from another branch."
 msgstr ""
 
 msgid ""
 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
 "map from a changeset hash to its hash in the source repository.\n"
 msgstr ""
 
 #, python-format
 msgid "skipping already applied revision %s\n"
 msgstr ""
 
 #, python-format
 msgid "skipping merge changeset %s:%s\n"
 msgstr ""
 
 #, python-format
 msgid "%s merged at %s\n"
 msgstr ""
 
 #, python-format
 msgid "%s transplanted to %s\n"
 msgstr ""
 
 #, python-format
 msgid "filtering %s\n"
 msgstr "sto filtrando %s\n"
 
 msgid "filter failed"
 msgstr "filtraggio fallito"
 
 msgid "can only omit patchfile if merging"
 msgstr ""
 
 #, python-format
 msgid "%s: empty changeset"
 msgstr "%s: changeset vuoto"
 
 msgid "Fix up the merge and run hg transplant --continue"
 msgstr ""
 
 #, python-format
 msgid "%s transplanted as %s\n"
 msgstr "%s trapiantato come %s\n"
 
 msgid "transplant log file is corrupt"
 msgstr ""
 
 #, python-format
 msgid "working dir not at transplant parent %s"
 msgstr ""
 
 msgid "commit failed"
 msgstr "commit fallito"
 
+msgid ""
+"y: transplant this changeset\n"
+"n: skip this changeset\n"
+"m: merge at this changeset\n"
+"p: show patch\n"
+"c: commit selected changesets\n"
+"q: cancel transplant\n"
+"?: show this help\n"
+msgstr ""
+
 msgid "apply changeset? [ynmpcq?]:"
 msgstr "applicare il changeset? [ynmpcq?]:"
 
+msgid "no such option\n"
+msgstr ""
+
 msgid "transplant changesets from another branch"
 msgstr ""
 
 msgid ""
 "    Selected changesets will be applied on top of the current working\n"
 "    directory with the log of the original changeset. If --log is\n"
 "    specified, log messages will have a comment appended of the form::"
 msgstr ""
 
 msgid "      (transplanted from CHANGESETHASH)"
 msgstr ""
 
 msgid ""
 "    You can rewrite the changelog message with the --filter option.\n"
 "    Its argument will be invoked with the current changelog message as\n"
 "    $1 and the patch as $2."
 msgstr ""
 
 msgid ""
 "    If --source/-s is specified, selects changesets from the named\n"
 "    repository. If --branch/-b is specified, selects changesets from\n"
 "    the branch holding the named revision, up to that revision. If\n"
 "    --all/-a is specified, all changesets on the branch will be\n"
 "    transplanted, otherwise you will be prompted to select the\n"
 "    changesets you want."
 msgstr ""
 
 msgid ""
-"    hg transplant --branch REVISION --all will rebase the selected\n"
+"    :hg:`transplant --branch REVISION --all` will rebase the selected\n"
 "    branch (up to the named revision) onto your current working\n"
 "    directory."
 msgstr ""
 
 msgid ""
 "    You can optionally mark selected transplanted changesets as merge\n"
 "    changesets. You will not be prompted to transplant any ancestors\n"
 "    of a merged transplant, and you can merge descendants of them\n"
 "    normally instead of transplanting them."
 msgstr ""
 
 msgid ""
-"    If no merges or revisions are provided, hg transplant will start\n"
-"    an interactive changeset browser."
+"    If no merges or revisions are provided, :hg:`transplant` will\n"
+"    start an interactive changeset browser."
 msgstr ""
 
 msgid ""
 "    If a changeset application fails, you can fix the merge by hand\n"
-"    and then resume where you left off by calling hg transplant\n"
-"    --continue/-c.\n"
+"    and then resume where you left off by calling :hg:`transplant\n"
+"    --continue/-c`.\n"
 "    "
 msgstr ""
 
 msgid "--continue is incompatible with branch, all or merge"
 msgstr ""
 
 msgid "no source URL, branch tag or revision list provided"
 msgstr ""
 
 msgid "--all requires a branch revision"
 msgstr ""
 
 msgid "--all is incompatible with a revision list"
 msgstr ""
 
 msgid "no revision checked out"
 msgstr ""
 
 msgid "outstanding uncommitted merges"
 msgstr ""
 
 msgid "outstanding local changes"
 msgstr ""
 
-msgid "pull patches from REPOSITORY"
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
 msgstr ""
 
 msgid "pull patches from branch BRANCH"
 msgstr ""
 
 msgid "pull all changesets up to BRANCH"
 msgstr ""
 
 msgid "skip over REV"
 msgstr ""
 
 msgid "merge at REV"
 msgstr ""
 
 msgid "append transplant info to log message"
 msgstr ""
 
 msgid "continue last transplant session after repair"
 msgstr ""
 
-msgid "filter changesets through FILTER"
-msgstr ""
-
-msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+#, fuzzy
+msgid "filter changesets through command"
+msgstr "%d changeset trovati\n"
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
 msgstr ""
 
 msgid "allow the use of MBCS paths with problematic encodings"
 msgstr ""
 
 msgid ""
 "Some MBCS encodings are not good for some path operations (i.e.\n"
 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
 "This extension can be used to fix the issue with those encodings by\n"
 "wrapping some functions to convert to Unicode string before path\n"
 "operation."
 msgstr ""
 
 msgid "This extension is useful for:"
 msgstr ""
 
 msgid ""
 "- Japanese Windows users using shift_jis encoding.\n"
 "- Chinese Windows users using big5 encoding.\n"
 "- All users who use a repository with one of problematic encodings on\n"
 "  case-insensitive file system."
 msgstr ""
 
 msgid "This extension is not needed for:"
 msgstr ""
 
 msgid ""
 "- Any user who use only ASCII chars in path.\n"
 "- Any user who do not use any of problematic encodings."
 msgstr ""
 
 msgid "Note that there are some limitations on using this extension:"
 msgstr ""
 
-msgid ""
-"- You should use single encoding in one repository.\n"
-"- You should set same encoding for the repository by locale or\n"
-"  HGENCODING."
-msgstr ""
-
-msgid ""
-"Path encoding conversion are done between Unicode and\n"
-"encoding.encoding which is decided by Mercurial from current locale\n"
-"setting or HGENCODING.\n"
+msgid "- You should use single encoding in one repository."
+msgstr ""
+
+msgid ""
+"\n"
+"By default, win32mbcs uses encoding.encoding decided by Mercurial.\n"
+"You can specify the encoding by config option::"
+msgstr ""
+
+msgid ""
+" [win32mbcs]\n"
+" encoding = sjis"
+msgstr ""
+
+msgid "It is useful for the users who want to commit with UTF-8 log message.\n"
 msgstr ""
 
 #, python-format
 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
 msgstr ""
 
 msgid "[win32mbcs] cannot activate on this platform.\n"
 msgstr ""
 
 msgid "perform automatic newline conversion"
 msgstr ""
 
+msgid ""
+"  Deprecation: The win32text extension requires each user to configure\n"
+"  the extension again and again for each clone since the configuration\n"
+"  is not copied when cloning."
+msgstr ""
+
+msgid ""
+"  We have therefore made the ``eol`` as an alternative. The ``eol``\n"
+"  uses a version controlled file for its configuration and each clone\n"
+"  will therefore use the right settings from the start."
+msgstr ""
+
 msgid "To perform automatic newline conversion, use::"
 msgstr ""
 
 msgid ""
 "  [extensions]\n"
 "  win32text =\n"
 "  [encode]\n"
 "  ** = cleverencode:\n"
 "  # or ** = macencode:"
 msgstr ""
 
 msgid ""
 "  [decode]\n"
 "  ** = cleverdecode:\n"
 "  # or ** = macdecode:"
 msgstr ""
 
-msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
+msgid ""
+"If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
 "  # or pretxncommit.cr = python:hgext.win32text.forbidcr"
 msgstr ""
 
 msgid ""
 "To do the same check on a server to prevent CRLF/CR from being\n"
 "pushed or pulled::"
 msgstr ""
 
 msgid ""
 "  [hooks]\n"
 "  pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
 "  # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "WARNING: %s already has %s line endings\n"
 "and does not need EOL conversion by the win32text plugin.\n"
 "Before your next commit, please reconsider your encode/decode settings in \n"
 "Mercurial.ini or %s.\n"
 msgstr ""
 
 #, python-format
 msgid "Attempt to commit or push text file(s) using %s line endings\n"
 msgstr ""
 
 #, python-format
 msgid "in %s: %s\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "\n"
 "To prevent this mistake in your local repository,\n"
 "add to Mercurial.ini or .hg/hgrc:"
 msgstr ""
 
 #, python-format
 msgid ""
 "[hooks]\n"
 "pretxncommit.%s = python:hgext.win32text.forbid%s"
 msgstr ""
 
 #, python-format
 msgid "and also consider adding:"
 msgstr ""
 
 #, python-format
 msgid ""
 "[extensions]\n"
 "win32text =\n"
 "[encode]\n"
 "** = %sencode:\n"
 "[decode]\n"
 "** = %sdecode:\n"
 msgstr ""
 
 msgid "discover and advertise repositories on the local network"
 msgstr ""
 
 msgid ""
-"Zeroconf enabled repositories will be announced in a network without\n"
+"Zeroconf-enabled repositories will be announced in a network without\n"
 "the need to configure a server or a service. They can be discovered\n"
 "without knowing their actual IP address."
 msgstr ""
 
 msgid ""
-"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository::"
+"To allow other people to discover your repository using run\n"
+":hg:`serve` in your repository::"
 msgstr ""
 
 msgid ""
 "  $ cd test\n"
 "  $ hg serve"
 msgstr ""
 
-msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
+msgid ""
+"You can discover Zeroconf-enabled repositories by running\n"
+":hg:`paths`::"
 msgstr ""
 
 msgid ""
 "  $ hg paths\n"
 "  zc-test = http://example.com:8000/test\n"
 msgstr ""
 
 msgid "archive prefix contains illegal components"
 msgstr ""
 
 msgid "cannot give prefix when archiving to files"
 msgstr ""
 
 #, python-format
 msgid "unknown archive type '%s'"
 msgstr ""
 
 msgid "invalid changegroup"
 msgstr ""
 
 msgid "unknown parent"
 msgstr ""
 
 #, python-format
 msgid "integrity check failed on %s:%d"
 msgstr ""
 
 #, python-format
 msgid "%s: not a Mercurial bundle file"
 msgstr ""
 
 #, python-format
 msgid "%s: unknown bundle version"
 msgstr ""
 
 #, python-format
 msgid "%s: unknown bundle compression type"
 msgstr ""
 
 msgid "cannot create new bundle repository"
 msgstr ""
 
 #, python-format
 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
 msgstr ""
 
 #, fuzzy
 msgid "empty username"
 msgstr "stringa vuota\n"
 
 #, python-format
 msgid "username %s contains a newline"
 msgstr ""
 
+#, python-format
+msgid "the name '%s' is reserved"
+msgstr "il nome '%s' è riservato"
+
 msgid "options --message and --logfile are mutually exclusive"
 msgstr ""
 
 #, python-format
 msgid "can't read commit message '%s': %s"
 msgstr ""
 
 msgid "limit must be a positive integer"
 msgstr ""
 
 msgid "limit must be positive"
 msgstr ""
 
 msgid "too many revisions specified"
 msgstr ""
 
 #, python-format
 msgid "invalid format spec '%%%s' in output filename"
 msgstr ""
 
 #, python-format
 msgid "adding %s\n"
 msgstr ""
 
 #, python-format
 msgid "removing %s\n"
 msgstr "sto rimuovendo %s\n"
 
 #, python-format
 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
 msgstr ""
 
 #, python-format
 msgid "%s: not copying - file is not managed\n"
 msgstr ""
 
 #, python-format
 msgid "%s: not copying - file has been marked for remove\n"
 msgstr ""
 
 #, python-format
 msgid "%s: not overwriting - %s collides with %s\n"
 msgstr ""
 
 #, python-format
 msgid "%s: not overwriting - file exists\n"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "%s: not recording move - %s does not exist\n"
+msgstr "il nodo %s:%d non esiste\n"
+
+#, fuzzy, python-format
+msgid "%s: not recording copy - %s does not exist\n"
+msgstr "il nodo %s:%d non esiste\n"
+
 #, python-format
 msgid "%s: deleted in working copy\n"
 msgstr ""
 
 #, python-format
 msgid "%s: cannot copy - %s\n"
 msgstr "%s: impossibile copiare - %s\n"
 
 #, python-format
 msgid "moving %s to %s\n"
 msgstr "sto spostando %s in %s\n"
 
 #, python-format
 msgid "copying %s to %s\n"
 msgstr "sto copiando %s in %s\n"
 
 #, python-format
 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
 msgstr ""
 
 msgid "no source or destination specified"
 msgstr "nessuna sorgente o destinazione specificata"
 
 msgid "no destination specified"
 msgstr "nessuna destinazione specificata"
 
 msgid "with multiple sources, destination must be an existing directory"
-msgstr "con sorgenti multiple la destinazione deve essere una directory esistente"
+msgstr ""
+"con sorgenti multiple la destinazione deve essere una directory esistente"
 
 #, python-format
 msgid "destination %s is not a directory"
 msgstr "la destinazione %s non è una directory"
 
 msgid "no files to copy"
 msgstr "nessun file da copiare"
 
 msgid "(consider using --after)\n"
 msgstr "(considera di usare --after)\n"
 
+msgid "child process failed to start"
+msgstr ""
+
 #, python-format
 msgid "changeset:   %d:%s\n"
 msgstr "changeset:   %d:%s\n"
 
 #, python-format
 msgid "branch:      %s\n"
 msgstr "branch:      %s\n"
 
 #, python-format
 msgid "tag:         %s\n"
 msgstr "tag:         %s\n"
 
 #, python-format
 msgid "parent:      %d:%s\n"
 msgstr "genitore:    %d:%s\n"
 
 #, python-format
 msgid "manifest:    %d:%s\n"
 msgstr "manifesto:    %d:%s\n"
 
 #, python-format
 msgid "user:        %s\n"
 msgstr "utente:      %s\n"
 
 #, python-format
 msgid "date:        %s\n"
 msgstr "data:        %s\n"
 
 msgid "files+:"
 msgstr "file+:"
 
 msgid "files-:"
 msgstr "file-:"
 
 msgid "files:"
 msgstr "file:"
 
 #, python-format
 msgid "files:       %s\n"
 msgstr "file:       %s\n"
 
 #, python-format
 msgid "copies:      %s\n"
 msgstr "copie:      %s\n"
 
 #, python-format
 msgid "extra:       %s=%s\n"
 msgstr "extra:       %s=%s\n"
 
 msgid "description:\n"
 msgstr "descrizione:\n"
 
 #, python-format
 msgid "summary:     %s\n"
 msgstr "sommario:    %s\n"
 
 #, python-format
 msgid "%s: no key named '%s'"
 msgstr "%s: nessuna chiave chiamata '%s'"
 
 #, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#, python-format
 msgid "Found revision %s from %s\n"
 msgstr "Trovata revisione %s da %s\n"
 
 msgid "revision matching date not found"
 msgstr "revisione corrispondente alla data non trovata"
 
 #, python-format
 msgid "cannot follow nonexistent file: \"%s\""
 msgstr "impossibile seguire il file non esistente: \"%s\""
 
-#, python-format
-msgid "%s:%s copy source revision cannot be found!\n"
-msgstr ""
-
 msgid "can only follow copies/renames for explicit filenames"
 msgstr ""
 
 msgid "HG: Enter commit message.  Lines beginning with 'HG:' are removed."
 msgstr ""
 
 msgid "HG: Leave message empty to abort commit."
 msgstr ""
 
 #, python-format
 msgid "HG: user: %s"
 msgstr "HG: utente: %s"
 
 msgid "HG: branch merge"
 msgstr ""
 
 #, python-format
 msgid "HG: branch '%s'"
 msgstr ""
 
 #, python-format
 msgid "HG: subrepo %s"
 msgstr "HG: subrepository %s"
 
 #, python-format
 msgid "HG: added %s"
 msgstr ""
 
 #, python-format
 msgid "HG: changed %s"
 msgstr "HG: cambiato %s"
 
 #, python-format
 msgid "HG: removed %s"
 msgstr "HG: rimosso %s"
 
 msgid "HG: no files changed"
 msgstr "HG: nessun file modificato"
 
 msgid "empty commit message"
 msgstr "messaggio di commit vuoto"
 
 msgid "add the specified files on the next commit"
 msgstr ""
 
 msgid ""
 "    Schedule files to be version controlled and added to the\n"
 "    repository."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "    The files will be added to the repository at the next commit. To\n"
-"    undo an add before that, see hg forget."
-msgstr ""
-
-msgid ""
-"    If no names are given, add all files to the repository.\n"
+"    undo an add before that, see :hg:`forget`."
+msgstr ""
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale."
+
+msgid "    If no names are given, add all files to the repository."
+msgstr ""
+
+msgid "    .. container:: verbose"
+msgstr ""
+
+msgid ""
+"       An example showing how new (unknown) files are added\n"
+"       automatically by :hg:`add`::"
+msgstr ""
+
+msgid ""
+"         $ ls\n"
+"         foo.c\n"
+"         $ hg status\n"
+"         ? foo.c\n"
+"         $ hg add\n"
+"         adding foo.c\n"
+"         $ hg status\n"
+"         A foo.c"
+msgstr ""
+
+msgid ""
+"    Returns 0 if all files are successfully added.\n"
 "    "
 msgstr ""
 
 msgid "add all new files, delete all missing files"
 msgstr ""
 
 msgid ""
 "    Add all new files and remove all missing files from the\n"
 "    repository."
 msgstr ""
 
 msgid ""
 "    New files are ignored if they match any of the patterns in\n"
 "    .hgignore. As with add, these changes take effect at the next\n"
 "    commit."
 msgstr ""
 
 msgid ""
 "    Use the -s/--similarity option to detect renamed files. With a\n"
 "    parameter greater than 0, this compares every removed file with\n"
 "    every added file and records those similar enough as renames. This\n"
 "    option takes a percentage between 0 (disabled) and 100 (files must\n"
 "    be identical) as its parameter. Detecting renamed files this way\n"
-"    can be expensive.\n"
-"    "
+"    can be expensive. After using this option, :hg:`status -C` can be\n"
+"    used to check which files were identified as moved or renamed."
 msgstr ""
 
 msgid "similarity must be a number"
 msgstr ""
 
 msgid "similarity must be between 0 and 100"
 msgstr ""
 
 msgid "show changeset information by line for each file"
 msgstr ""
 
 msgid ""
 "    List changes in files, showing the revision id responsible for\n"
 "    each line"
 msgstr ""
 
 msgid ""
 "    This command is useful for discovering when a change was made and\n"
 "    by whom."
 msgstr ""
 
 msgid ""
 "    Without the -a/--text option, annotate will avoid processing files\n"
 "    it detects as binary. With -a, annotate will annotate the file\n"
 "    anyway, although the results will probably be neither useful\n"
-"    nor desirable.\n"
+"    nor desirable."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success.\n"
 "    "
 msgstr ""
 
 msgid "at least one filename or pattern is required"
 msgstr ""
 
 msgid "at least one of -n/-c is required for -l"
 msgstr ""
 
 #, python-format
 msgid "%s: binary file\n"
 msgstr ""
 
 msgid "create an unversioned archive of a repository revision"
 msgstr ""
 
 msgid ""
 "    By default, the revision used is the parent of the working\n"
 "    directory; use -r/--rev to specify a different revision."
 msgstr ""
 
 msgid ""
-"    To specify the type of archive to create, use -t/--type. Valid\n"
-"    types are::"
-msgstr ""
-
-msgid ""
-"      \"files\" (default): a directory full of files\n"
-"      \"tar\": tar archive, uncompressed\n"
-"      \"tbz2\": tar archive, compressed using bzip2\n"
-"      \"tgz\": tar archive, compressed using gzip\n"
-"      \"uzip\": zip archive, uncompressed\n"
-"      \"zip\": zip archive, compressed using deflate"
+"    The archive type is automatically detected based on file\n"
+"    extension (or override using -t/--type)."
+msgstr ""
+
+msgid "    Valid types are:"
+msgstr ""
+
+msgid ""
+"    :``files``: a directory full of files (default)\n"
+"    :``tar``:   tar archive, uncompressed\n"
+"    :``tbz2``:  tar archive, compressed using bzip2\n"
+"    :``tgz``:   tar archive, compressed using gzip\n"
+"    :``uzip``:  zip archive, uncompressed\n"
+"    :``zip``:   zip archive, compressed using deflate"
 msgstr ""
 
 msgid ""
 "    The exact name of the destination archive or directory is given\n"
-"    using a format string; see 'hg help export' for details."
+"    using a format string; see :hg:`help export` for details."
 msgstr ""
 
 msgid ""
 "    Each member added to an archive file has a directory prefix\n"
 "    prepended. Use -p/--prefix to specify a format string for the\n"
 "    prefix. The default is the basename of the archive, with suffixes\n"
-"    removed.\n"
-"    "
+"    removed."
 msgstr ""
 
 msgid "no working directory: please specify a revision"
 msgstr ""
 
 msgid "repository root cannot be destination"
 msgstr ""
 
 msgid "cannot archive plain files to stdout"
 msgstr ""
 
 #, fuzzy
 msgid "reverse effect of earlier changeset"
 msgstr "inverte l'effetto di un changeset precedente"
 
 #, fuzzy
 msgid ""
 "    Commit the backed out changes as a new changeset. The new\n"
 "    changeset is a child of the backed out changeset."
 msgstr ""
 "    Effettua il commit delle modifiche di cui si è fatto backout\n"
 "    come nuovo changeset. Il nuovo changeset è un figlio del\n"
 "    changeset di cui si è fatto backout."
 
 #, fuzzy
 msgid ""
 "    If you backout a changeset other than the tip, a new head is\n"
 "    created. This head will be the new tip and you should merge this\n"
 "    backout changeset with another head."
 msgstr ""
 "    Se si fa il backout di un changeset diverso da tip, viene creata\n"
 "    una nuova head. Questa sarà la nuova tip e si dovrebbe fare il\n"
 "    merge di questo changeset di backout con un'altra head\n"
 "    (attualmente una di default)."
 
 #, fuzzy
 msgid ""
 "    The --merge option remembers the parent of the working directory\n"
 "    before starting the backout, then merges the new head with that\n"
 "    changeset afterwards. This saves you from doing the merge by hand.\n"
 "    The result of this merge is not committed, as with a normal merge."
 msgstr ""
 "    L'opzione --merge ricorda il genitore della directory di lavoro\n"
 "    prima di avviare il backout, poi fa il merge della nuova head con\n"
 "    quel changeset. Questo evita di fare il merge a mano. Non viene\n"
 "    effettuato il commit del risultato di questo merge, come per un\n"
 "    merge normale."
 
 msgid "please specify just one revision"
 msgstr ""
 
 msgid "please specify a revision to backout"
 msgstr ""
 
 msgid "cannot backout change on a different branch"
 msgstr ""
 
 msgid "cannot backout a change with no parents"
 msgstr ""
 
 msgid "cannot backout a merge changeset without --parent"
 msgstr ""
 
 #, python-format
 msgid "%s is not a parent of %s"
 msgstr ""
 
 msgid "cannot use --parent on non-merge changeset"
 msgstr ""
 
 #, python-format
 msgid "changeset %s backs out changeset %s\n"
 msgstr ""
 
 #, python-format
 msgid "merging with changeset %s\n"
 msgstr "sto effettuando il merge con il changeset %s\n"
 
 msgid "the backout changeset is a new head - do not forget to merge\n"
 msgstr ""
 
 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
 msgstr ""
 
 msgid "subdivision search of changesets"
 msgstr ""
 
 msgid ""
 "    This command helps to find changesets which introduce problems. To\n"
 "    use, mark the earliest changeset you know exhibits the problem as\n"
 "    bad, then mark the latest changeset which is free from the problem\n"
 "    as good. Bisect will update your working directory to a revision\n"
 "    for testing (unless the -U/--noupdate option is specified). Once\n"
 "    you have performed tests, mark the working directory as good or\n"
 "    bad, and bisect will either update to another candidate changeset\n"
 "    or announce that it has found the bad revision."
 msgstr ""
 
 msgid ""
 "    As a shortcut, you can also use the revision argument to mark a\n"
 "    revision as good or bad without checking it out first."
 msgstr ""
 
 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.\n"
-"    "
+"    non-zero exit status means the revision is bad."
 msgstr ""
 
 #, fuzzy
 msgid "The first good revision is:\n"
 msgstr "La prima revisione %s è:\n"
 
 #, fuzzy
 msgid "The first bad revision is:\n"
 msgstr "La prima revisione %s è:\n"
 
 msgid "Due to skipped revisions, the first good revision could be any of:\n"
 msgstr ""
 
 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
 msgstr ""
 
 msgid "cannot bisect (no known good revisions)"
 msgstr "impossibile fare bisect (nessuna revisione buona nota)"
 
 msgid "cannot bisect (no known bad revisions)"
 msgstr "impossibile fare bisect (nessuna revisione cattiva nota)"
 
 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
 msgstr "(l'uso di 'hg bisect <cmd>' è deprecato)\n"
 
 msgid "incompatible arguments"
 msgstr "argomenti incompatibili"
 
 #, python-format
 msgid "failed to execute %s"
 msgstr "esecuzione di %s fallita"
 
 #, python-format
 msgid "%s killed"
 msgstr "%s ucciso"
 
 #, fuzzy, python-format
 msgid "Changeset %d:%s: %s\n"
 msgstr "Changeset %s: %s\n"
 
 #, python-format
 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
 msgstr ""
 
 msgid "set or show the current branch name"
 msgstr ""
 
 msgid ""
 "    With no argument, show the current branch name. With one argument,\n"
 "    set the working directory branch name (the branch will not exist\n"
 "    in the repository until the next commit). Standard practice\n"
 "    recommends that primary development take place on the 'default'\n"
 "    branch."
 msgstr ""
 
 msgid ""
 "    Unless -f/--force is specified, branch will not let you set a\n"
 "    branch name that already exists, even if it's inactive."
 msgstr ""
 
 msgid ""
 "    Use -C/--clean to reset the working directory branch to that of\n"
 "    the parent of the working directory, negating a previous branch\n"
 "    change."
 msgstr ""
 
 msgid ""
-"    Use the command 'hg update' to switch to an existing branch. Use\n"
-"    'hg commit --close-branch' to mark this branch as closed.\n"
-"    "
+"    Use the command :hg:`update` to switch to an existing branch. Use\n"
+"    :hg:`commit --close-branch` to mark this branch as closed."
 msgstr ""
 
 #, python-format
 msgid "reset working directory to branch %s\n"
 msgstr "resetto la directory di lavoro alla branch %s\n"
 
-msgid "a branch of the same name already exists (use --force to override)"
-msgstr "una branch con lo stesso nome esiste già (usare --force per sovrascrivere)"
+#, fuzzy
+msgid ""
+"a branch of the same name already exists (use 'hg update' to switch to it)"
+msgstr ""
+"una branch con lo stesso nome esiste già (usare --force per sovrascrivere)"
 
 #, python-format
 msgid "marked working directory as branch %s\n"
 msgstr "marcata directory di lavoro come branch %s\n"
 
 msgid "list repository named branches"
 msgstr ""
 
 msgid ""
 "    List the repository's named branches, indicating which ones are\n"
 "    inactive. If -c/--closed is specified, also list branches which have\n"
-"    been marked closed (see hg commit --close-branch)."
+"    been marked closed (see :hg:`commit --close-branch`)."
 msgstr ""
 
 msgid ""
 "    If -a/--active is specified, only show active branches. A branch\n"
 "    is considered active if it contains repository heads."
 msgstr ""
 
-msgid ""
-"    Use the command 'hg update' to switch to an existing branch.\n"
-"    "
+msgid "    Use the command :hg:`update` to switch to an existing branch."
+msgstr ""
+
+msgid ""
+"    Returns 0.\n"
+"    "
+msgstr ""
+
+msgid " (closed)"
+msgstr ""
+
+msgid " (inactive)"
 msgstr ""
 
 msgid "create a changegroup file"
 msgstr ""
 
 msgid ""
 "    Generate a compressed changegroup file collecting changesets not\n"
 "    known to be in another repository."
 msgstr ""
 
 msgid ""
-"    If no destination repository is specified the destination is\n"
-"    assumed to have all the nodes specified by one or more --base\n"
+"    If you omit the destination repository, then hg assumes the\n"
+"    destination will have all the nodes you specify with --base\n"
 "    parameters. To create a bundle containing all changesets, use\n"
 "    -a/--all (or --base null)."
 msgstr ""
 
 msgid ""
 "    You can change compression method with the -t/--type option.\n"
 "    The available compression methods are: none, bzip2, and\n"
 "    gzip (by default, bundles are compressed using bzip2)."
 msgstr ""
 
 msgid ""
 "    The bundle file can then be transferred using conventional means\n"
 "    and applied to another repository with the unbundle or pull\n"
 "    command. This is useful when direct push and pull are not\n"
 "    available or when exporting an entire repository is undesirable."
 msgstr ""
 
 msgid ""
 "    Applying bundles preserves all changeset contents including\n"
-"    permissions, copy/rename information, and revision history.\n"
+"    permissions, copy/rename information, and revision history."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if no changes found.\n"
 "    "
 msgstr ""
 
 #, fuzzy
 msgid "--base is incompatible with specifying a destination"
 msgstr "un changeset base da specificare invece di una destinazione"
 
 msgid "unknown bundle type specified with --type"
 msgstr ""
 
 msgid "output the current or given revision of files"
 msgstr ""
 
 msgid ""
 "    Print the specified files as they were at the given revision. If\n"
 "    no revision is given, the parent of the working directory is used,\n"
 "    or tip if no revision is checked out."
 msgstr ""
 
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are the same as\n"
-"    for the export command, with the following additions::"
-msgstr ""
-
-msgid ""
-"      %s   basename of file being printed\n"
-"      %d   dirname of file being printed, or '.' if in repository root\n"
-"      %p   root-relative path name of file being printed\n"
-"    "
+"    for the export command, with the following additions:"
+msgstr ""
+
+msgid ""
+"    :``%s``: basename of file being printed\n"
+"    :``%d``: dirname of file being printed, or '.' if in repository root\n"
+"    :``%p``: root-relative path name of file being printed"
 msgstr ""
 
 msgid "make a copy of an existing repository"
 msgstr ""
 
 msgid "    Create a copy of an existing repository in a new directory."
 msgstr ""
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
 "    basename of the source."
 msgstr ""
 
 msgid ""
 "    The location of the source is added to the new repository's\n"
 "    .hg/hgrc file, as the default to be used for future pulls."
 msgstr ""
 
-msgid ""
-"    If you use the -r/--rev option to clone up to a specific revision,\n"
-"    no subsequent revisions (including subsequent tags) will be\n"
-"    present in the cloned repository. This option implies --pull, even\n"
-"    on local repositories."
-msgstr ""
-
-msgid ""
-"    By default, clone will check out the head of the 'default' branch.\n"
-"    If the -U/--noupdate option is used, the new clone will contain\n"
-"    only a repository (.hg) and no working copy (the working copy\n"
-"    parent is the null revision)."
-msgstr ""
-
-msgid "    See 'hg help urls' for valid source format details."
-msgstr ""
+#, fuzzy
+msgid "    See :hg:`help urls` for valid source format details."
+msgstr ""
+"    Vedere pull per dettagli sui formati di sorgenti validi.\n"
+"    "
 
 msgid ""
 "    It is possible to specify an ``ssh://`` URL as the destination, but no\n"
 "    .hg/hgrc and working directory will be created on the remote side.\n"
-"    Please see 'hg help urls' for important details about ``ssh://`` URLs."
+"    Please see :hg:`help urls` for important details about ``ssh://`` URLs."
+msgstr ""
+
+msgid ""
+"    A set of changesets (tags, or branch names) to pull may be specified\n"
+"    by listing each changeset (tag, or branch name) with -r/--rev.\n"
+"    If -r/--rev is used, the cloned repository will contain only a subset\n"
+"    of the changesets of the source repository. Only the set of changesets\n"
+"    defined by all -r/--rev options (including all their ancestors)\n"
+"    will be pulled into the destination repository.\n"
+"    No subsequent changesets (including subsequent tags) will be present\n"
+"    in the destination."
+msgstr ""
+
+msgid ""
+"    Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
+"    local source repositories."
 msgstr ""
 
 msgid ""
 "    For efficiency, hardlinks are used for cloning whenever the source\n"
 "    and destination are on the same filesystem (note this applies only\n"
-"    to the repository data, not to the checked out files). Some\n"
+"    to the repository data, not to the working directory). Some\n"
 "    filesystems, such as AFS, implement hardlinking incorrectly, but\n"
 "    do not report errors. In these cases, use the --pull option to\n"
 "    avoid hardlinking."
 msgstr ""
 
 msgid ""
-"    In some cases, you can clone repositories and checked out files\n"
+"    In some cases, you can clone repositories and the working directory\n"
 "    using full hardlinks with ::"
 msgstr ""
 
 msgid "      $ cp -al REPO REPOCLONE"
 msgstr ""
 
 msgid ""
 "    This is the fastest way to clone, but it is not always safe. The\n"
 "    operation is not atomic (making sure REPO is not modified during\n"
 "    the operation is up to you) and you have to make sure your editor\n"
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
-"    metadata under the .hg directory, such as mq.\n"
-"    "
-msgstr ""
+"    metadata under the .hg directory, such as mq."
+msgstr ""
+
+msgid ""
+"    Mercurial will update the working directory to the first applicable\n"
+"    revision from this list:"
+msgstr ""
+
+msgid ""
+"    a) null if -U or the source repository has no changesets\n"
+"    b) if -u . and the source repository is local, the first parent of\n"
+"       the source repository's working directory\n"
+"    c) the changeset specified with -u (if a branch name, this means the\n"
+"       latest head of that branch)\n"
+"    d) the changeset specified with -r\n"
+"    e) the tipmost head specified with -b\n"
+"    f) the tipmost head specified with the url#branch source syntax\n"
+"    g) the tipmost head of the default branch\n"
+"    h) tip"
+msgstr ""
+
+#, fuzzy
+msgid "cannot specify both --noupdate and --updaterev"
+msgstr "non è possibile specificare sia una revisione sia una base"
 
 #, fuzzy
 msgid "commit the specified files or all outstanding changes"
-msgstr "effettua il commit dei file specificati o di tutte le modifiche pendenti"
+msgstr ""
+"effettua il commit dei file specificati o di tutte le modifiche pendenti"
 
 #, fuzzy
 msgid ""
 "    Commit changes to the given files into the repository. Unlike a\n"
-"    centralized RCS, this operation is a local operation. See hg push\n"
-"    for a way to actively distribute your changes."
+"    centralized RCS, this operation is a local operation. See\n"
+"    :hg:`push` for a way to actively distribute your changes."
 msgstr "    Effettua il commit delle modifiche sui file dati nel repository."
 
 #, fuzzy
 msgid ""
-"    If a list of files is omitted, all changes reported by \"hg status\"\n"
+"    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be committed."
 msgstr ""
 "    Se si omette un elenco di file, si farà il commit di tutte le\n"
 "    modifiche riportate da \"hg status\"."
 
 #, fuzzy
 msgid ""
 "    If you are committing the result of a merge, do not provide any\n"
 "    filenames or -I/-X filters."
 msgstr ""
 "    Se si sta effettuando il commit del risultato di un merge, non\n"
 "    fornire nessun nome di file o filtri -I/-X."
 
 #, fuzzy
 msgid ""
 "    If no commit message is specified, the configured editor is\n"
 "    started to prompt you for a message."
 msgstr ""
 "    Se non è specificato nessun messaggio di commit, l'editor\n"
 "    configurato viene lanciato per inserire un messaggio."
 
+msgid ""
+"    Returns 0 on success, 1 if nothing changed.\n"
+"    "
+msgstr ""
+
+msgid "can only close branch heads"
+msgstr ""
+
 msgid "nothing changed\n"
 msgstr "nulla è cambiato\n"
 
 msgid "created new head\n"
 msgstr "creata una nuova head\n"
 
 #, python-format
+msgid "reopening closed branch head %d\n"
+msgstr ""
+
+#, python-format
 msgid "committed changeset %d:%s\n"
 msgstr "effettuato il commit del changeset %d:%s\n"
 
 msgid "mark files as copied for the next commit"
 msgstr ""
 
 msgid ""
 "    Mark dest as having copies of source files. If dest is a\n"
 "    directory, copies are put in that directory. If dest is a file,\n"
 "    the source must be a single file."
 msgstr ""
 
 msgid ""
 "    By default, this command copies the contents of files as they\n"
 "    exist in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed."
 msgstr ""
 
 msgid ""
 "    This command takes effect with the next commit. To undo a copy\n"
-"    before that, see hg revert.\n"
+"    before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if errors are encountered.\n"
 "    "
 msgstr ""
 
 msgid "find the ancestor revision of two revisions in a given index"
 msgstr ""
 
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
-
 msgid "either two or three arguments required"
 msgstr "due o tre argomenti sono richiesti"
 
+msgid "builds a repo with a given dag from scratch in the current empty repo"
+msgstr ""
+
+msgid "    Elements:"
+msgstr ""
+
+msgid ""
+"     - \"+n\" is a linear run of n nodes based on the current default "
+"parent\n"
+"     - \".\" is a single node based on the current default parent\n"
+"     - \"$\" resets the default parent to null (implied at the start);\n"
+"           otherwise the default parent is always the last node created\n"
+"     - \"<p\" sets the default parent to the backref p\n"
+"     - \"*p\" is a fork at parent p, which is a backref\n"
+"     - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n"
+"     - \"/p2\" is a merge of the preceding node and p2\n"
+"     - \":tag\" defines a local tag for the preceding node\n"
+"     - \"@branch\" sets the named branch for subsequent nodes\n"
+"     - \"!command\" runs the command using your shell\n"
+"     - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
+"     - \"#...\\n\" is a comment up to the end of the line"
+msgstr ""
+
+msgid "    Whitespace between the above elements is ignored."
+msgstr ""
+
+msgid "    A backref is either"
+msgstr ""
+
+msgid ""
+"     - a number n, which references the node curr-n, where curr is the "
+"current\n"
+"       node, or\n"
+"     - the name of a local tag you placed earlier using \":tag\", or\n"
+"     - empty to denote the default parent."
+msgstr ""
+
+msgid ""
+"    All string valued-elements are either strictly alphanumeric, or must\n"
+"    be enclosed in double quotes (\"...\"), with \"\" as escape character."
+msgstr ""
+
+msgid ""
+"    Note that the --overwritten-file and --appended-file options imply the\n"
+"    use of \"HGMERGE=internal:local\" during DAG buildup.\n"
+"    "
+msgstr ""
+
+msgid "need at least one of -m, -a, -o, -n"
+msgstr ""
+
+#, fuzzy
+msgid "repository is not empty"
+msgstr "repository %s non trovato"
+
+#, fuzzy, python-format
+msgid "%s command %s"
+msgstr "comandi base:"
+
+#, fuzzy
+msgid "list all available commands and options"
+msgstr "mostra le opzioni dei comandi"
+
 msgid "returns the completion list associated with the given command"
 msgstr "restituisce l'elenco di completamento associato al dato comando"
 
+#, fuzzy
+msgid "show information detected about current filesystem"
+msgstr "mostra solo i file rimossi (ma tracciati)"
+
 msgid "rebuild the dirstate as it would look like for the given revision"
 msgstr ""
 
 msgid "validate the correctness of the current dirstate"
 msgstr ""
 
 #, python-format
 msgid "%s in state %s, but not in manifest1\n"
 msgstr "%s è nello state %s, ma non nel manifest1\n"
 
 #, python-format
 msgid "%s in state %s, but also in manifest1\n"
 msgstr "%s è nello state %s, ma anche nel manifest1\n"
 
 #, python-format
 msgid "%s in state %s, but not in either manifest\n"
 msgstr "%s è nello state %s, ma non in uno dei manifesti\n"
 
 #, python-format
 msgid "%s in manifest1, but listed as state %s"
 msgstr ""
 
 msgid ".hg/dirstate inconsistent with current parent's manifest"
 msgstr ""
 
 msgid "show combined config settings from all hgrc files"
 msgstr ""
 
 msgid "    With no arguments, print names and values of all config items."
 msgstr ""
 
 msgid ""
 "    With one argument of the form section.name, print just the value\n"
 "    of that config item."
 msgstr ""
 
 msgid ""
 "    With multiple arguments, print names and values of all config\n"
 "    items with matching section names."
 msgstr ""
 
 msgid ""
 "    With --debug, the source (filename and line number) is printed\n"
-"    for each config item.\n"
-"    "
-msgstr ""
+"    for each config item."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "read config from: %s\n"
+msgstr "opzione --config malformata: %s"
 
 msgid "only one config item permitted"
 msgstr ""
 
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid "    With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+"    With five args, set a key to new if it currently is set to old.\n"
+"    Reports success or failure.\n"
+"    "
+msgstr ""
+
+msgid "parse and apply a revision specification"
+msgstr ""
+
 msgid "manually set the parents of the current working directory"
 msgstr ""
 
 msgid ""
 "    This is useful for writing repository conversion tools, but should\n"
-"    be used with care.\n"
-"    "
+"    be used with care."
 msgstr ""
 
 msgid "show the contents of the current dirstate"
 msgstr ""
 
 #, python-format
 msgid "copy: %s -> %s\n"
 msgstr ""
 
+msgid "format the changelog or an index DAG as a concise textual description"
+msgstr ""
+
+msgid ""
+"    If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
+"    revision numbers, they get labelled in the output as rN."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    Otherwise, the changelog DAG of the current repo is emitted.\n"
+"    "
+msgstr ""
+"    Stampa la directory radice del repository corrente.\n"
+"    "
+
+msgid "need repo for changelog dag"
+msgstr ""
+
 msgid "dump the contents of a data file revision"
 msgstr ""
 
 #, python-format
 msgid "invalid revision identifier %s"
 msgstr ""
 
 msgid "parse and display a date"
 msgstr ""
 
 msgid "dump the contents of an index file"
 msgstr ""
 
 msgid "dump an index DAG as a graphviz dot file"
 msgstr ""
 
 msgid "test Mercurial installation"
 msgstr ""
 
 #, python-format
 msgid "Checking encoding (%s)...\n"
 msgstr ""
 
 msgid " (check that your locale is properly set)\n"
 msgstr ""
 
 msgid "Checking extensions...\n"
 msgstr ""
 
 msgid " One or more extensions could not be found"
 msgstr ""
 
 msgid " (check that you compiled the extensions)\n"
 msgstr ""
 
 msgid "Checking templates...\n"
 msgstr ""
 
 msgid " (templates seem to have been installed incorrectly)\n"
 msgstr ""
 
 msgid "Checking patch...\n"
 msgstr ""
 
 msgid " patch call failed:\n"
 msgstr ""
 
 msgid " unexpected patch output!\n"
 msgstr ""
 
 msgid " patch test failed!\n"
 msgstr ""
 
-msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
-msgstr ""
-
-msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
+msgid ""
+" (Current patch tool may be incompatible with patch, or misconfigured. "
+"Please check your .hgrc file)\n"
+msgstr ""
+
+msgid ""
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/bts/\n"
 msgstr ""
 
 msgid "Checking commit editor...\n"
 msgstr "Sto controllando l'editor per il commit...\n"
 
 msgid " No commit editor set and can't find vi in PATH\n"
 msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n"
 
 msgid " (specify a commit editor in your .hgrc file)\n"
 msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
 
 #, python-format
 msgid " Can't find editor '%s' in PATH\n"
 msgstr "Editor '%s' non trovato in PATH\n"
 
 msgid "Checking username...\n"
 msgstr "Sto controllando lo username...\n"
 
 msgid " (specify a username in your .hgrc file)\n"
 msgstr " (specificare un nome utente nel proprio file .hgrc)\n"
 
 msgid "No problems detected\n"
 msgstr "Nessun problema riscontrato\n"
 
 #, python-format
 msgid "%s problems detected, please check your install!\n"
 msgstr "%s problemi riscontrati, si prega di controllare l'installazione!\n"
 
 msgid "dump rename information"
 msgstr ""
 
 #, python-format
 msgid "%s renamed from %s:%s\n"
 msgstr ""
 
 #, python-format
 msgid "%s not renamed\n"
 msgstr ""
 
 msgid "show how files match on given patterns"
 msgstr "mostra come i file corrispondono ai dati pattern"
 
 msgid "diff repository (or selected files)"
 msgstr ""
 
 msgid "    Show differences between revisions for the specified files."
 msgstr ""
 
 msgid "    Differences between files are shown using the unified diff format."
 msgstr ""
 
 msgid ""
 "    NOTE: diff may generate unexpected results for merges, as it will\n"
 "    default to comparing against the working directory's first parent\n"
 "    changeset if no revisions are specified."
 msgstr ""
 
 msgid ""
+"    Alternatively you can specify -c/--change with a revision to see\n"
+"    the changes in that changeset relative to its first parent."
+msgstr ""
+
+msgid ""
 "    Without the -a/--text option, diff will avoid generating diffs of\n"
 "    files it detects as binary. With -a, diff will generate a diff\n"
 "    anyway, probably with undesirable results."
 msgstr ""
 
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
-"    format. For more information, read 'hg help diffs'.\n"
-"    "
+"    format. For more information, read :hg:`help diffs`."
 msgstr ""
 
 msgid "dump the header and diffs for one or more changesets"
 msgstr ""
 
 msgid "    Print the changeset header and diffs for one or more revisions."
 msgstr ""
 
 msgid ""
-"    The information shown in the changeset header is: author,\n"
-"    changeset hash, parent(s) and commit comment."
+"    The information shown in the changeset header is: author, date,\n"
+"    branch name (if non-default), changeset hash, parent(s) and commit\n"
+"    comment."
 msgstr ""
 
 msgid ""
 "    NOTE: export may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only."
 msgstr ""
 
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows::"
-msgstr ""
-
-msgid ""
-"      %%   literal \"%\" character\n"
-"      %H   changeset hash (40 bytes of hexadecimal)\n"
-"      %N   number of patches being generated\n"
-"      %R   changeset revision number\n"
-"      %b   basename of the exporting repository\n"
-"      %h   short-form changeset hash (12 bytes of hexadecimal)\n"
-"      %n   zero-padded sequence number, starting at 1\n"
-"      %r   zero-padded changeset revision number"
+"    given using a format string. The formatting rules are as follows:"
+msgstr ""
+
+msgid ""
+"    :``%%``: literal \"%\" character\n"
+"    :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+"    :``%N``: number of patches being generated\n"
+"    :``%R``: changeset revision number\n"
+"    :``%b``: basename of the exporting repository\n"
+"    :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+"    :``%n``: zero-padded sequence number, starting at 1\n"
+"    :``%r``: zero-padded changeset revision number"
 msgstr ""
 
 msgid ""
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
 "    diff anyway, probably with undesirable results."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
-"    format. See 'hg help diffs' for more information."
-msgstr ""
+"    format. See :hg:`help diffs` for more information."
+msgstr ""
+"    Usa l'opzione --git per mantenere la patch nel formato diff esteso\n"
+"    git. Leggere le informazioni di aiuto sui diff per maggiori\n"
+"    informazioni sul motivo per cui quest'opzione importante per\n"
+"    preservare modifiche di permessi e informazioni su copie/rinomine.\n"
+"    "
 
 msgid ""
 "    With the --switch-parent option, the diff will be against the\n"
-"    second parent. It can be useful to review a merge.\n"
-"    "
+"    second parent. It can be useful to review a merge."
 msgstr ""
 
 msgid "export requires at least one changeset"
 msgstr ""
 
 msgid "exporting patches:\n"
 msgstr ""
 
 msgid "exporting patch:\n"
 msgstr ""
 
 msgid "forget the specified files on the next commit"
 msgstr ""
 
 msgid ""
 "    Mark the specified files so they will no longer be tracked\n"
 "    after the next commit."
 msgstr ""
 
 msgid ""
 "    This only removes files from the current branch, not from the\n"
 "    entire project history, and it does not delete them from the\n"
 "    working directory."
 msgstr ""
 
-msgid ""
-"    To undo a forget before the next commit, see hg add.\n"
-"    "
+msgid "    To undo a forget before the next commit, see :hg:`add`."
 msgstr ""
 
 msgid "no files specified"
 msgstr "nessun file specificato"
 
 #, fuzzy, python-format
 msgid "not removing %s: file is already untracked\n"
 msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
 
 msgid "search for a pattern in specified files and revisions"
 msgstr ""
 
 msgid "    Search revisions of files for a regular expression."
 msgstr ""
 
 msgid ""
 "    This command behaves differently than Unix grep. It only accepts\n"
 "    Python/Perl regexps. It searches repository history, not the\n"
 "    working directory. It always prints the revision number in which a\n"
 "    match appears."
 msgstr ""
 
 msgid ""
 "    By default, grep only prints output for the first revision of a\n"
 "    file in which it finds a match. To get it to print every revision\n"
 "    that contains a change in match status (\"-\" for a match that\n"
 "    becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
-"    use the --all flag.\n"
+"    use the --all flag."
+msgstr ""
+
+msgid ""
+"    Returns 0 if a match is found, 1 otherwise.\n"
 "    "
 msgstr ""
 
 #, python-format
 msgid "grep: invalid match pattern: %s\n"
 msgstr ""
 
 msgid "show current repository heads or show branch heads"
 msgstr ""
 
-msgid "    With no arguments, show all repository head changesets."
-msgstr ""
+#, fuzzy
+msgid "    With no arguments, show all repository branch heads."
+msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
 
 msgid ""
 "    Repository \"heads\" are changesets with no child changesets. They are\n"
 "    where development generally takes place and are the usual targets\n"
-"    for update and merge operations."
-msgstr ""
-
-msgid ""
-"    If one or more REV is given, the \"branch heads\" will be shown for\n"
-"    the named branch associated with the specified changeset(s)."
-msgstr ""
-
-msgid ""
-"    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."
+"    for update and merge operations. Branch heads are changesets that have\n"
+"    no child changeset on the same branch."
+msgstr ""
+
+msgid ""
+"    If one or more REVs are given, only branch heads on the branches\n"
+"    associated with the specified changesets are shown."
 msgstr ""
 
 msgid ""
 "    If -c/--closed is specified, also show branch heads marked closed\n"
-"    (see hg commit --close-branch)."
+"    (see :hg:`commit --close-branch`)."
 msgstr ""
 
 msgid ""
 "    If STARTREV is specified, only those heads that are descendants of\n"
-"    STARTREV will be displayed.\n"
-"    "
-msgstr ""
-
-msgid "you must specify a branch to use --closed"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "no open branch heads on branch %s\n"
+"    STARTREV will be displayed."
+msgstr ""
+
+msgid ""
+"    If -t/--topo is specified, named branch mechanics will be ignored and "
+"only\n"
+"    changesets without children will be shown."
+msgstr ""
+
+msgid ""
+"    Returns 0 if matching heads are found, 1 if not.\n"
+"    "
+msgstr ""
+
+#, fuzzy, python-format
+msgid "no open branch heads found on branches %s"
 msgstr "svn: la branch non ha nessuna revisione %s"
 
-#, python-format
-msgid "no changes on branch %s containing %s are reachable from %s\n"
-msgstr ""
-
-#, python-format
-msgid "no changes on branch %s are reachable from %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid " (started at %s)"
+msgstr " (default: %s)"
 
 #, fuzzy
 msgid "show help for a given topic or a help overview"
 msgstr "mostra l'aiuto per un dato argomento o una panoramica d'aiuto"
 
 #, fuzzy
-msgid "    With no arguments, print a list of commands with short help messages."
+msgid ""
+"    With no arguments, print a list of commands with short help messages."
 msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
 
 #, fuzzy
 msgid ""
 "    Given a topic, extension, or command name, print help for that\n"
 "    topic."
 msgstr ""
 "    Dato un argomento, estensione o nome di comando, stampa l'aiuto\n"
 "    per tale argomento."
 
+msgid ""
+"    Returns 0 if successful.\n"
+"    "
+msgstr ""
+
 msgid "global options:"
 msgstr "opzioni globali:"
 
 msgid "use \"hg help\" for the full list of commands"
 msgstr "usare \"hg help\" per l'elenco completo dei comandi"
 
 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
-msgstr "usare \"hg help\" per la lista completa dei comandi oppure \"hg -v\" per i dettagli"
+msgstr ""
+"usare \"hg help\" per la lista completa dei comandi oppure \"hg -v\" per i "
+"dettagli"
 
 #, python-format
 msgid "use \"hg -v help%s\" to show aliases and global options"
 msgstr "usare \"hg -v help%s\" per mostrare gli alias e le opzioni globali"
 
 #, python-format
 msgid "use \"hg -v help %s\" to show global options"
 msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali"
 
 msgid "list of commands:"
 msgstr "elenco dei comandi:"
 
 #, python-format
 msgid ""
 "\n"
 "aliases: %s\n"
 msgstr ""
 "\n"
 "alias: %s\n"
 
 msgid "(no help text available)"
 msgstr "(nessun testo di aiuto disponibile)"
 
+#, fuzzy, python-format
+msgid "alias for: hg %s"
+msgstr ""
+"\n"
+"alias: %s\n"
+
+#, python-format
+msgid "%s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid ""
+"\n"
+"use \"hg -v help %s\" to show verbose help\n"
+msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali"
+
 msgid "options:\n"
 msgstr "opzioni:\n"
 
 msgid "no commands defined\n"
 msgstr "nessun comando definito\n"
 
-#, fuzzy
-msgid "enabled extensions:"
-msgstr ""
-"\n"
-"estensioni abilitate:\n"
-"\n"
-
 msgid "no help text available"
 msgstr "nessun testo di aiuto disponibile"
 
 #, fuzzy, python-format
 msgid "%s extension - %s"
 msgstr "estensione %s - %s\n"
 
+msgid "use \"hg help extensions\" for information on enabling extensions\n"
+msgstr ""
+
+#, python-format
+msgid "'%s' is provided by the following extension:"
+msgstr ""
+
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial SCM Distribuito\n"
 
 msgid "basic commands:"
 msgstr "comandi base:"
 
+#, fuzzy
+msgid "enabled extensions:"
+msgstr ""
+"\n"
+"estensioni abilitate:\n"
+"\n"
+
+msgid "VALUE"
+msgstr ""
+
+msgid "DEPRECATED"
+msgstr ""
+
+msgid ""
+"\n"
+"[+] marked option can be specified multiple times"
+msgstr ""
+
 msgid ""
 "\n"
 "additional help topics:"
 msgstr ""
 "\n"
 "argomenti di aiuto aggiuntivi:"
 
 #, fuzzy
 msgid "identify the working copy or specified revision"
 msgstr "identifica la copia di lavoro o una revisione specifica"
 
 #, fuzzy
 msgid ""
 "    With no revision, print a summary of the current state of the\n"
 "    repository."
 msgstr ""
 "    Con nessuna revisione, stampa un sommario dello stato corrente del\n"
 "    repository."
 
 #, fuzzy
 msgid ""
 "    Specifying a path to a repository root or Mercurial bundle will\n"
 "    cause lookup to operate on that repository/bundle."
 msgstr "    Con un percorso, effettua una ricerca in un altro repository."
 
 #, fuzzy
 msgid ""
 "    This summary identifies the repository state using one or two\n"
 "    parent hash identifiers, followed by a \"+\" if there are\n"
 "    uncommitted changes in the working directory, a list of tags for\n"
-"    this revision and a branch name for non-default branches.\n"
-"    "
+"    this revision and a branch name for non-default branches."
 msgstr ""
 "    Questo sommario identifica lo stato del repository usando uno o\n"
 "    due hash dei genitori, seguito da un \"+\" se ci sono modifiche di\n"
 "    cui non si è eseguito il commit nella directory di lavoro, un\n"
 "    elenco di tag per questa revisione e un nome di branch per branch\n"
 "    non-default.\n"
 "    "
 
 #, fuzzy
 msgid "import an ordered set of patches"
 msgstr "importa un insieme ordinato di patch"
 
 #, fuzzy
-msgid "    Import a list of patches and commit them individually."
+msgid ""
+"    Import a list of patches and commit them individually (unless\n"
+"    --no-commit is specified)."
 msgstr ""
 "    Importa un elenco di patch e ne effettua il commit\n"
 "    individualmente."
 
 #, fuzzy
 msgid ""
 "    If there are outstanding changes in the working directory, import\n"
 "    will abort unless given the -f/--force flag."
 msgstr ""
 "    Se ci sono modifiche pendenti nella directory di lavoro,\n"
 "    l'importazione abortirà a meno che non si usi il flag -f."
 
 #, fuzzy
 msgid ""
 "    You can import a patch straight from a mail message. Even patches\n"
 "    as attachments work (to use the body part, it must have type\n"
 "    text/plain or text/x-patch). From and Subject headers of email\n"
 "    message are used as default committer and commit message. All\n"
 "    text/plain body parts before first diff are added to commit\n"
 "    message."
 msgstr ""
 "    E' possibile importare una patch direttamente da un messaggio\n"
 "    mail. Anche le patch come allegato funzionano (il corpo deve\n"
 "    essere di tipo text/plain o deve essere usato text/x-patch). Le\n"
 "    intestazioni Da e Soggetto della mail sono usate come committente\n"
 "    e messaggio di commit di default. Tutte le parti del corpo\n"
 "    text/plain antecedenti il primo diff sono aggiunte al messaggio di\n"
 "    commit."
 
 #, fuzzy
 msgid ""
-"    If the imported patch was generated by hg export, user and\n"
+"    If the imported patch was generated by :hg:`export`, user and\n"
 "    description from patch override values from message headers and\n"
 "    body. Values given on command line with -m/--message and -u/--user\n"
 "    override these."
 msgstr ""
 "    Se la patch importata è stata generata da hg export, l'utente e la\n"
 "    descrizione dalla patch rimpiazzano i valori dal corpo e\n"
 "    dall'intestazione del messaggio. I valori forniti dalla riga di\n"
 "    comando con -m e -u rimpiazzano questi."
 
 #, fuzzy
 msgid ""
 "    If --exact is specified, import will set the working directory to\n"
 "    the parent of each patch before applying it, and will abort if the\n"
 "    resulting changeset has a different ID than the one recorded in\n"
 "    the patch. This may happen due to character set problems or other\n"
 "    deficiencies in the text patch format."
 msgstr ""
 "    Se viene specificato --exact, l'importazione imposterà la\n"
 "    directory di lavoro al genitore di ogni patch prima di applicarla,\n"
 "    e abortirà se il changeset risultante avrà un ID differente\n"
 "    rispetto a quello registrato nella patch Questo potrebbe capitare\n"
 "    a causa di problemi del set di caratteri o altre carenze nel\n"
 "    formato della patch testuale."
 
 #, fuzzy
 msgid ""
 "    With -s/--similarity, hg will attempt to discover renames and\n"
 "    copies in the patch in the same way as 'addremove'."
 msgstr ""
 "    Con --similarity, hg tenterà di scoprire le rinomine e le copie\n"
 "    nella patch allo stesso modo di 'addremove'."
 
 #, fuzzy
 msgid ""
 "    To read a patch from standard input, use \"-\" as the patch name. If\n"
 "    a URL is specified, the patch will be downloaded from it.\n"
-"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
-"    "
+"    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Per leggere una patch dallo standard input, usare come nome della\n"
 "    patch \"-\". Vedere 'hg help dates' per un elenco dei formati validi\n"
 "    per -d/--date.\n"
 "    "
 
-msgid "applying patch from stdin\n"
-msgstr "sto applicando patch dallo stdin\n"
-
-msgid "no diffs found"
-msgstr "nessun diff trovato"
+#, fuzzy
+msgid "to working directory"
+msgstr "aggiorna la directory di lavoro"
 
 #, fuzzy
 msgid "not a Mercurial patch"
 msgstr "non è una patch di mercurial"
 
 msgid "patch is damaged or loses information"
 msgstr "la patch è danneggiata o perde informazioni"
 
+msgid "applying patch from stdin\n"
+msgstr "sto applicando patch dallo stdin\n"
+
+#, fuzzy, python-format
+msgid "applied %s\n"
+msgstr "sto applicando %s\n"
+
+msgid "no diffs found"
+msgstr "nessun diff trovato"
+
 #, fuzzy
 msgid "show new changesets found in source"
 msgstr "mostra i nuovi changeset trovati nella sorgente"
 
 #, fuzzy
 msgid ""
 "    Show new changesets found in the specified path/URL or the default\n"
 "    pull location. These are the changesets that would have been pulled\n"
 "    if a pull at the time you issued this command."
 msgstr ""
 "    Mostra i nuovi changeset trovati nel percorso/URL specificato o\n"
 "    nella posizione di pull di default. Questi sono i changeset di cui\n"
 "    si effettuerebbe il pull se questo venisse richiesto."
 
 #, fuzzy
 msgid ""
 "    For remote repository, using --bundle avoids downloading the\n"
 "    changesets twice if the incoming is followed by a pull."
 msgstr ""
 "    Per repository remoti, usare --bundle evita di scaricare due volte\n"
 "    i changeset se incoming è seguito da un pull."
 
 #, fuzzy
-msgid ""
-"    See pull for valid source format details.\n"
-"    "
+msgid "    See pull for valid source format details."
 msgstr ""
 "    Vedere pull per dettagli sui formati di sorgenti validi.\n"
 "    "
 
+msgid ""
+"    Returns 0 if there are incoming changes, 1 otherwise.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "create a new repository in the given directory"
 msgstr "crea un nuovo repository nella directory data"
 
 #, fuzzy
 msgid ""
 "    Initialize a new repository in the given directory. If the given\n"
 "    directory does not exist, it will be created."
 msgstr ""
 "    Inizializza un nuovo repository nella directory data. Se tale\n"
 "    directory non esiste la crea."
 
 #, fuzzy
 msgid "    If no directory is given, the current directory is used."
 msgstr "    Se nessuna directory è specificata si usa la directory corrente."
 
 #, fuzzy
 msgid ""
 "    It is possible to specify an ``ssh://`` URL as the destination.\n"
-"    See 'hg help urls' for more information.\n"
-"    "
+"    See :hg:`help urls` for more information."
 msgstr ""
 "    E' possibile specificare un URL ``ssh://`` come destinazione.\n"
 "    Vedere 'hg help urls' per maggiorni informazioni.\n"
 "    "
 
 #, fuzzy
 msgid "locate files matching specific patterns"
 msgstr "trova file corrispondenti a pattern specificati"
 
 #, fuzzy
 msgid ""
 "    Print files under Mercurial control in the working directory whose\n"
 "    names match the given patterns."
 msgstr ""
 "    Stampa tutti i file sotto il controllo di Mercurial il cui nome\n"
 "    corrisponde ai dati pattern."
 
 #, fuzzy
 msgid ""
 "    By default, this command searches all directories in the working\n"
 "    directory. To search just the current directory and its\n"
 "    subdirectories, use \"--include .\"."
 msgstr ""
 "    Questo comando cerca nell'intero repository di default. Per\n"
 "    ricercare solo nella directory corrente e le sue sottodirectory,\n"
 "    usare \"--include .\"."
 
 #, fuzzy
 msgid ""
 "    If no patterns are given to match, this command prints the names\n"
 "    of all files under Mercurial control in the working directory."
 msgstr ""
 "    Se non sono forniti pattern, questo comando stampa il nome di\n"
 "    tutti i file."
 
 #, fuzzy
 msgid ""
 "    If you want to feed the output of this command into the \"xargs\"\n"
 "    command, use the -0 option to both this command and \"xargs\". This\n"
 "    will avoid the problem of \"xargs\" treating single filenames that\n"
-"    contain whitespace as multiple filenames.\n"
-"    "
+"    contain whitespace as multiple filenames."
 msgstr ""
 "    Se si desidera fornire l'output di questo comando al comando\n"
 "    \"xargs\", usare l'opzione \"-0\" sia per questo comando sia per\n"
 "    \"xargs\". Questo eviterà il problema per cui \"xargs\" tratta\n"
 "    filename singoli che contengono spazi bianchi come filename\n"
 "    multipli.\n"
 "    "
 
 #, fuzzy
 msgid "show revision history of entire repository or files"
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    Print the revision history of the specified files or the entire\n"
 "    project."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a filename to follow history across\n"
 "    renames and copies. --follow without a filename will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision."
+"    used as the starting revision. You can specify a revision set for\n"
+"    log, see :hg:`help revsets` for more information."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    By default this command prints revision number and changeset id,\n"
 "    tags, non-trivial parents, user, date and time, and a summary for\n"
 "    each commit. When the -v/--verbose switch is used, the list of\n"
 "    changed files and full commit message are shown."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    NOTE: log -p/--patch may generate unexpected diff output for merge\n"
 "    changesets, as it will only compare the merge changeset against\n"
 "    its first parent. Also, only files different from BOTH parents\n"
-"    will appear in files:.\n"
-"    "
+"    will appear in files:."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
 "    Print the revision history of the specified files or the entire\n"
 "    project.\n"
 "\n"
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a file name to follow history across\n"
 "    renames and copies. --follow without a file name will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions.\n"
 "\n"
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "\n"
 "    By default this command outputs: changeset id and hash, tags,\n"
 "    non-trivial parents, user, date and time, and a summary for each\n"
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
 "    changesets, as it will compare the merge changeset against its\n"
 "    first parent only. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
 
 msgid "output the current or given revision of the project manifest"
 msgstr ""
 
 msgid ""
 "    Print a list of version controlled files for the given revision.\n"
 "    If no revision is given, the first parent of the working directory\n"
 "    is used, or the null revision if no revision is checked out."
 msgstr ""
 
 msgid ""
 "    With -v, print file permissions, symlink and executable bits.\n"
-"    With --debug, print file revision hashes.\n"
-"    "
+"    With --debug, print file revision hashes."
 msgstr ""
 
 msgid "merge working directory with another revision"
 msgstr ""
 
 msgid ""
 "    The current working directory is updated with all changes made in\n"
 "    the requested revision since the last common predecessor revision."
 msgstr ""
 
 msgid ""
 "    Files that changed between either parent are marked as changed for\n"
 "    the next commit and a commit must be performed before any further\n"
 "    updates to the repository are allowed. The next commit will have\n"
 "    two parents."
 msgstr ""
 
 msgid ""
 "    If no revision is specified, the working directory's parent is a\n"
 "    head revision, and the current branch contains exactly one other\n"
 "    head, the other head is merged with by default. Otherwise, an\n"
-"    explicit revision with which to merge with must be provided.\n"
-"    "
-msgstr ""
-
-#, python-format
-msgid "branch '%s' has %d heads - please merge with an explicit rev"
+"    explicit revision with which to merge with must be provided."
+msgstr ""
+
+msgid ""
+"    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+"    will check out a clean copy of the original merge parent, losing\n"
+"    all changes."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if there are unresolved files.\n"
+"    "
+msgstr ""
+
+#, fuzzy, python-format
+msgid ""
+"branch '%s' has %d heads - please merge with an explicit rev\n"
+"(run 'hg heads .' to see heads)"
 msgstr "la branch '%s' ha %d head - fare il merge con una revisione esplicita"
 
-#, python-format
-msgid "branch '%s' has one head - please merge with an explicit rev"
+#, fuzzy, python-format
+msgid ""
+"branch '%s' has one head - please merge with an explicit rev\n"
+"(run 'hg heads' to see all heads)"
 msgstr "la branch '%s' ha una head - fare il merge con una revisione esplicita"
 
 msgid "there is nothing to merge"
 msgstr "non c'è nulla di cui fare il merge"
 
 #, python-format
 msgid "%s - use \"hg update\" instead"
 msgstr "%s - invece usare \"hg update\""
 
-msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
+msgid ""
+"working dir not at a head rev - use \"hg update\" or merge with an explicit "
+"rev"
 msgstr ""
 "la directory di lavoro non è una revisione head - usare \"hg update\"\n"
 "o fare il merge con una revisione esplicita"
 
 #, fuzzy
-msgid "show changesets not found in destination"
+msgid "show changesets not found in the destination"
 msgstr "mostra changeset non trovati nella destinazione"
 
 #, fuzzy
 msgid ""
 "    Show changesets not found in the specified destination repository\n"
 "    or the default push location. These are the changesets that would\n"
 "    be pushed if a push was requested."
 msgstr ""
 "    Mostra i changeset non trovati nel repository di destinazione\n"
 "    specificato o nella posizione di default di push. Questi sono i\n"
 "    changeset che di cui si effetterebbe il push se questo venisse\n"
 "    richiesto."
 
 #, fuzzy
-msgid ""
-"    See pull for valid destination format details.\n"
-"    "
+msgid "    See pull for details of valid destination formats."
 msgstr ""
 "    Vedere pull per dettagli sui formati validi di destinazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 if there are outgoing changes, 1 otherwise.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "show the parents of the working directory or revision"
 msgstr "mostra i genitori della directory di lavoro o di una revisione"
 
 #, fuzzy
 msgid ""
 "    Print the working directory's parent revisions. If a revision is\n"
 "    given via -r/--rev, the parent of that revision will be printed.\n"
 "    If a file argument is given, the revision in which the file was\n"
 "    last changed (before the working directory revision or the\n"
-"    argument to --rev if given) is printed.\n"
-"    "
+"    argument to --rev if given) is printed."
 msgstr ""
 "    Stampa le revisioni genitori della directory di lavoro. Se una\n"
 "    revisione è data tramite --rev, verrà stampato il genitore di\n"
 "    quella revisione. Se viene fornito un file come argomento,\n"
 "    verrà stampata l'ultima revisione in cui il file è stato\n"
 "    modificato (prima della revisione della directory di lavoro\n"
 "    o dell'argomento di --rev se fornito).\n"
 "    "
 
 #, fuzzy
 msgid "can only specify an explicit filename"
 msgstr "possibile specificare solo due etichette."
 
 #, python-format
 msgid "'%s' not found in manifest!"
 msgstr "'%s' non trovato nel manifesto!"
 
 msgid "show aliases for remote repositories"
 msgstr ""
 
 msgid ""
 "    Show definition of symbolic path name NAME. If no name is given,\n"
 "    show definition of all available names."
 msgstr ""
 
 msgid ""
-"    Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
-"    and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
-msgstr ""
-
-msgid ""
-"    See 'hg help urls' for more information.\n"
-"    "
+"    Path names are defined in the [paths] section of\n"
+"    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+"    repository, ``.hg/hgrc`` is used, too."
+msgstr ""
+
+msgid ""
+"    The path names ``default`` and ``default-push`` have a special\n"
+"    meaning.  When performing a push or pull operation, they are used\n"
+"    as fallbacks if no location is specified on the command-line.\n"
+"    When ``default-push`` is set, it will be used for push and\n"
+"    ``default`` will be used for pull; otherwise ``default`` is used\n"
+"    as the fallback for both.  When cloning a repository, the clone\n"
+"    source is written as ``default`` in ``.hg/hgrc``.  Note that\n"
+"    ``default`` and ``default-push`` apply to all inbound (e.g.\n"
+"    :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n"
+"    :hg:`bundle`) operations."
+msgstr ""
+
+msgid "    See :hg:`help urls` for more information."
 msgstr ""
 
 msgid "not found!\n"
 msgstr "non trovato!\n"
 
 msgid "not updating, since new heads added\n"
 msgstr ""
 
 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
 msgstr "(esegui 'hg heads' per vedere le head, 'hg merge' per fare un merge)\n"
 
 msgid "(run 'hg update' to get a working copy)\n"
 msgstr "(esegui 'hg update' per ottenere una copia funzionante)\n"
 
 #, fuzzy
 msgid "pull changes from the specified source"
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
 #, fuzzy
 msgid "    Pull changes from a remote repository to a local one."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    This finds all changes from the repository at the specified path\n"
 "    or URL and adds them to a local repository (the current one unless\n"
 "    -R is specified). By default, this does not update the copy of the\n"
 "    project in the working directory."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
 #, fuzzy
 msgid ""
-"    Use hg incoming if you want to see what would have been added by a\n"
-"    pull at the time you issued this command. If you then decide to\n"
-"    added those changes to the repository, you should use pull -r X\n"
-"    where X is the last changeset listed by hg incoming."
+"    Use :hg:`incoming` if you want to see what would have been added\n"
+"    by a pull at the time you issued this command. If you then decide\n"
+"    to add those changes to the repository, you should use :hg:`pull\n"
+"    -r X` where ``X`` is the last changeset listed by :hg:`incoming`."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
 #, fuzzy
 msgid ""
 "    If SOURCE is omitted, the 'default' path will be used.\n"
-"    See 'hg help urls' for more information.\n"
-"    "
+"    See :hg:`help urls` for more information."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if an update had unresolved files.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "push changes to the specified destination"
 msgstr "effettua il push di modifiche verso la destinazione specificata"
 
 #, fuzzy
-msgid "    Push changes from the local repository to the given destination."
+msgid ""
+"    Push changesets from the local repository to the specified\n"
+"    destination."
 msgstr ""
 "    Effettua il push di modifiche dal repository locale verso la\n"
 "    destinazione data."
 
-#, fuzzy
-msgid ""
-"    This is the symmetrical operation for pull. It moves changes from\n"
-"    the current repository to a different one. If the destination is\n"
-"    local this is identical to a pull in that directory from the\n"
-"    current one."
-msgstr ""
-"    Questa è l'operazione simmetrica di pull. Aiuta a spostare modifiche\n"
-"    dal repository corrente in un altro. Se la destinazione è locale questo\n"
-"    è identico ad un pull in quella directory verso questa."
-
-#, fuzzy
-msgid ""
-"    By default, push will refuse to run if it detects the result would\n"
-"    increase the number of remote heads. This generally indicates the\n"
-"    user forgot to pull and merge before pushing."
-msgstr ""
-"    Di default, il push verrà rifiutato se viene rivelato che aumenterà il\n"
-"    numerdo di head remote. Questo generalmente indica che il client ha\n"
-"    dimenticato di fare pull e merge prima del push."
-
-#, fuzzy
-msgid ""
-"    If -r/--rev is used, the named revision and all its ancestors will\n"
-"    be pushed to the remote repository."
-msgstr ""
-"    Se si usa -r, si farà il push del changeset dato e tutti i suoi antenati\n"
+msgid ""
+"    This operation is symmetrical to pull: it is identical to a pull\n"
+"    in the destination repository from the current one."
+msgstr ""
+
+msgid ""
+"    By default, push will not allow creation of new heads at the\n"
+"    destination, since multiple heads would make it unclear which head\n"
+"    to use. In this situation, it is recommended to pull and merge\n"
+"    before pushing."
+msgstr ""
+
+msgid ""
+"    Use --new-branch if you want to allow push to create a new named\n"
+"    branch that is not present at the destination. This allows you to\n"
+"    only create a new branch without forcing other changes."
+msgstr ""
+
+msgid ""
+"    Use -f/--force to override the default behavior and push all\n"
+"    changesets on all branches."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    If -r/--rev is used, the specified revision and all its ancestors\n"
+"    will be pushed to the remote repository."
+msgstr ""
+"    Se si usa -r, si farà il push del changeset dato e tutti i suoi "
+"antenati\n"
 "    verso il repository remoto."
 
 #, fuzzy
 msgid ""
-"    Please see 'hg help urls' for important details about ``ssh://``\n"
-"    URLs. If DESTINATION is omitted, a default path will be used.\n"
-"    "
+"    Please see :hg:`help urls` for important details about ``ssh://``\n"
+"    URLs. If DESTINATION is omitted, a default path will be used."
 msgstr ""
 "    Vedere il testo di aiuto per gli url per importanti dettagli sugli\n"
 "    URL ``ssh://``.\n"
 "    Se viene omessa DESTINATION, verrà usato il percorso di default.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 if push was successful, 1 if nothing to push.\n"
+"    "
+msgstr ""
+
 #, python-format
 msgid "pushing to %s\n"
 msgstr "sto effettuando il push verso %s\n"
 
 #, fuzzy
 msgid "roll back an interrupted transaction"
 msgstr "effettua il rollback di una transazione interrotta"
 
 #, fuzzy
 msgid "    Recover from an interrupted commit or pull."
 msgstr "    Effettua il ripristino da un commit o pull interrotto."
 
 #, fuzzy
 msgid ""
 "    This command tries to fix the repository status after an\n"
 "    interrupted operation. It should only be necessary when Mercurial\n"
-"    suggests it.\n"
-"    "
+"    suggests it."
 msgstr ""
 "    Questo comando prova a correggere lo stato del repository dopo\n"
 "    un'operazione interrotta. Dovrebbe essere necessario solamente\n"
 "    quando Mercurial lo suggerisce.\n"
 "    "
 
+msgid ""
+"    Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
+"    "
+msgstr ""
+
 msgid "remove the specified files on the next commit"
 msgstr ""
 
 msgid "    Schedule the indicated files for removal from the repository."
 msgstr ""
 
 msgid ""
 "    This only removes files from the current branch, not from the\n"
 "    entire project history. -A/--after can be used to remove only\n"
 "    files that have already been deleted, -f/--force can be used to\n"
 "    force deletion, and -Af can be used to remove files from the next\n"
 "    revision without deleting them from the working directory."
 msgstr ""
 
 msgid ""
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
 "    states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
-"    reported by hg status). The actions are Warn, Remove (from branch)\n"
-"    and Delete (from disk)::"
+"    reported by :hg:`status`). The actions are Warn, Remove (from\n"
+"    branch) and Delete (from disk)::"
 msgstr ""
 
 msgid ""
 "             A  C  M  !\n"
 "      none   W  RD W  R\n"
 "      -f     R  RD RD R\n"
 "      -A     W  W  W  R\n"
 "      -Af    R  R  R  R"
 msgstr ""
 
 msgid ""
 "    This command schedules the files to be removed at the next commit.\n"
-"    To undo a remove before that, see hg revert.\n"
+"    To undo a remove before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if any warnings encountered.\n"
 "    "
 msgstr ""
 
 #, fuzzy, python-format
 msgid "not removing %s: file is untracked\n"
 msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
 
 #, python-format
 msgid "not removing %s: file %s (use -f to force removal)\n"
 msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
 
 msgid "still exists"
 msgstr "esiste ancora"
 
 msgid "is modified"
 msgstr "è modificato"
 
 msgid "has been marked for add"
 msgstr "è stato marcato per l'aggiunta"
 
 msgid "rename files; equivalent of copy + remove"
 msgstr ""
 
 msgid ""
 "    Mark dest as copies of sources; mark sources for deletion. If dest\n"
 "    is a directory, copies are put in that directory. If dest is a\n"
 "    file, there can only be one source."
 msgstr ""
 
 msgid ""
 "    This command takes effect at the next commit. To undo a rename\n"
-"    before that, see hg revert.\n"
-"    "
-msgstr ""
-
-msgid "retry file merges from a merge or update"
-msgstr ""
-
-msgid ""
-"    This command will cleanly retry unresolved file merges using file\n"
-"    revisions preserved from the last update or merge. To attempt to\n"
-"    resolve all unresolved files, use the -a/--all switch."
-msgstr ""
-
-msgid ""
-"    If a conflict is resolved manually, please note that the changes\n"
-"    will be overwritten if the merge is retried with resolve. The\n"
-"    -m/--mark switch should be used to mark the file as resolved."
-msgstr ""
-
-msgid ""
-"    This command also allows listing resolved files and manually\n"
-"    indicating whether or not files are resolved. All files must be\n"
-"    marked as resolved before a commit is permitted."
-msgstr ""
-
-msgid "    The codes used to show the status of files are::"
-msgstr ""
-
-msgid ""
-"      U = unresolved\n"
-"      R = resolved\n"
+"    before that, see :hg:`revert`."
+msgstr ""
+
+msgid "various operations to help finish a merge"
+msgstr ""
+
+msgid ""
+"    This command includes several actions that are often useful while\n"
+"    performing a merge, after running ``merge`` but before running\n"
+"    ``commit``.  (It is only meaningful if your working directory has\n"
+"    two parents.)  It is most relevant for merges with unresolved\n"
+"    conflicts, which are typically a result of non-interactive merging with\n"
+"    ``internal:merge`` or a command-line merge tool like ``diff3``."
+msgstr ""
+
+#, fuzzy
+msgid "    The available actions are:"
+msgstr "%s non è più disponibile in %s"
+
+msgid ""
+"      1) list files that were merged with conflicts (U, for unresolved)\n"
+"         and without conflicts (R, for resolved): ``hg resolve -l``\n"
+"         (this is like ``status`` for merges)\n"
+"      2) record that you have resolved conflicts in certain files:\n"
+"         ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
+"      3) forget that you have resolved conflicts in certain files:\n"
+"         ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
+"      4) discard your current attempt(s) at resolving conflicts and\n"
+"         restart the merge from scratch: ``hg resolve file...``\n"
+"         (or ``-a`` for all unresolved files)"
+msgstr ""
+
+msgid ""
+"    Note that Mercurial will not let you commit files with unresolved merge\n"
+"    conflicts.  You must use ``hg resolve -m ...`` before you can commit\n"
+"    after a conflicting merge."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if any files fail a resolve attempt.\n"
 "    "
 msgstr ""
 
 msgid "too many options specified"
 msgstr "troppe opzioni specificate"
 
 msgid "can't specify --all and patterns"
 msgstr "non è possibile specificare pattern e --all"
 
 msgid "no files or directories specified; use --all to remerge all files"
-msgstr "nessun file o directory specificata; usare --all per rieffettuare il merge di tutti i file"
+msgstr ""
+"nessun file o directory specificata; usare --all per rieffettuare il merge "
+"di tutti i file"
 
 #, fuzzy
 msgid "restore individual files or directories to an earlier state"
 msgstr "ripristina file singoli o directory ad uno stato precedente"
 
-#, fuzzy
-msgid ""
-"    (Use update -r to check out earlier revisions, revert does not\n"
-"    change the working directory parents.)"
-msgstr ""
-"    (usare update -r per effettuare il checkout di revisioni\n"
-"    precedenti, revert non cambia i genitori della directory di\n"
-"    lavoro)"
+msgid ""
+"    NOTE: This command is most likely not what you are looking for. revert\n"
+"    will partially overwrite content in the working directory without "
+"changing\n"
+"    the working directory parents. Use :hg:`update -r rev` to check out "
+"earlier\n"
+"    revisions, or :hg:`update --clean .` to undo a merge which has added\n"
+"    another parent."
+msgstr ""
 
 #, fuzzy
 msgid ""
 "    With no revision specified, revert the named files or directories\n"
 "    to the contents they had in the parent of the working directory.\n"
 "    This restores the contents of the affected files to an unmodified\n"
 "    state and unschedules adds, removes, copies, and renames. If the\n"
-"    working directory has two parents, you must explicitly specify the\n"
-"    revision to revert to."
+"    working directory has two parents, you must explicitly specify a\n"
+"    revision."
 msgstr ""
 "    Se nessuna revisione viene specificata, i file o directory\n"
 "    specificati vengono riportati al contenuto che avevano nel\n"
 "    genitore della directory di lavoro. Questo ripristina il contenuto\n"
 "    dei file interessati ad uno stato non modificato e annulla\n"
 "    aggiunte, rimozioni, copie e rinomine. Se la directory di lavoro\n"
 "    ha due genitori, è necessario specificare esplicitamente la\n"
 "    revisione a cui tornare."
 
 #, fuzzy
 msgid ""
 "    Using the -r/--rev option, revert the given files or directories\n"
 "    to their contents as of a specific revision. This can be helpful\n"
-"    to \"roll back\" some or all of an earlier change. See 'hg help\n"
-"    dates' for a list of formats valid for -d/--date."
+"    to \"roll back\" some or all of an earlier change. See :hg:`help\n"
+"    dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Usando l'opzione -r, riporta i dati file o directory al loro\n"
 "    contenuto ad una specifica revisione. Questo può essere utile per\n"
 "    effettuare il \"roll back\" di alcune o tutte le modifiche\n"
 "    precedenti. Vedere 'hg help dates' per un elenco dei formati\n"
 "    validi per -d/--date."
 
 #, fuzzy
 msgid ""
 "    Revert modifies the working directory. It does not commit any\n"
 "    changes, or change the parent of the working directory. If you\n"
 "    revert to a revision other than the parent of the working\n"
 "    directory, the reverted files will thus appear modified\n"
 "    afterwards."
 msgstr ""
 "    Revert modifica la directory di lavoro. Non effettua il commit di\n"
 "    alcuna modifica, nè cambia i genitori della directory di lavoro Se\n"
 "    si effettua il revert ad una revisione differente di quella del\n"
 "    genitore della directory di lavoro, i file interessati in seguito\n"
 "    appariranno quindi modificati."
 
 #, fuzzy
 msgid ""
 "    If a file has been deleted, it is restored. If the executable mode\n"
 "    of a file was changed, it is reset."
 msgstr ""
 "    Se un file è stato cancellato viene ripristinato. Se è stato\n"
 "    modificato il flag di esecuzione di file, questo viene resettato."
 
 #, fuzzy
 msgid ""
 "    If names are given, all files matching the names are reverted.\n"
 "    If no arguments are given, no files are reverted."
 msgstr ""
 "    Se vengono forniti nomi, tutti i file corrispondenti ai nomi\n"
 "    vengono ripristinati. Se non vengono forniti argomenti nessun file\n"
 "    viene ripristinato."
 
 #, fuzzy
 msgid ""
 "    Modified files are saved with a .orig suffix before reverting.\n"
-"    To disable these backups, use --no-backup.\n"
-"    "
+"    To disable these backups, use --no-backup."
 msgstr ""
 "    I file modificati vengono salvati con un suffisso .orig prima di\n"
 "    essere ripristinati. Per disabilitare questi backup, usare\n"
 "    --no-backup.\n"
 "    "
 
 msgid "you can't specify a revision and a date"
 msgstr "non è possibile specificare sia una revisione sia una data"
 
 msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "nessun file o directory specificati; usare --all per ripristinare l'intero repository"
+msgstr ""
+"nessun file o directory specificati; usare --all per ripristinare l'intero "
+"repository"
 
 #, python-format
 msgid "forgetting %s\n"
 msgstr "sto dimenticandomi di %s\n"
 
 #, python-format
 msgid "reverting %s\n"
 msgstr "sto ripristinando %s\n"
 
 #, python-format
 msgid "undeleting %s\n"
 msgstr "sto annullando la rimozione di %s\n"
 
 #, python-format
 msgid "saving current version of %s as %s\n"
 msgstr "sto salvando la versione corrente di %s come %s\n"
 
 #, python-format
 msgid "file not managed: %s\n"
 msgstr "file non gestito: %s\n"
 
 #, python-format
 msgid "no changes needed to %s\n"
 msgstr "nessuna modifica richiesta per %s\n"
 
 #, fuzzy
-msgid "roll back the last transaction"
+msgid "roll back the last transaction (dangerous)"
 msgstr "effettua il rollback dell'ultima transazione"
 
 #, fuzzy
 msgid ""
 "    This command should be used with care. There is only one level of\n"
 "    rollback, and there is no way to undo a rollback. It will also\n"
 "    restore the dirstate at the time of the last transaction, losing\n"
 "    any dirstate changes since that time. This command does not alter\n"
 "    the working directory."
 msgstr ""
 "    Questo comando dovrebbe essere usato con cautela. Esiste un solo\n"
 "    livello di rollback e non c'è modo di annullare un rollback.\n"
 "    Ripristinerà anche il dirstate al tempo dell'ultima transazione,\n"
 "    perdendo qualunque modifica ad esso da quel momento in poi."
 
 #, fuzzy
 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::"
+"    and their effects can be rolled back:"
 msgstr ""
 "    Le transazioni sono usate per incapsulare gli effetti di tutti i\n"
 "    comandi che creano nuovi changeset o propagano changeset esistenti\n"
 "    in un altro repository. Ad esempio, i seguenti comandi sono\n"
 "    transazionali ed è possibile effettuare il rollback dei loro\n"
 "    effetti:"
 
 #, fuzzy
 msgid ""
-"      commit\n"
-"      import\n"
-"      pull\n"
-"      push (with this repository as destination)\n"
-"      unbundle"
+"    - commit\n"
+"    - import\n"
+"    - pull\n"
+"    - push (with this repository as the destination)\n"
+"    - unbundle"
 msgstr ""
 "      commit\n"
 "      import\n"
 "      pull\n"
 "      push (con questo repository come destinazione)\n"
 "      unbundle"
 
 #, fuzzy
 msgid ""
 "    This command is not intended for use on public repositories. Once\n"
 "    changes are visible for pull by other users, rolling a transaction\n"
 "    back locally is ineffective (someone else may already have pulled\n"
 "    the changes). Furthermore, a race is possible with readers of the\n"
 "    repository; for example an in-progress pull from the repository\n"
-"    may fail if a rollback is performed.\n"
-"    "
+"    may fail if a rollback is performed."
 msgstr ""
 "    L'uso di questo comando non è inteso per repository pubblici. Una\n"
 "    volta che le modifiche sono visibili per il pull da parte di altri\n"
 "    utenti, effettuare il rollback locale di una transazione non ha\n"
 "    effetti (qualcun'altro potrebbe aver già effettuato il pull delle\n"
 "    modifiche). Inoltre, è possibile che si verifichi un race con i\n"
 "    lettori del repository; ad esempio un pull in progresso dal\n"
 "    repository potrebbe fallire se viene effettuato un rollback.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if no rollback data is available.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "print the root (top) of the current working directory"
 msgstr "stampa la radice (top) della directory di lavoro corrente"
 
 #, fuzzy
-msgid ""
-"    Print the root directory of the current repository.\n"
-"    "
+msgid "    Print the root directory of the current repository."
 msgstr ""
 "    Stampa la directory radice del repository corrente.\n"
 "    "
 
-#, fuzzy
-msgid "export the repository via HTTP"
-msgstr "esporta il repository via HTTP"
-
-#, fuzzy
-msgid "    Start a local HTTP repository browser and pull server."
-msgstr "    Avvia un server HTTP locale per il pull e la navigazione."
+msgid "start stand-alone webserver"
+msgstr ""
+
+msgid ""
+"    Start a local HTTP repository browser and pull server. You can use\n"
+"    this for ad-hoc sharing and browing of repositories. It is\n"
+"    recommended to use a real web server to serve a repository for\n"
+"    longer periods of time."
+msgstr ""
+
+msgid ""
+"    Please note that the server does not implement access control.\n"
+"    This means that, by default, anybody can read from the server and\n"
+"    nobody can write to it by default. Set the ``web.allow_push``\n"
+"    option to ``*`` to allow everybody to push to the server. You\n"
+"    should use a real web server if you need to authenticate users."
+msgstr ""
 
 #, fuzzy
 msgid ""
 "    By default, the server logs accesses to stdout and errors to\n"
 "    stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
-"    files.\n"
-"    "
+"    files."
 msgstr ""
 "    Di default i log del server vengono inviati allo stdout e gli\n"
 "    errori allo stderr. Usare le opzioni \"-A\" e \"-E\" per effettuare il\n"
 "    log su file.\n"
 "    "
 
+msgid ""
+"    To have the server choose a free port number to listen on, specify\n"
+"    a port number of 0; in this case, the server will print the port\n"
+"    number it uses."
+msgstr ""
+
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "in ascolto su http://%s%s/%s (limitato a %s:%d)\n"
 
 msgid "show changed files in the working directory"
 msgstr ""
 
 msgid ""
 "    Show status of files in the repository. If names are given, only\n"
 "    files that match are shown. Files that are clean or ignored or\n"
 "    the source of a copy/move operation, are not listed unless\n"
 "    -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
 "    Unless options described with \"show only ...\" are given, the\n"
 "    options -mardu are used."
 msgstr ""
 
 msgid ""
 "    Option -q/--quiet hides untracked (unknown and ignored) files\n"
 "    unless explicitly requested with -u/--unknown or -i/--ignored."
 msgstr ""
 
 msgid ""
 "    NOTE: status may appear to disagree with diff if permissions have\n"
 "    changed or a merge has occurred. The standard diff format does not\n"
 "    report permission changes and diff only reports changes relative\n"
 "    to one merge parent."
 msgstr ""
 
 msgid ""
 "    If one revision is given, it is used as the base revision.\n"
 "    If two revisions are given, the differences between them are\n"
-"    shown."
+"    shown. The --change option can also be used as a shortcut to list\n"
+"    the changed files of a revision from its first parent."
+msgstr ""
+
+msgid "    The codes used to show the status of files are::"
 msgstr ""
 
 msgid ""
 "      M = modified\n"
 "      A = added\n"
 "      R = removed\n"
 "      C = clean\n"
 "      ! = missing (deleted by non-hg command, but still tracked)\n"
 "      ? = not tracked\n"
 "      I = ignored\n"
-"        = origin of the previous file listed as A (added)\n"
-"    "
+"        = origin of the previous file listed as A (added)"
 msgstr ""
 
 msgid "summarize working directory state"
 msgstr ""
 
 msgid ""
 "    This generates a brief summary of the working directory state,\n"
 "    including parents, branch, commit status, and available updates."
 msgstr ""
 
 msgid ""
 "    With the --remote option, this will check the default paths for\n"
-"    incoming and outgoing changes. This can be time-consuming.\n"
-"    "
-msgstr ""
+"    incoming and outgoing changes. This can be time-consuming."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "parent: %d:%s "
+msgstr "genitore:    %d:%s\n"
 
 #, fuzzy
 msgid " (empty repository)"
 msgstr "repository·%s"
 
 #, fuzzy
 msgid " (no revision checked out)"
 msgstr "nessuna revisione specificata"
 
 #, fuzzy, python-format
-msgid "parent: %d:%s %s\n"
-msgstr "genitore:    %d:%s\n"
-
-#, fuzzy, python-format
 msgid "branch: %s\n"
 msgstr "branch:      %s\n"
 
 #, fuzzy, python-format
-msgid "%d added"
-msgstr "%s non aggiunto!\n"
-
-#, fuzzy, python-format
 msgid "%d modified"
 msgstr "è modificato"
 
 #, fuzzy, python-format
+msgid "%d added"
+msgstr "%s non aggiunto!\n"
+
+#, fuzzy, python-format
 msgid "%d removed"
 msgstr "rimossi"
 
+#, fuzzy, python-format
+msgid "%d renamed"
+msgstr "rimossi"
+
+#, fuzzy, python-format
+msgid "%d copied"
+msgstr "è modificato"
+
 #, python-format
 msgid "%d deleted"
 msgstr ""
 
 #, fuzzy, python-format
+msgid "%d unknown"
+msgstr "base sconosciuta"
+
+#, fuzzy, python-format
 msgid "%d ignored"
 msgstr "ignorato"
 
 #, fuzzy, python-format
-msgid "%d unknown"
-msgstr "base sconosciuta"
-
-#, fuzzy, python-format
 msgid "%d unresolved"
 msgstr "non risolti"
 
+#, fuzzy, python-format
+msgid "%d subrepos"
+msgstr "HG: subrepository %s"
+
 #, fuzzy
 msgid " (merge)"
 msgstr "merge"
 
 #, fuzzy
 msgid " (new branch)"
 msgstr "mostra le branch"
 
+#, fuzzy
+msgid " (head closed)"
+msgstr " (%+d head)"
+
 msgid " (clean)"
 msgstr ""
 
 msgid " (new branch head)"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "commit: %s\n"
 msgstr "convert: %s\n"
 
 msgid "update: (current)\n"
 msgstr ""
 
 #, fuzzy, python-format
 msgid "update: %d new changesets (update)\n"
 msgstr "%s: %d nuovi changeset"
 
 #, 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 ""
 
 #, fuzzy, python-format
 msgid "remote: %s\n"
 msgstr "remoto: "
 
 #, fuzzy
 msgid "remote: (synced)\n"
 msgstr "remoto: "
 
 #, fuzzy
 msgid "add one or more tags for the current or given revision"
 msgstr "aggiunge una o più tag per la revisione corrente o data"
 
 #, fuzzy
 msgid "    Name a particular revision using <name>."
 msgstr "    Nomina una revisione particolare usando <nome>."
 
 #, fuzzy
 msgid ""
 "    Tags are used to name particular revisions of the repository and are\n"
 "    very useful to compare different revisions, to go back to significant\n"
 "    earlier versions or to mark branch points as releases, etc."
 msgstr ""
 "    Le tag sono usate per dare un nome a revisioni particolari del\n"
 "    repository e sono molto utili per confrontare revisioni\n"
 "    differenti, per tornare indietro a versioni precedenti\n"
 "    significative o per marcare punti di branch come release, ecc."
 
 #, fuzzy
 msgid ""
 "    If no revision is given, the parent of the working directory is\n"
 "    used, or tip if no revision is checked out."
 msgstr ""
 "    Se nessuna revisione viene fornita, viene usato il genitore della\n"
 "    directory di lavoro, o tip se non si è effettuato il check out di\n"
 "    nessuna revisione."
 
 #, fuzzy
 msgid ""
 "    To facilitate version control, distribution, and merging of tags,\n"
 "    they are stored as a file named \".hgtags\" which is managed\n"
 "    similarly to other project files and can be hand-edited if\n"
 "    necessary. The file '.hg/localtags' is used for local tags (not\n"
 "    shared among repositories)."
 msgstr ""
 "    Per facilitare il controllo di versione, la distribuzione e il\n"
 "    merge di tag, sono memorizzate come file chiamato \".hgtags\" che è\n"
 "    gestito analogamente ad altri file del progetto e può essere\n"
 "    modificato manualmente se necessario. Il file '.hg/localtags' è\n"
 "    usato per le tag locali (non condivise tra repository)."
 
+msgid ""
+"    Since tag names have priority over branch names during revision\n"
+"    lookup, using an existing branch name as a tag name is discouraged."
+msgstr ""
+
 msgid "tag names must be unique"
 msgstr "i nomi delle tag devono essere univoci"
 
-#, python-format
-msgid "the name '%s' is reserved"
-msgstr "il nome '%s' è riservato"
+#, fuzzy
+msgid "tag names cannot consist entirely of whitespace"
+msgstr "ignora le modifiche nel conteggio degli spazi bianchi"
 
 msgid "--rev and --remove are incompatible"
 msgstr "--rev e --remove sono incompatibili"
 
 #, python-format
 msgid "tag '%s' does not exist"
 msgstr "la tag '%s' non esiste"
 
 #, fuzzy, python-format
 msgid "tag '%s' is not a global tag"
 msgstr "la tag '%s' non è una tag %s"
 
 #, fuzzy, python-format
 msgid "tag '%s' is not a local tag"
 msgstr "la tag '%s' non è una tag %s"
 
 #, python-format
 msgid "tag '%s' already exists (use -f to force)"
 msgstr "la tag '%s' esiste già (usare -f per forzare)"
 
 #, fuzzy
 msgid "list repository tags"
 msgstr "elenca le tag del repository"
 
 #, fuzzy
 msgid ""
 "    This lists both regular and local tags. When the -v/--verbose\n"
-"    switch is used, a third column \"local\" is printed for local tags.\n"
-"    "
-msgstr ""
-"    Questo elenca sia le tag regolari sia le tag locali. Quando viene usata l'opzione -v/--verbose\n"
+"    switch is used, a third column \"local\" is printed for local tags."
+msgstr ""
+"    Questo elenca sia le tag regolari sia le tag locali. Quando viene usata "
+"l'opzione -v/--verbose\n"
 "    una terza colonna \"local\" viene stampata per le tag locali.\n"
 "    "
 
 #, fuzzy
 msgid "show the tip revision"
 msgstr "mostra la revisione tip"
 
 #, fuzzy
 msgid ""
 "    The tip revision (usually just called the tip) is the changeset\n"
 "    most recently added to the repository (and therefore the most\n"
 "    recently changed head)."
 msgstr ""
 "    La revisione tip (di solito chiamata solo tip) è il più recente\n"
 "    changeset aggiunto al repository, l'head modificata più\n"
 "    recentemente."
 
 #, fuzzy
 msgid ""
 "    If you have just made a commit, that commit will be the tip. If\n"
 "    you have just pulled changes from another repository, the tip of\n"
 "    that repository becomes the current tip. The \"tip\" tag is special\n"
-"    and cannot be renamed or assigned to a different changeset.\n"
-"    "
+"    and cannot be renamed or assigned to a different changeset."
 msgstr ""
 "    Se si ha fatto solo un commit, quel commit sarà il tip. Se si ha\n"
 "    appena fatto il pull di modifiche da un altro repository, il tip\n"
 "    di quel repository diventa il tip corrente. La tag \"tip\" tag è\n"
 "    speciale e non può essere rinominata o assegnata ad un changeset\n"
 "    differente.\n"
 "    "
 
 msgid "apply one or more changegroup files"
 msgstr "applica uno o più file changegroup"
 
+#, fuzzy
 msgid ""
 "    Apply one or more compressed changegroup files generated by the\n"
-"    bundle command.\n"
-"    "
+"    bundle command."
 msgstr ""
 "    Applica uno o più file changegroup compressi generati dal\n"
 "    comando bundle.\n"
 "    "
 
-#, fuzzy
-msgid "update working directory"
-msgstr "aggiorna la directory di lavoro"
-
-#, fuzzy
+msgid ""
+"    Returns 0 on success, 1 if an update has unresolved files.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "update working directory (or switch revisions)"
+msgstr "mostra i genitori della directory di lavoro o di una revisione"
+
 msgid ""
 "    Update the repository's working directory to the specified\n"
-"    revision, or the tip of the current branch if none is specified.\n"
-"    Use null as the revision to remove the working copy (like 'hg\n"
-"    clone -U')."
-msgstr ""
-"    Aggiorna la directory di lavoro del repository ad una revisione\n"
-"    specifica, o al tip della branch corrente se nessuna è stata\n"
-"    specificata. Usare null come revisione per rimuovere la copia di\n"
-"    lavoro (come 'hg clone -U')."
-
-#, fuzzy
-msgid ""
-"    When the working directory contains no uncommitted changes, it\n"
-"    will be replaced by the state of the requested revision from the\n"
-"    repository. When the requested revision is on a different branch,\n"
-"    the working directory will additionally be switched to that\n"
-"    branch."
-msgstr ""
-"    Quando la directory di lavoro non contiene modifiche di cui non si\n"
-"    è eseguito il commit, sarà rimpiazzata dallo stato della revisione\n"
-"    richiesta dal repository. Quando la revisione richiesta è su una\n"
-"    branch differente, la directory di lavoro verrà inoltre spostata\n"
-"    su quella branch."
-
-#, fuzzy
-msgid ""
-"    When there are uncommitted changes, use option -C/--clean to\n"
-"    discard them, forcibly replacing the state of the working\n"
-"    directory with the requested revision. Alternately, use -c/--check\n"
-"    to abort."
-msgstr ""
-"    Quandi ci sono modifiche di cui non si è eseguito il commit, usare\n"
-"    l'opzione -C per scartarle, forzando la sostituzione dello stato\n"
-"    della directory di lavoro con la revisione richiesta."
-
-#, fuzzy
-msgid ""
-"    When there are uncommitted changes and option -C/--clean is not\n"
-"    used, and the parent revision and requested revision are on the\n"
-"    same branch, and one of them is an ancestor of the other, then the\n"
-"    new working directory will contain the requested revision merged\n"
-"    with the uncommitted changes. Otherwise, the update will fail with\n"
-"    a suggestion to use 'merge' or 'update -C' instead."
-msgstr ""
-"    Quando ci sono modifiche di cui non si è eseguito il commit,\n"
-"    l'opzione -C non è usata, la revisione del genitore e di quella\n"
-"    richiesta sono sulla stessa branch e una di queste è un antenato\n"
-"    dell'altro, allora la nuova directory di lavoro conterrà la\n"
-"    revisione richiesta unita con le modifiche non salvate. Altrimenti\n"
-"    l'aggiornamento fallirà con un suggerimento di usare invece\n"
-"    'merge' o 'update -C'."
-
-#, fuzzy
-msgid ""
-"    If you want to update just one file to an older revision, use\n"
-"    revert."
+"    changeset."
+msgstr ""
+
+msgid ""
+"    If no changeset is specified, attempt to update to the tip of the\n"
+"    current branch. If this changeset is a descendant of the working\n"
+"    directory's parent, update to it, otherwise abort."
+msgstr ""
+
+msgid ""
+"    The following rules apply when the working directory contains\n"
+"    uncommitted changes:"
+msgstr ""
+
+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 ""
+
+msgid ""
+"    2. With the -c/--check option, the update is aborted and the\n"
+"       uncommitted changes are preserved."
+msgstr ""
+
+msgid ""
+"    3. With the -C/--clean option, uncommitted changes are discarded and\n"
+"       the working directory is updated to the requested changeset."
+msgstr ""
+
+msgid ""
+"    Use null as the changeset to remove the working directory (like\n"
+"    :hg:`clone -U`)."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    If you want to update just one file to an older changeset, use :hg:"
+"`revert`."
 msgstr ""
 "    Se si desidera aggiornare solo un file ad una revisione più\n"
 "    vecchia, usare revert."
 
 #, fuzzy
 msgid "cannot specify both -c/--check and -C/--clean"
 msgstr "non è possibile specificare sia una revisione sia una base"
 
 #, fuzzy
 msgid "uncommitted local changes"
 msgstr "sovrascrivi ogni modifica locale"
 
 msgid "verify the integrity of the repository"
 msgstr "verifica l'integrità del repository"
 
 msgid "    Verify the integrity of the current repository."
 msgstr "    Verifica l'integrità del repository corrente."
 
+#, fuzzy
 msgid ""
 "    This will perform an extensive check of the repository's\n"
 "    integrity, validating the hashes and checksums of each entry in\n"
 "    the changelog, manifest, and tracked files, as well as the\n"
-"    integrity of their crosslinks and indices.\n"
-"    "
+"    integrity of their crosslinks and indices."
 msgstr ""
 "    Questo comando eseguirà un controllo estensivo dell'integrità del\n"
 "    repository validando gli hash e i checksum di ogni voce nel\n"
 "    changelog, manifesto, e file tracciati, così come l'integrità dei\n"
 "    loro link incrociati e indici.\n"
 "    "
 
 msgid "output version and copyright information"
 msgstr "stampa la versione e le informazioni di copyright"
 
 #, python-format
 msgid "Mercurial Distributed SCM (version %s)\n"
 msgstr "Mercurial SCM Distribuito (versione %s)\n"
 
 msgid ""
 "\n"
 "Copyright (C) 2005-2010 Matt Mackall <[e-mail]> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
 "Copyright (C) 2005-2010 Matt Mackall <[e-mail]> e altri\n"
 "Questo è software libero; vedere i sorgenti per le condizioni di copia.\n"
 "Non c'è alcuna garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n"
 "SCOPO PARTICOLARE.\n"
 
 #, fuzzy
 msgid "repository root directory or name of overlay bundle file"
 msgstr "directory radice del repository o nome del percorso simbolico"
 
+msgid "DIR"
+msgstr ""
+
 msgid "change working directory"
 msgstr "cambia la directory di lavoro"
 
 msgid "do not prompt, assume 'yes' for any required answers"
 msgstr "non chiedere conferma, assume 'yes' per ogni risposta richiesta"
 
 msgid "suppress output"
 msgstr "sopprime l'output"
 
 msgid "enable additional output"
 msgstr "abilita output aggiuntivo"
 
-msgid "set/override config option"
+#, fuzzy
+msgid "set/override config option (use 'section.name=value')"
 msgstr "imposta/sovrascrive l'opzione di configurazione"
 
+msgid "CONFIG"
+msgstr ""
+
 msgid "enable debugging output"
 msgstr "abilita output di debug"
 
 msgid "start debugger"
 msgstr "avvia il debugger"
 
 msgid "set the charset encoding"
 msgstr "imposta la codifica dei caratteri"
 
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
 msgid "set the charset encoding mode"
 msgstr "imposta la modalità di codifica dei caratteri"
 
-msgid "print traceback on exception"
+#, fuzzy
+msgid "always print a traceback on exception"
 msgstr "stampa un traceback in seguito ad eccezioni"
 
 msgid "time how long the command takes"
 msgstr "misura quanto tempo impiega il comando"
 
 msgid "print command execution profile"
 msgstr "stampa il profilo di esecuzione dei comandi"
 
 msgid "output version information and exit"
 msgstr "stampa informazioni sulla versione ed esce"
 
 msgid "display help and exit"
 msgstr "mostra l'aiuto ed esce"
 
 msgid "do not perform actions, just print output"
 msgstr "non esegue azioni, stampa solamente l'output"
 
 msgid "specify ssh command to use"
 msgstr "specifica il comando ssh da usare"
 
 msgid "specify hg command to run on the remote side"
 msgstr "specifica il comando hg da eseguire in remoto"
 
+msgid "PATTERN"
+msgstr ""
+
 msgid "include names matching the given patterns"
 msgstr "include nomi che corrispondono ai pattern dati"
 
 msgid "exclude names matching the given patterns"
 msgstr "esclude nomi che corrispondono ai pattern dati"
 
-msgid "use <text> as commit message"
+#, fuzzy
+msgid "use text as commit message"
 msgstr "usa <text> come messaggio di commit"
 
-msgid "read commit message from <file>"
+#, fuzzy
+msgid "read commit message from file"
 msgstr "legge il messaggio di commit da <file>"
 
 msgid "record datecode as commit date"
 msgstr "registra il datecode come data del commit"
 
 #, fuzzy
 msgid "record the specified user as committer"
 msgstr "registra l'utente come committente"
 
+msgid "STYLE"
+msgstr ""
+
 msgid "display using template map file"
 msgstr "mostra usando un file mappa template"
 
 msgid "display with template"
 msgstr "mostra con un template"
 
 msgid "do not show merges"
 msgstr "non mostrare i merge"
 
+msgid "output diffstat-style summary of changes"
+msgstr ""
+
 msgid "treat all files as text"
 msgstr "tratta tutti i file come testo"
 
-msgid "don't include dates in diff headers"
+#, fuzzy
+msgid "omit dates from diff headers"
 msgstr "non includere le date nelle intestazioni dei diff"
 
 msgid "show which function each change is in"
 msgstr "mostra in quale funzione si trova ogni modifica"
 
+msgid "produce a diff that undoes the changes"
+msgstr ""
+
 msgid "ignore white space when comparing lines"
 msgstr "ignora spazi bianchi quando si confrontano righe"
 
 msgid "ignore changes in the amount of white space"
 msgstr "ignora le modifiche nel conteggio degli spazi bianchi"
 
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora le modifiche le cui righe sono tutte vuote"
 
 msgid "number of lines of context to show"
 msgstr "numero di righe di contesto da mostrare"
 
+msgid "SIMILARITY"
+msgstr ""
+
 msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr "stima i file rinominati per similarità (0<=s<=100)"
 
 msgid "[OPTION]... [FILE]..."
 msgstr "[OPZIONI]... [FILE]..."
 
 msgid "annotate the specified revision"
 msgstr "annota la revisione specificata"
 
-msgid "follow file copies and renames"
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr ""
+
+#, fuzzy
+msgid "don't follow copies and renames"
 msgstr "segue le copie e le rinomine dei file"
 
 msgid "list the author (long with -v)"
 msgstr "elenca l'autore (verboso con -v)"
 
+#, fuzzy
+msgid "list the filename"
+msgstr "elenca il changeset"
+
 msgid "list the date (short with -q)"
 msgstr "elenca la data (breve con -q)"
 
 msgid "list the revision number (default)"
 msgstr "elenca il numero di revisione (default)"
 
 msgid "list the changeset"
 msgstr "elenca il changeset"
 
 msgid "show line number at the first appearance"
 msgstr "mostra il numero di riga alla prima apparizione"
 
 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
 
 msgid "do not pass files through decoders"
 msgstr "non passare file attraverso decodificatori"
 
+msgid "PREFIX"
+msgstr ""
+
 msgid "directory prefix for files in archive"
 msgstr "prefisso di directory per i file nell'archivio"
 
 msgid "revision to distribute"
 msgstr "revisione da distribuire"
 
 msgid "type of distribution to create"
 msgstr "tipo di distribuzione da creare"
 
 msgid "[OPTION]... DEST"
 msgstr "[OPZIONI]... DEST"
 
 msgid "merge with old dirstate parent after backout"
 msgstr "effettua il merge con il vecchio dirstate del genitore dopo il backout"
 
 msgid "parent to choose when backing out merge"
 msgstr "il genitore da scegliere quando effettuare il backout del merge"
 
 msgid "revision to backout"
 msgstr "revisione di cui effettuare il backout"
 
 msgid "[OPTION]... [-r] REV"
 msgstr "[OPZIONI]... [-r] REV"
 
 msgid "reset bisect state"
 msgstr "resetta lo stato di bisect"
 
 msgid "mark changeset good"
 msgstr "marca il changeset come buono"
 
 msgid "mark changeset bad"
 msgstr "marca il changeset come cattivo"
 
 msgid "skip testing changeset"
 msgstr "salta il changeset di test"
 
 msgid "use command to check changeset state"
 msgstr "usa il comando per controllare lo stato del changeset"
 
 msgid "do not update to target"
 msgstr "non aggiornare a target"
 
-msgid "[-gbsr] [-c CMD] [REV]"
+#, fuzzy
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
 msgstr "[-gbsr] [-c CMD] [REV]"
 
 msgid "set branch name even if it shadows an existing branch"
 msgstr "imposta il nome della branch anche se nasconde una branch esistente"
 
 msgid "reset branch name to parent branch name"
 msgstr "resetta il nome della branch al nome della branch genitore"
 
 msgid "[-fC] [NAME]"
 msgstr "[-fC] [NOME]"
 
 msgid "show only branches that have unmerged heads"
-msgstr "mostra solo le branch che hanno head di cui non si è effettuato il merge"
+msgstr ""
+"mostra solo le branch che hanno head di cui non si è effettuato il merge"
 
 msgid "show normal and closed branches"
 msgstr ""
 
-msgid "[-a]"
+#, fuzzy
+msgid "[-ac]"
 msgstr "[-a]"
 
-msgid "run even when remote repository is unrelated"
+#, fuzzy
+msgid "run even when the destination is unrelated"
 msgstr "esegui anche quando il repository remoto non è collegato"
 
-msgid "a changeset up to which you would like to bundle"
-msgstr "un changeset fino al quale si desidera effettuare il bundle"
-
-msgid "a base changeset to specify instead of a destination"
+#, fuzzy
+msgid "a changeset intended to be added to the destination"
+msgstr "un changeset base da specificare invece di una destinazione"
+
+#, fuzzy
+msgid "a specific branch you would like to bundle"
+msgstr "una specifica revisione di cui si desidera fare il pull"
+
+#, fuzzy
+msgid "a base changeset assumed to be available at the destination"
 msgstr "un changeset base da specificare invece di una destinazione"
 
 msgid "bundle all changesets in the repository"
 msgstr "effettua il bundle di tutti i changeset nel repository"
 
 msgid "bundle compression type to use"
 msgstr "tipo di compressione da usare per il bundle"
 
-msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+#, fuzzy
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
 msgstr "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
 
 msgid "print output to file with formatted name"
 msgstr "stampa l'output su file con un nome formattato"
 
 msgid "print the given revision"
 msgstr "stampa la data revisione"
 
 msgid "apply any matching decode filter"
 msgstr "applica qualunque filtro di decodifica corrispondente"
 
 msgid "[OPTION]... FILE..."
 msgstr "[OPZIONI]... FILE..."
 
-msgid "the clone will only contain a repository (no working copy)"
+#, fuzzy
+msgid "the clone will include an empty working copy (only a repository)"
 msgstr "il clone conterrà solo un repository (nessuna copia di lavoro)"
 
-msgid "a changeset you would like to have after cloning"
-msgstr "un changeset che si desidera avere dopo il clone"
+#, fuzzy
+msgid "revision, tag or branch to check out"
+msgstr "revisione di cui effettuare il backout"
+
+#, fuzzy
+msgid "include the specified changeset"
+msgstr "collassa le revisioni di cui si effettua il rebase"
+
+#, fuzzy
+msgid "clone only the specified branch"
+msgstr "restituisce solo le modifiche relative alle branch specificate"
 
 msgid "[OPTION]... SOURCE [DEST]"
 msgstr "[OPZIONI]... SORGENTE [DEST]"
 
 msgid "mark new/missing files as added/removed before committing"
-msgstr "marca file nuovi/mancanti come aggiunti/rimossi prima di effettuare il commit"
+msgstr ""
+"marca file nuovi/mancanti come aggiunti/rimossi prima di effettuare il commit"
 
 msgid "mark a branch as closed, hiding it from the branch list"
 msgstr "marca una branch come chiusa, nascondendola dall'elenco delle branch"
 
 msgid "record a copy that has already occurred"
 msgstr "registra una copia che si è già verificata"
 
 msgid "forcibly copy over an existing managed file"
 msgstr "forza una copia su un file gestito esistente"
 
 msgid "[OPTION]... [SOURCE]... DEST"
 msgstr "[OPZIONI]... [SORGENTE]... DEST"
 
 msgid "[INDEX] REV1 REV2"
 msgstr "[INDICE] REV1 REV2"
 
+#, fuzzy
+msgid "add single file mergeable changes"
+msgstr "sto aggiungendo le modifiche ai file\n"
+
+msgid "add single file all revs append to"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+#, fuzzy
+msgid "[OPTION]... TEXT"
+msgstr "[OPZIONI]... DEST"
+
 msgid "[COMMAND]"
 msgstr "[COMANDO]"
 
 msgid "show the command options"
 msgstr "mostra le opzioni dei comandi"
 
 msgid "[-o] CMD"
 msgstr "[-o] CMD"
 
+msgid "use tags as labels"
+msgstr ""
+
+#, fuzzy
+msgid "annotate with branch names"
+msgstr "mantiene le branch originali"
+
+#, fuzzy
+msgid "use dots for runs"
+msgstr "stile non trovato: %s"
+
+msgid "separate elements by spaces"
+msgstr ""
+
+#, fuzzy
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[OPZIONI]... [FILE]..."
+
 msgid "try extended date formats"
 msgstr "prova formati di date estesi"
 
 msgid "[-e] DATE [RANGE]"
 msgstr "[-e] DATA [RANGE]"
 
 msgid "FILE REV"
 msgstr "FILE REV"
 
 msgid "[PATH]"
 msgstr "[PERCORSO]"
 
-msgid "FILE"
-msgstr "FILE"
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr ""
 
 msgid "revision to rebuild to"
 msgstr "revisione alla quale ricostruire"
 
 msgid "[-r REV] [REV]"
 msgstr "[-r REV] [REV]"
 
 msgid "revision to debug"
 msgstr "revisione di cui fare il debug"
 
 msgid "[-r REV] FILE"
 msgstr "[-r REV] FILE"
 
 msgid "REV1 [REV2]"
 msgstr "REV1 [REV2]"
 
 msgid "do not display the saved mtime"
 msgstr "non mostrare l'mtime salvato"
 
 msgid "[OPTION]..."
 msgstr "[OPZIONI]..."
 
 #, fuzzy
 msgid "revision to check"
 msgstr "revisione di cui effettuare il backout"
 
-msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
+#, fuzzy
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..."
 
 msgid "diff against the second parent"
 msgstr "effettua il diff con il secondo genitore"
 
+#, fuzzy
+msgid "revisions to export"
+msgstr "revisione di cui fare il merge"
+
 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
 msgstr "[OPZIONI]... [-o OUTFILESPEC] REV..."
 
 msgid "end fields with NUL"
 msgstr "termina i campi con NUL"
 
 msgid "print all revisions that match"
 msgstr "stampa tutte le revisioni che corrispondono"
 
 msgid "follow changeset history, or file history across copies and renames"
-msgstr "segue la storia del changeset, o la storia del file attraverso copie e rinomine"
+msgstr ""
+"segue la storia del changeset, o la storia del file attraverso copie e "
+"rinomine"
 
 msgid "ignore case when matching"
 msgstr "ignora il case quando si cercano corrispondenze"
 
 #, fuzzy
 msgid "print only filenames and revisions that match"
 msgstr "stampa solo i nomi dei file e le revisioni che corrispondono"
 
 msgid "print matching line numbers"
 msgstr "stampa i numeri di riga corrispondenti"
 
-msgid "search in given revision range"
+#, fuzzy
+msgid "only search files changed within revision range"
 msgstr "cerca nell'intervallo di revisioni fornito"
 
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr "[OPZIONI]... PATTERN [FILE]..."
 
 #, fuzzy
 msgid "show only heads which are descendants of REV"
 msgstr "mostra solo le head che sono discendenti della revisione"
 
-#, fuzzy
-msgid "show only the active branch heads from open branches"
-msgstr "mostra solo le head attive dalle branch aperte"
+msgid "show topological heads only"
+msgstr ""
+
+msgid "show active branchheads only [DEPRECATED]"
+msgstr ""
 
 msgid "show normal and closed branch heads"
 msgstr ""
 
 #, fuzzy
-msgid "[-r STARTREV] [REV]..."
-msgstr "[-r REV] [REV]..."
+msgid "[-ac] [-r REV] [REV]..."
+msgstr "[-r REV] [REV]"
 
 msgid "[TOPIC]"
 msgstr "[ARGOMENTO]"
 
 #, fuzzy
 msgid "identify the specified revision"
 msgstr "identifica la revisione specificata"
 
 msgid "show local revision number"
 msgstr "mostra il numero locale della revisione"
 
 msgid "show global revision id"
 msgstr "mostra id globale della revisione"
 
 msgid "show branch"
 msgstr "mostra le branch"
 
 msgid "show tags"
 msgstr "mostra le tag"
 
 msgid "[-nibt] [-r REV] [SOURCE]"
 msgstr "[-nibt] [-r REV] [SORGENTE]"
 
 #, fuzzy
-msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
 msgstr ""
 "opzione di rimozione della directory per patch. Questa ha lo stesso\n"
 "significato dell'opzione corrispondente di patch"
 
+#, fuzzy
+msgid "PATH"
+msgstr "[PERCORSO]"
+
 msgid "base path"
 msgstr "percorso base"
 
 msgid "skip check for outstanding uncommitted changes"
-msgstr "salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
+msgstr ""
+"salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
 
 msgid "don't commit, just update the working directory"
 msgstr "non effettuare il commit, aggiorna solo la directory di lavoro"
 
 msgid "apply patch to the nodes from which it was generated"
 msgstr "applica la patch al nodo da cui è stata generata"
 
 #, fuzzy
 msgid "use any branch information in patch (implied by --exact)"
-msgstr "Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
+msgstr ""
+"Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
 
 msgid "[OPTION]... PATCH..."
 msgstr "[OPZIONI]... PATCH..."
 
+#, fuzzy
+msgid "run even if remote repository is unrelated"
+msgstr "esegui anche quando il repository remoto non è collegato"
+
 msgid "show newest record first"
 msgstr "mostra prima il record più nuovo"
 
 msgid "file to store the bundles into"
 msgstr "file in cui salvare i bundle"
 
-msgid "a specific revision up to which you would like to pull"
-msgstr "una specifica revisione fino alla quale si desidera fare il pull"
+#, fuzzy
+msgid "a remote changeset intended to be added"
+msgstr "mostra il changeset corrente nei rami degli antenati"
+
+#, fuzzy
+msgid "a specific branch you would like to pull"
+msgstr "una specifica revisione di cui si desidera fare il pull"
 
 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
 msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle NOME_FILE] [SORGENTE]"
 
 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
 
 #, fuzzy
-msgid "search the repository as it stood at REV"
+msgid "search the repository as it is in REV"
 msgstr "cerca nel repository per come era alla revisione rev"
 
 msgid "end filenames with NUL, for use with xargs"
 msgstr "termina il nome dei file con NUL, da usare con xargs"
 
 msgid "print complete paths from the filesystem root"
 msgstr "stampa i percorsi completi dalla radice del filesystem"
 
 msgid "[OPTION]... [PATTERN]..."
 msgstr "[OPZIONI]... [PATTERN]..."
 
 msgid "only follow the first parent of merge changesets"
 msgstr "segui solo il primo genitore di un changeset di merge"
 
 #, fuzzy
 msgid "show revisions matching date spec"
 msgstr "mostra le revisioni che corrispondono ad una data fornita"
 
 msgid "show copied files"
 msgstr "mostra i file copiati"
 
-msgid "do case-insensitive search for a keyword"
+#, fuzzy
+msgid "do case-insensitive search for a given text"
 msgstr "effettua una ricerca case-insensitive di una parola chiave"
 
 #, fuzzy
 msgid "include revisions where files were removed"
 msgstr "include le revisioni in cui sono stati rimossi dei file"
 
 msgid "show only merges"
 msgstr "mostra solo i merge"
 
 #, fuzzy
 msgid "revisions committed by user"
 msgstr "commit delle revisioni effettuato dall'utente"
 
-msgid "show only changesets within the given named branch"
+#, fuzzy
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr "mostra solo i changeset all'interno della data named branch"
+
+#, fuzzy
+msgid "show changesets within the given named branch"
 msgstr "mostra solo i changeset all'interno della data named branch"
 
 msgid "do not display revision or any of its ancestors"
 msgstr "non mostrare la revisione o qualche suo antenato"
 
 msgid "[OPTION]... [FILE]"
 msgstr "[OPZIONI]... [FILE]"
 
 msgid "revision to display"
 msgstr "revisione da mostrare"
 
 msgid "[-r REV]"
 msgstr "[-r REV]"
 
 msgid "force a merge with outstanding changes"
 msgstr "forza un merge con modifiche pendenti"
 
 msgid "revision to merge"
 msgstr "revisione di cui fare il merge"
 
 msgid "review revisions to merge (no merge is performed)"
 msgstr ""
 
-msgid "[-f] [[-r] REV]"
+#, fuzzy
+msgid "[-P] [-f] [[-r] REV]"
 msgstr "[-f] [[-r] REV]"
 
-msgid "a specific revision up to which you would like to push"
-msgstr "una specifica revisione fino alla quale si desidera effettuare il push"
+#, fuzzy
+msgid "a changeset intended to be included in the destination"
+msgstr "mostra changeset non trovati nella destinazione"
+
+#, fuzzy
+msgid "a specific branch you would like to push"
+msgstr "una specifica revisione di cui si desidera fare il pull"
 
 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 
 #, fuzzy
-msgid "show parents from the specified revision"
+msgid "show parents of the specified revision"
 msgstr "mostra i genitori della revisione specificata"
 
 #, fuzzy
 msgid "[-r REV] [FILE]"
 msgstr "[-r REV] FILE"
 
 msgid "[NAME]"
 msgstr "[NOME]"
 
-msgid "update to new tip if changesets were pulled"
+#, fuzzy
+msgid "update to new branch head if changesets were pulled"
 msgstr "aggiorna alla nuova tip se si è effettuato il pull di changeset"
 
+msgid "run even when remote repository is unrelated"
+msgstr "esegui anche quando il repository remoto non è collegato"
+
 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
 msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SORGENTE]"
 
 msgid "force push"
 msgstr "forza il push"
 
+msgid "allow pushing a new branch"
+msgstr ""
+
 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 
 msgid "record delete for missing files"
 msgstr "registra cancellazione per i file mancanti"
 
 msgid "remove (and delete) file even if added or modified"
 msgstr "rimuove (e cancella) i file anche se sono stati aggiunti o modificati"
 
 msgid "record a rename that has already occurred"
 msgstr "registra una rinomina che si è già verificata"
 
 msgid "[OPTION]... SOURCE... DEST"
 msgstr "[OPZIONI]... SORGENTE... DEST"
 
-msgid "remerge all unresolved files"
+#, fuzzy
+msgid "select all unresolved files"
 msgstr "rieffettua il merge di tutti i file non risolti"
 
 msgid "list state of files needing merge"
 msgstr "elenca lo stato dei file che necessitano merge"
 
 msgid "mark files as resolved"
 msgstr "marca i file come risolti"
 
 msgid "unmark files as resolved"
 msgstr "smarca i file come risolti"
 
+msgid "hide status prefix"
+msgstr "nascondi il prefisso di stato"
+
 msgid "revert all changes when no arguments given"
 msgstr "annulla tutte le modifiche quando nessun argomento è stato fornito"
 
 msgid "tipmost revision matching date"
 msgstr "la revisione più vicina a tip corrispondente alla data"
 
-msgid "revision to revert to"
-msgstr "revisione a cui annullare"
+#, fuzzy
+msgid "revert to the specified revision"
+msgstr "annota la revisione specificata"
 
 msgid "do not save backup copies of files"
 msgstr "non salva copie di backup dei file"
 
 msgid "[OPTION]... [-r REV] [NAME]..."
 msgstr "[OPZIONI]... [-r REV] [NOME]..."
 
 msgid "name of access log file to write to"
 msgstr "nome del file di log degli accessi su cui scrivere"
 
 msgid "name of error log file to write to"
 msgstr "nome del file di log degli errori su cui scrivere"
 
+msgid "PORT"
+msgstr ""
+
 msgid "port to listen on (default: 8000)"
 msgstr "porta su cui stare in ascolto (default: 8000)"
 
+msgid "ADDR"
+msgstr ""
+
 msgid "address to listen on (default: all interfaces)"
 msgstr "indirizzo su cui stare in ascolto (default: tutte le interfacce)"
 
 msgid "prefix path to serve from (default: server root)"
 msgstr "prefisso del percorso da cui servire (default: radice del server)"
 
 #, fuzzy
 msgid "name to show in web pages (default: working directory)"
 msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)"
 
 #, fuzzy
-msgid "name of the webdir config file (serve more than one repository)"
+msgid "name of the hgweb config file (serve more than one repository)"
 msgstr "nome del file di configurazione webdir (serve più di un repository)"
 
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr ""
+
 msgid "for remote clients"
 msgstr "per i client remoti"
 
 msgid "web templates to use"
 msgstr "template web da usare"
 
 msgid "template style to use"
 msgstr "stile dei template da usare"
 
 msgid "use IPv6 in addition to IPv4"
 msgstr "usa IPv6 in aggiunta ad IPv4"
 
 msgid "SSL certificate file"
 msgstr "file del certificato SSL"
 
 msgid "show untrusted configuration options"
 msgstr "mostra le opzioni di configurazioni non affidabili"
 
 msgid "[-u] [NAME]..."
 msgstr "[-u] [NOME]..."
 
 msgid "check for push and pull"
 msgstr ""
 
 msgid "show status of all files"
 msgstr "mostra lo stato di tutti i file"
 
 msgid "show only modified files"
 msgstr "mostra solo i file modificati"
 
 msgid "show only added files"
 msgstr "mostra solo i file aggiunti"
 
 msgid "show only removed files"
 msgstr "mostra solo i file rimossi"
 
 msgid "show only deleted (but tracked) files"
 msgstr "mostra solo i file rimossi (ma tracciati)"
 
 msgid "show only files without changes"
 msgstr "mostra solo i file senza modifiche"
 
 msgid "show only unknown (not tracked) files"
 msgstr "mostra solo i file sconosciuti (non tracciati)"
 
 msgid "show only ignored files"
 msgstr "mostra solo i file ignorati"
 
-msgid "hide status prefix"
-msgstr "nascondi il prefisso di stato"
-
 msgid "show source of copied files"
 msgstr "mostra la sorgente dei file copiati"
 
 msgid "show difference from revision"
 msgstr "mostra le differenze dalla revisione"
 
+#, fuzzy
+msgid "list the changed files of a revision"
+msgstr "è necessario avere almeno alcune revisioni"
+
 msgid "replace existing tag"
 msgstr "rimpiazza tag esistente"
 
 msgid "make the tag local"
 msgstr "rendi la tag locale"
 
 msgid "revision to tag"
 msgstr "revisione da taggare"
 
 msgid "remove a tag"
 msgstr "rimuove una tag"
 
-msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgid "use <text> as commit message"
+msgstr "usa <text> come messaggio di commit"
+
+#, fuzzy
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
 msgstr "[-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..."
 
-msgid "[-p]"
+#, fuzzy
+msgid "[-p] [-g]"
 msgstr "[-p]"
 
-msgid "update to new tip if changesets were unbundled"
+#, fuzzy
+msgid "update to new branch head if changesets were unbundled"
 msgstr "aggiorna alla nuova tip se changeset sono stati estratti da un bundle"
 
 msgid "[-u] FILE..."
 msgstr "[-u] FILE..."
 
-msgid "overwrite locally modified files (no backup)"
-msgstr "sovrascrivi file modificati localmente (nessun backup)"
+#, fuzzy
+msgid "discard uncommitted changes (no backup)"
+msgstr "importa nella patch le modifiche di cui non si è effettuato il commit"
 
 #, fuzzy
 msgid "check for uncommitted changes"
-msgstr "salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
-
-msgid "[-C] [-d DATE] [[-r] REV]"
+msgstr ""
+"salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
+
+#, fuzzy
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
 msgstr "[-C] [-d DATA] [[-r] REV]"
 
 #, fuzzy, python-format
-msgid "config error at %s:%d: '%s'"
-msgstr "impossibile avviare il server a '%s:%d': %s"
+msgid "cannot include %s (%s)"
+msgstr "impossibile fare push di '%s' - %s\n"
 
 msgid "not found in manifest"
 msgstr "non trovato nel manifesto"
 
 msgid "branch name not in UTF-8!"
 msgstr "il nome della branch non è in UTF-8!"
 
+#, python-format
+msgid "%s does not exist!\n"
+msgstr "%s non esiste!\n"
+
+#, python-format
+msgid ""
+"%s: up to %d MB of RAM may be required to manage this file\n"
+"(use 'hg revert %s' to cancel the pending addition)\n"
+msgstr ""
+
+#, python-format
+msgid "%s not added: only files and symlinks supported currently\n"
+msgstr ""
+"%s non aggiunto: attualmente solo file e link simbolici sono supportati\n"
+
+#, python-format
+msgid "%s already tracked!\n"
+msgstr "%s è già tracciato!\n"
+
+#, python-format
+msgid "%s not added!\n"
+msgstr "%s non aggiunto!\n"
+
+#, python-format
+msgid "%s still exists!\n"
+msgstr ""
+
+#, python-format
+msgid "%s not tracked!\n"
+msgstr "%s non è tracciato!\n"
+
+#, python-format
+msgid "%s not removed!\n"
+msgstr ""
+
+#, python-format
+msgid "copy failed: %s is not a file or a symbolic link\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "invalid event type in dag: %s"
+msgstr "voce non valida in fncache, linea %s"
+
 msgid "working directory state appears damaged!"
 msgstr "lo stato della directory di lavoro risulta danneggiato!"
 
 #, python-format
 msgid "'\\n' and '\\r' disallowed in filenames: %r"
 msgstr "'\\n' e '\\r' non sono consentiti nei nomi dei file: %r"
 
 #, python-format
 msgid "directory %r already in dirstate"
 msgstr "la directory %r è già nel dirstate"
 
 #, python-format
 msgid "file %r in dirstate clashes with %r"
 msgstr "il file %r nel dirstate collide con %r"
 
 #, python-format
+msgid "setting %r to other parent only allowed in merges"
+msgstr ""
+
+#, python-format
 msgid "not in dirstate: %s\n"
 msgstr "non nel dirstate: %s\n"
 
 msgid "unknown"
 msgstr "sconosciuto"
 
 msgid "character device"
 msgstr "device a caratteri"
 
 msgid "block device"
 msgstr "device a blocchi"
 
 msgid "fifo"
 msgstr "fifo"
 
 msgid "socket"
 msgstr "socket"
 
 msgid "directory"
 msgstr "directory"
 
 #, python-format
 msgid "unsupported file type (type is %s)"
 msgstr "tipo di file non supportato (il tipo è %s)"
 
+msgid "queries"
+msgstr ""
+
+#, fuzzy
+msgid "searching"
+msgstr "ricerca"
+
+msgid "already have changeset "
+msgstr ""
+
+msgid "warning: repository is unrelated\n"
+msgstr ""
+
+msgid "repository is unrelated"
+msgstr "il repository non è imparentato"
+
+#, fuzzy, python-format
+msgid "abort: push creates new remote heads on branch '%s'!\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+msgid "abort: push creates new remote heads!\n"
+msgstr "abortito: push crea nuove head remote!\n"
+
+#, fuzzy
+msgid "(you should pull and merge or use push -f to force)\n"
+msgstr ""
+"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
+
+msgid "(did you forget to merge? use push -f to force)\n"
+msgstr ""
+"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
+
+#, fuzzy, python-format
+msgid "abort: push creates new remote branches: %s!\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+#, fuzzy
+msgid "(use 'hg push --new-branch' to create new remote branches)\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+msgid "note: unsynced remote changes!\n"
+msgstr "nota: modifiche remote non sincronizzate!\n"
+
 #, python-format
 msgid "abort: %s\n"
 msgstr "abortito: %s\n"
 
-#, python-format
-msgid "hg: %s\n"
-msgstr "hg: %s\n"
+#, fuzzy, python-format
+msgid "hg: parse error at %s: %s\n"
+msgstr "impossibile avviare il server a '%s:%d': %s"
+
+#, fuzzy, python-format
+msgid "hg: parse error: %s\n"
+msgstr "abortito: errore: %s\n"
 
 #, python-format
 msgid ""
 "hg: command '%s' is ambiguous:\n"
 "    %s\n"
 msgstr ""
 "hg: il comando '%s' è ambiguo:\n"
 "    %s\n"
 
 #, python-format
 msgid "timed out waiting for lock held by %s"
 msgstr "tempo esaurito per l'attesa del lock tenuto da %s"
 
 #, python-format
 msgid "lock held by %s"
 msgstr "lock tenuto da %s"
 
 #, python-format
 msgid "abort: %s: %s\n"
 msgstr "abortito: %s: %s\n"
 
 #, python-format
 msgid "abort: could not lock %s: %s\n"
 msgstr "abortito: impossibile acquisire il lock su %s: %s\n"
 
 #, python-format
 msgid "hg %s: %s\n"
 msgstr "hg %s: %s\n"
 
 #, python-format
+msgid "hg: %s\n"
+msgstr "hg: %s\n"
+
+#, python-format
 msgid "abort: %s!\n"
 msgstr "abortito: %s!\n"
 
 #, python-format
 msgid "abort: %s"
 msgstr "abortito: %s"
 
 msgid " empty string\n"
 msgstr "stringa vuota\n"
 
 msgid "killed!\n"
 msgstr "ucciso!\n"
 
 #, python-format
 msgid "hg: unknown command '%s'\n"
 msgstr "hg: comando '%s' sconosciuto\n"
 
-#, python-format
-msgid "abort: could not import module %s!\n"
-msgstr "abortito: non è stato possibile importare %s!\n"
-
 msgid "(did you forget to compile extensions?)\n"
 msgstr "(ti sei dimenticato di compilare le estensioni?)\n"
 
 msgid "(is your Python install correct?)\n"
 msgstr "(l'installazione di Python è corretta?)\n"
 
 #, python-format
 msgid "abort: error: %s\n"
 msgstr "abortito: errore: %s\n"
 
 msgid "broken pipe\n"
 msgstr "pipe rotta\n"
 
 msgid "interrupted!\n"
 msgstr "interrotto!\n"
 
 msgid ""
 "\n"
 "broken pipe\n"
 msgstr ""
 "\n"
 "pipe rotta\n"
 
 msgid "abort: out of memory\n"
 msgstr "abortito: memoria esaurita\n"
 
 msgid "** unknown exception encountered, details follow\n"
 msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n"
 
 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr "** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
+msgstr ""
+"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
 
 msgid "** or [e-mail]\n"
 msgstr "** o [e-mail]\n"
 
 #, python-format
+msgid "** Python %s\n"
+msgstr ""
+
+#, python-format
 msgid "** Mercurial Distributed SCM (version %s)\n"
 msgstr "** Mercurial SCM Distribuito (versione %s)\n"
 
 #, python-format
 msgid "** Extensions loaded: %s\n"
 msgstr "** Estensioni caricate: %s\n"
 
 #, python-format
 msgid "no definition for alias '%s'\n"
 msgstr ""
 
 #, python-format
 msgid "alias '%s' resolves to unknown command '%s'\n"
 msgstr "l'alias '%s' corrisponde al comando sconosciuto '%s'\n"
 
 #, python-format
 msgid "alias '%s' resolves to ambiguous command '%s'\n"
 msgstr "l'alias '%s' corrisponde al comando ambiguo '%s'\n"
 
-#, python-format
-msgid "malformed --config option: %s"
+#, fuzzy, python-format
+msgid "malformed --config option: %r (use --config section.name=value)"
 msgstr "opzione --config malformata: %s"
 
+#, fuzzy, python-format
+msgid "error getting current working directory: %s"
+msgstr "stampa la radice (top) della directory di lavoro corrente"
+
 #, python-format
 msgid "extension '%s' overrides commands: %s\n"
 msgstr "l'estensione '%s' rimpiazza i comandi: %s\n"
 
 msgid "Option --config may not be abbreviated!"
 msgstr "Non si può abbreviare l'opzione --config!"
 
 msgid "Option --cwd may not be abbreviated!"
 msgstr "Non si può abbreviare l'opzione --cwd!"
 
-msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
+msgid ""
+"Option -R has to be separated from other options (e.g. not -qR) and --"
+"repository may only be abbreviated as --repo!"
 msgstr ""
 
 #, python-format
 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
 msgstr ""
 
 #, python-format
 msgid "repository '%s' is not local"
 msgstr "il repository '%s' non è locale"
 
+#, fuzzy
+msgid "warning: --repository ignored\n"
+msgstr "il repository non è imparentato"
+
 msgid "invalid arguments"
 msgstr "argomenti non validi"
 
 #, python-format
 msgid "unrecognized profiling format '%s' - Ignored\n"
 msgstr ""
 
-msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
+msgid ""
+"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
+"misc/lsprof/"
 msgstr ""
 
 #, python-format
 msgid "*** failed to import extension %s from %s: %s\n"
 msgstr "*** fallita l'importazione dell'estensione %s da %s: %s\n"
 
 #, python-format
 msgid "*** failed to import extension %s: %s\n"
 msgstr "*** fallita l'importazione dell'estensione %s: %s\n"
 
 #, python-format
 msgid "couldn't find merge tool %s\n"
 msgstr "non è stato possibile trovare il tool per il merge %s\n"
 
 #, python-format
 msgid "tool %s can't handle symlinks\n"
 msgstr "il tool %s non può gestire link simbolici\n"
 
 #, python-format
 msgid "tool %s can't handle binary\n"
 msgstr "il tool %s non può gestire file binari\n"
 
 #, python-format
 msgid "tool %s requires a GUI\n"
 msgstr "il tool %s richiede una GUI\n"
 
 #, python-format
 msgid ""
 " no tool found to merge %s\n"
 "keep (l)ocal or take (o)ther?"
 msgstr ""
 
 msgid "&Local"
 msgstr ""
 
 msgid "&Other"
 msgstr ""
 
 #, python-format
 msgid "merging %s and %s to %s\n"
 msgstr "sto effettuando il merge di %s e %s in %s\n"
 
 #, python-format
 msgid "merging %s\n"
 msgstr "sto effettuando il merge di %s\n"
 
 #, python-format
-msgid ""
-" output file %s appears unchanged\n"
-"was merge successful (yn)?"
+msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
+msgstr ""
+
+#, python-format
+msgid "was merge of '%s' successful (yn)?"
 msgstr ""
 
 msgid "&No"
 msgstr ""
 
 msgid "&Yes"
 msgstr ""
 
 #, python-format
+msgid ""
+" output file %s appears unchanged\n"
+"was merge successful (yn)?"
+msgstr ""
+
+#, python-format
 msgid "merging %s failed!\n"
 msgstr "merge di %s fallito!\n"
 
 #, python-format
 msgid "Inconsistent state, %s:%s is good and bad"
 msgstr "Stato inconsistente, %s:%s è buona e cattiva"
 
 #, python-format
 msgid "unknown bisect kind %s"
 msgstr ""
 
 msgid "disabled extensions:"
 msgstr "estensioni disabilitate:"
 
+msgid "Configuration Files"
+msgstr ""
+
 msgid "Date Formats"
 msgstr "Formati della data"
 
 msgid "File Name Patterns"
 msgstr "Pattern dei Nomi dei File"
 
 msgid "Environment Variables"
 msgstr "Variabili d'ambiente"
 
 msgid "Specifying Single Revisions"
 msgstr ""
 
 msgid "Specifying Multiple Revisions"
 msgstr "Specificare Revisioni Multiple"
 
+#, fuzzy
+msgid "Specifying Revision Sets"
+msgstr "Specificare Revisioni Multiple"
+
 msgid "Diff Formats"
 msgstr "Formati di diff"
 
 msgid "Template Usage"
 msgstr ""
 
 msgid "URL Paths"
 msgstr "Percorsi URL"
 
 msgid "Using additional features"
 msgstr "Uso di funzionalità aggiuntive"
 
+msgid "Configuring hgweb"
+msgstr ""
+
+msgid "Glossary"
+msgstr ""
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"Below we list the most specific file first."
+msgstr ""
+
+msgid "On Windows, these configuration files are read:"
+msgstr ""
+
+msgid ""
+"- ``<repo>\\.hg\\hgrc``\n"
+"- ``%USERPROFILE%\\.hgrc``\n"
+"- ``%USERPROFILE%\\mercurial.ini``\n"
+"- ``%HOME%\\.hgrc``\n"
+"- ``%HOME%\\mercurial.ini``\n"
+"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
+"- ``<hg.exe-dir>\\mercurial.ini``"
+msgstr ""
+
+msgid "On Unix, these files are read:"
+msgstr ""
+
+msgid ""
+"- ``<repo>/.hg/hgrc``\n"
+"- ``$HOME/.hgrc``\n"
+"- ``/etc/mercurial/hgrc``\n"
+"- ``/etc/mercurial/hgrc.d/*.rc``\n"
+"- ``<install-root>/etc/mercurial/hgrc``\n"
+"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+"If there is a per-repository configuration file which is not owned by\n"
+"the active user, Mercurial will warn you that the file is skipped::"
+msgstr ""
+
+msgid ""
+"  not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
+msgstr ""
+
+msgid ""
+"If this bothers you, the warning can be silenced (the file would still\n"
+"be ignored) or trust can be established. Use one of the following\n"
+"settings, the syntax is explained below:"
+msgstr ""
+
+msgid ""
+"- ``ui.report_untrusted = False``\n"
+"- ``trusted.users = USER``\n"
+"- ``trusted.groups = GROUP``"
+msgstr ""
+
+msgid ""
+"The configuration files for Mercurial use a simple ini-file format. A\n"
+"configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries::"
+msgstr ""
+
+msgid ""
+"  [ui]\n"
+"  username = Firstname Lastname <[e-mail]>\n"
+"  verbose = True"
+msgstr ""
+
+msgid ""
+"The above entries will be referred to as ``ui.username`` and\n"
+"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
+"description of the possible configuration values:"
+msgstr ""
+
+msgid ""
+"- on Unix-like systems: ``man hgrc``\n"
+"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+msgstr ""
+
+msgid "Some commands allow the user to specify a date, e.g.:"
+msgstr ""
+
+msgid ""
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date."
+msgstr ""
+
+msgid "Many date formats are valid. Here are some examples:"
+msgstr ""
+
+msgid ""
+"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
+"- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n"
+"- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n"
+"- ``Dec 6`` (midnight)\n"
+"- ``13:18`` (today assumed)\n"
+"- ``3:39`` (3:39AM assumed)\n"
+"- ``3:39pm`` (15:39)\n"
+"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n"
+"- ``2006-12-6 13:18``\n"
+"- ``2006-12-6``\n"
+"- ``12-6``\n"
+"- ``12/6``\n"
+"- ``12/6/6`` (Dec 6 2006)"
+msgstr ""
+
+msgid "Lastly, there is Mercurial's internal format:"
+msgstr ""
+
+msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
+msgstr ""
+
+msgid ""
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC)."
+msgstr ""
+
+msgid "The log command also accepts date ranges:"
+msgstr ""
+
+msgid ""
+"- ``<{datetime}`` - at or before a given date/time\n"
+"- ``>{datetime}`` - on or after a given date/time\n"
+"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
+"- ``-{days}`` - within a given number of days of today\n"
+msgstr ""
+
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools."
+msgstr ""
+
+msgid ""
+"While this standard format is often enough, it does not encode the\n"
+"following information:"
+msgstr ""
+
+msgid ""
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files"
+msgstr ""
+
+msgid ""
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format."
+msgstr ""
+
+msgid ""
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with :hg:`export`), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes."
+msgstr ""
+
+msgid ""
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your 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."
+msgstr ""
+
+msgid ""
+"HGEDITOR\n"
+"    This is the name of the editor to run when committing. See EDITOR."
+msgstr ""
+
+msgid "    (deprecated, use .hgrc)"
+msgstr ""
+
+msgid ""
+"HGENCODING\n"
+"    This overrides the default locale setting detected by Mercurial.\n"
+"    This setting is used to convert data including usernames,\n"
+"    changeset descriptions, tag names, and branches. This setting can\n"
+"    be overridden with the --encoding command-line option."
+msgstr ""
+
+msgid ""
+"HGENCODINGMODE\n"
+"    This sets Mercurial's behavior for handling unknown characters\n"
+"    while transcoding user input. The default is \"strict\", which\n"
+"    causes Mercurial to abort if it can't map a character. Other\n"
+"    settings include \"replace\", which replaces unknown characters, and\n"
+"    \"ignore\", which drops them. This setting can be overridden with\n"
+"    the --encodingmode command-line option."
+msgstr ""
+
+msgid ""
+"HGMERGE\n"
+"    An executable to use for resolving merge conflicts. The program\n"
+"    will be executed with three arguments: local file, remote file,\n"
+"    ancestor file."
+msgstr ""
+
+msgid ""
+"HGRCPATH\n"
+"    A list of files or directories to search for 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."
+msgstr ""
+
+msgid "    For each element in HGRCPATH:"
+msgstr ""
+
+msgid ""
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added"
+msgstr ""
+
+msgid ""
+"HGPLAIN\n"
+"    When set, this disables any options in .hgrc that might change\n"
+"    Mercurial's default output. This includes encoding, defaults,\n"
+"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    localization. This can be useful when scripting against Mercurial\n"
+"    in the face of existing user configuration."
+msgstr ""
+
+msgid ""
+"    Equivalent options set via command line flags or environment\n"
+"    variables are not overridden."
+msgstr ""
+
+msgid ""
+"HGUSER\n"
+"    This is the string used as the author of a commit. If not set,\n"
+"    available values will be considered in this order:"
+msgstr ""
+
+msgid ""
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with ``@hostname`` appended)"
+msgstr ""
+
+msgid ""
+"EMAIL\n"
+"    May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"LOGNAME\n"
+"    May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"VISUAL\n"
+"    This is the name of the editor to use when committing. See EDITOR."
+msgstr ""
+
+msgid ""
+"EDITOR\n"
+"    Sometimes Mercurial needs to open a text file in an editor for a\n"
+"    user to modify, for example when writing commit messages. The\n"
+"    editor it uses is determined by looking at the environment\n"
+"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+"    non-empty one is chosen. If all of them are empty, the editor\n"
+"    defaults to 'vi'."
+msgstr ""
+
+msgid ""
+"PYTHONPATH\n"
+"    This is used by Python to find imported modules and may need to be\n"
+"    set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks."
+msgstr ""
+
+msgid ""
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed."
+msgstr ""
+
+msgid ""
+"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::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  foo ="
+msgstr ""
+
+msgid "You may also specify the full path to an extension::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension enabled in an hgrc of broader\n"
+"scope, prepend its path with !::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  # disabling extension bar residing in /path/to/extension/bar.py\n"
+"  bar = !/path/to/extension/bar.py\n"
+"  # ditto, but no path was supplied for extension baz\n"
+"  baz = !\n"
+msgstr ""
+
+msgid ""
+"Ancestor\n"
+"    Any changeset that can be reached by an unbroken chain of parent\n"
+"    changesets from a given changeset. More precisely, the ancestors\n"
+"    of a changeset can be defined by two properties: a parent of a\n"
+"    changeset is an ancestor, and a parent of an ancestor is an\n"
+"    ancestor. See also: 'Descendant'."
+msgstr ""
+
+msgid ""
+"Branch\n"
+"    (Noun) A child changeset that has been created from a parent that\n"
+"    is not a head. These are known as topological branches, see\n"
+"    'Branch, topological'. If a topological branch is named, it becomes\n"
+"    a named branch. If a topological branch is not named, it becomes\n"
+"    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
+msgstr ""
+
+msgid ""
+"    Branches may be created when changes are pulled from or pushed to\n"
+"    a remote repository, since new heads may be created by these\n"
+"    operations. Note that the term branch can also be used informally\n"
+"    to describe a development process in which certain development is\n"
+"    done independently of other development.This is sometimes done\n"
+"    explicitly with a named branch, but it can also be done locally,\n"
+"    using bookmarks or clones and anonymous branches."
+msgstr ""
+
+msgid "    Example: \"The experimental branch\"."
+msgstr ""
+
+msgid ""
+"    (Verb) The action of creating a child changeset which results in\n"
+"    its parent having more than one child."
+msgstr ""
+
+msgid "    Example: \"I'm going to branch at X\"."
+msgstr ""
+
+msgid ""
+"Branch, anonymous\n"
+"    Every time a new child changeset is created from a parent that is not\n"
+"    a head and the name of the branch is not changed, a new anonymous\n"
+"    branch is created."
+msgstr ""
+
+msgid ""
+"Branch, closed\n"
+"    A named branch whose branch heads have all been closed."
+msgstr ""
+
+msgid ""
+"Branch, default\n"
+"    The branch assigned to a changeset when no name has previously been\n"
+"    assigned."
+msgstr ""
+
+msgid ""
+"Branch head\n"
+"    See 'Head, branch'."
+msgstr ""
+
+msgid ""
+"Branch, named\n"
+"    A collection of changesets which have the same branch name. By\n"
+"    default, children of a changeset in a named branch belong to the\n"
+"    same named branch. A child can be explicitly assigned to a\n"
+"    different branch. See :hg:`help branch`, :hg:`help branches` and\n"
+"    :hg:`commit --close-branch` for more information on managing\n"
+"    branches."
+msgstr ""
+
+msgid ""
+"    Named branches can be thought of as a kind of namespace, dividing\n"
+"    the collection of changesets that comprise the repository into a\n"
+"    collection of disjoint subsets. A named branch is not necessarily\n"
+"    a topological branch. If a new named branch is created from the\n"
+"    head of another named branch, or the default branch, but no\n"
+"    further changesets are added to that previous branch, then that\n"
+"    previous branch will be a branch in name only."
+msgstr ""
+
+msgid ""
+"Branch tip\n"
+"    See 'Tip, branch'."
+msgstr ""
+
+msgid ""
+"Branch, topological\n"
+"    Every time a new child changeset is created from a parent that is\n"
+"    not a head, a new topological branch is created. If a topological\n"
+"    branch is named, it becomes a named branch. If a topological\n"
+"    branch is not named, it becomes an anonymous branch of the\n"
+"    current, possibly default, branch."
+msgstr ""
+
+msgid ""
+"Changelog\n"
+"    A record of the changesets in the order in which they were added\n"
+"    to the repository. This includes details such as changeset id,\n"
+"    author, commit message, date, and list of changed files."
+msgstr ""
+
+msgid ""
+"Changeset\n"
+"    A snapshot of the state of the repository used to record a change."
+msgstr ""
+
+msgid ""
+"Changeset, child\n"
+"    The converse of parent changeset: if P is a parent of C, then C is\n"
+"    a child of P. There is no limit to the number of children that a\n"
+"    changeset may have."
+msgstr ""
+
+msgid ""
+"Changeset id\n"
+"    A SHA-1 hash that uniquely identifies a changeset. It may be\n"
+"    represented as either a \"long\" 40-byte hexadecimal string, or a\n"
+"    \"short\" 12-byte hexadecimal string."
+msgstr ""
+
+msgid ""
+"Changeset, merge\n"
+"    A changeset with two parents. This occurs when a merge is\n"
+"    committed."
+msgstr ""
+
+msgid ""
+"Changeset, parent\n"
+"    A revision upon which a child changeset is based. Specifically, a\n"
+"    parent changeset of a changeset C is a changeset whose node\n"
+"    immediately precedes C in the DAG. Changesets have at most two\n"
+"    parents."
+msgstr ""
+
+msgid ""
+"Checkout\n"
+"    (Noun) The working directory being updated to a specific\n"
+"    revision. This use should probably be avoided where possible, as\n"
+"    changeset is much more appropriate than checkout in this context."
+msgstr ""
+
+msgid "    Example: \"I'm using checkout X.\""
+msgstr ""
+
+msgid ""
+"    (Verb) Updating the working directory to a specific changeset. See\n"
+"    :hg:`help update`."
+msgstr ""
+
+msgid "    Example: \"I'm going to check out changeset X.\""
+msgstr ""
+
+msgid ""
+"Child changeset\n"
+"    See 'Changeset, child'."
+msgstr ""
+
+msgid ""
+"Close changeset\n"
+"    See 'Changeset, close'."
+msgstr ""
+
+msgid ""
+"Closed branch\n"
+"    See 'Branch, closed'."
+msgstr ""
+
+msgid ""
+"Clone\n"
+"    (Noun) An entire or partial copy of a repository. The partial\n"
+"    clone must be in the form of a revision and its ancestors."
+msgstr ""
+
+msgid "    Example: \"Is your clone up to date?\"."
+msgstr ""
+
+msgid "    (Verb) The process of creating a clone, using :hg:`clone`."
+msgstr ""
+
+msgid "    Example: \"I'm going to clone the repository\"."
+msgstr ""
+
+msgid ""
+"Closed branch head\n"
+"    See 'Head, closed branch'."
+msgstr ""
+
+msgid ""
+"Commit\n"
+"    (Noun) A synonym for changeset."
+msgstr ""
+
+msgid "    Example: \"Is the bug fixed in your recent commit?\""
+msgstr ""
+
+msgid ""
+"    (Verb) The act of recording changes to a repository. When files\n"
+"    are committed in a working directory, Mercurial finds the\n"
+"    differences between the committed files and their parent\n"
+"    changeset, creating a new changeset in the repository."
+msgstr ""
+
+msgid "    Example: \"You should commit those changes now.\""
+msgstr ""
+
+msgid ""
+"Cset\n"
+"    A common abbreviation of the term changeset."
+msgstr ""
+
+msgid ""
+"DAG\n"
+"    The repository of changesets of a distributed version control\n"
+"    system (DVCS) can be described as a directed acyclic graph (DAG),\n"
+"    consisting of nodes and edges, where nodes correspond to\n"
+"    changesets and edges imply a parent -> child relation. This graph\n"
+"    can be visualized by graphical tools such as :hg:`glog`\n"
+"    (graphlog). In Mercurial, the DAG is limited by the requirement\n"
+"    for children to have at most two parents."
+msgstr ""
+
+msgid ""
+"Default branch\n"
+"    See 'Branch, default'."
+msgstr ""
+
+msgid ""
+"Descendant\n"
+"    Any changeset that can be reached by a chain of child changesets\n"
+"    from a given changeset. More precisely, the descendants of a\n"
+"    changeset can be defined by two properties: the child of a\n"
+"    changeset is a descendant, and the child of a descendant is a\n"
+"    descendant. See also: 'Ancestor'."
+msgstr ""
+
+msgid ""
+"Diff\n"
+"    (Noun) The difference between the contents and attributes of files\n"
+"    in two changesets or a changeset and the current working\n"
+"    directory. The difference is usually represented in a standard\n"
+"    form called a \"diff\" or \"patch\". The \"git diff\" format is used\n"
+"    when the changes include copies, renames, or changes to file\n"
+"    attributes, none of which can be represented/handled by classic\n"
+"    \"diff\" and \"patch\"."
+msgstr ""
+
+msgid "    Example: \"Did you see my correction in the diff?\""
+msgstr ""
+
+msgid ""
+"    (Verb) Diffing two changesets is the action of creating a diff or\n"
+"    patch."
+msgstr ""
+
+msgid ""
+"    Example: \"If you diff with changeset X, you will see what I mean.\""
+msgstr ""
+
+msgid ""
+"Directory, working\n"
+"    The working directory represents the state of the files tracked by\n"
+"    Mercurial, that will be recorded in the next commit. The working\n"
+"    directory initially corresponds to the snapshot at an existing\n"
+"    changeset, known as the parent of the working directory. See\n"
+"    'Parent, working directory'. The state may be modified by changes\n"
+"    to the files introduced manually or by a merge. The repository\n"
+"    metadata exists in the .hg directory inside the working directory."
+msgstr ""
+
+msgid ""
+"Graph\n"
+"    See DAG and :hg:`help graphlog`."
+msgstr ""
+
+msgid ""
+"Head\n"
+"    The term 'head' may be used to refer to both a branch head or a\n"
+"    repository head, depending on the context. See 'Head, branch' and\n"
+"    'Head, repository' for specific definitions."
+msgstr ""
+
+msgid ""
+"    Heads are where development generally takes place and are the\n"
+"    usual targets for update and merge operations."
+msgstr ""
+
+msgid ""
+"Head, branch\n"
+"    A changeset with no descendants on the same named branch."
+msgstr ""
+
+msgid ""
+"Head, closed branch\n"
+"    A changeset that marks a head as no longer interesting. The closed\n"
+"    head is no longer listed by :hg:`heads`. A branch is considered\n"
+"    closed when all its heads are closed and consequently is not\n"
+"    listed by :hg:`branches`."
+msgstr ""
+
+msgid ""
+"Head, repository\n"
+"    A topological head which has not been closed."
+msgstr ""
+
+msgid ""
+"Head, topological\n"
+"    A changeset with no children in the repository."
+msgstr ""
+
+msgid ""
+"History, immutable\n"
+"    Once committed, changesets cannot be altered.  Extensions which\n"
+"    appear to change history actually create new changesets that\n"
+"    replace existing ones, and then destroy the old changesets. Doing\n"
+"    so in public repositories can result in old changesets being\n"
+"    reintroduced to the repository."
+msgstr ""
+
+msgid ""
+"History, rewriting\n"
+"    The changesets in a repository are immutable. However, extensions\n"
+"    to Mercurial can be used to alter the repository, usually in such\n"
+"    a way as to preserve changeset contents."
+msgstr ""
+
+msgid ""
+"Immutable history\n"
+"    See 'History, immutable'."
+msgstr ""
+
+msgid ""
+"Merge changeset\n"
+"    See 'Changeset, merge'."
+msgstr ""
+
+msgid ""
+"Manifest\n"
+"    Each changeset has a manifest, which is the list of files that are\n"
+"    tracked by the changeset."
+msgstr ""
+
+msgid ""
+"Merge\n"
+"    Used to bring together divergent branches of work. When you update\n"
+"    to a changeset and then merge another changeset, you bring the\n"
+"    history of the latter changeset into your working directory. Once\n"
+"    conflicts are resolved (and marked), this merge may be committed\n"
+"    as a merge changeset, bringing two branches together in the DAG."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Named branch\n"
+"    See 'Branch, named'."
+msgstr "resetta il nome della branch al nome della branch genitore"
+
+msgid ""
+"Null changeset\n"
+"    The empty changeset. It is the parent state of newly-initialized\n"
+"    repositories and repositories with no checked out revision. It is\n"
+"    thus the parent of root changesets and the effective ancestor when\n"
+"    merging unrelated changesets. Can be specified by the alias 'null'\n"
+"    or by the changeset ID '000000000000'."
+msgstr ""
+
+msgid ""
+"Parent\n"
+"    See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent changeset\n"
+"    See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent, working directory\n"
+"    The working directory parent reflects a virtual revision which is\n"
+"    the child of the changeset (or two changesets with an uncommitted\n"
+"    merge) shown by :hg:`parents`. This is changed with\n"
+"    :hg:`update`. Other commands to see the working directory parent\n"
+"    are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"."
+msgstr ""
+
+msgid ""
+"Patch\n"
+"    (Noun) The product of a diff operation."
+msgstr ""
+
+msgid "    Example: \"I've sent you my patch.\""
+msgstr ""
+
+msgid ""
+"    (Verb) The process of using a patch file to transform one\n"
+"    changeset into another."
+msgstr ""
+
+msgid "    Example: \"You will need to patch that revision.\""
+msgstr ""
+
+msgid ""
+"Pull\n"
+"    An operation in which changesets in a remote repository which are\n"
+"    not in the local repository are brought into the local\n"
+"    repository. Note that this operation without special arguments\n"
+"    only updates the repository, it does not update the files in the\n"
+"    working directory. See :hg:`help pull`."
+msgstr ""
+
+msgid ""
+"Push\n"
+"    An operation in which changesets in a local repository which are\n"
+"    not in a remote repository are sent to the remote repository. Note\n"
+"    that this operation only adds changesets which have been committed\n"
+"    locally to the remote repository. Uncommitted changes are not\n"
+"    sent. See :hg:`help push`."
+msgstr ""
+
+msgid ""
+"Repository\n"
+"    The metadata describing all recorded states of a collection of\n"
+"    files. Each recorded state is represented by a changeset. A\n"
+"    repository is usually (but not always) found in the ``.hg``\n"
+"    subdirectory of a working directory. Any recorded state can be\n"
+"    recreated by \"updating\" a working directory to a specific\n"
+"    changeset."
+msgstr ""
+
+msgid ""
+"Repository head\n"
+"    See 'Head, repository'."
+msgstr ""
+
+msgid ""
+"Revision\n"
+"    A state of the repository at some point in time. Earlier revisions\n"
+"    can be updated to by using :hg:`update`.  See also 'Revision\n"
+"    number'; See also 'Changeset'."
+msgstr ""
+
+msgid ""
+"Revision number\n"
+"    This integer uniquely identifies a changeset in a specific\n"
+"    repository. It represents the order in which changesets were added\n"
+"    to a repository, starting with revision number 0. Note that the\n"
+"    revision number may be different in each clone of a repository. To\n"
+"    identify changesets uniquely between different clones, see\n"
+"    'Changeset id'."
+msgstr ""
+
+msgid ""
+"Revlog\n"
+"    History storage mechanism used by Mercurial. It is a form of delta\n"
+"    encoding, with occasional full revision of data followed by delta\n"
+"    of each successive revision. It includes data and an index\n"
+"    pointing to the data."
+msgstr ""
+
+msgid ""
+"Rewriting history\n"
+"    See 'History, rewriting'."
+msgstr ""
+
+msgid ""
+"Root\n"
+"    A changeset that has only the null changeset as its parent. Most\n"
+"    repositories have only a single root changeset."
+msgstr ""
+
+msgid ""
+"Tip\n"
+"    The changeset with the highest revision number. It is the changeset\n"
+"    most recently added in a repository."
+msgstr ""
+
+msgid ""
+"Tip, branch\n"
+"    The head of a given branch with the highest revision number. When\n"
+"    a branch name is used as a revision identifier, it refers to the\n"
+"    branch tip. See also 'Branch, head'. Note that because revision\n"
+"    numbers may be different in different repository clones, the\n"
+"    branch tip may be different in different cloned repositories."
+msgstr ""
+
+msgid ""
+"Update\n"
+"    (Noun) Another synonym of changeset."
+msgstr ""
+
+msgid "    Example: \"I've pushed an update\"."
+msgstr ""
+
+msgid ""
+"    (Verb) This term is usually used to describe updating the state of\n"
+"    the working directory to that of a specific changeset. See\n"
+"    :hg:`help update`."
+msgstr ""
+
+msgid "    Example: \"You should update\"."
+msgstr ""
+
+msgid ""
+"Working directory\n"
+"    See 'Directory, working'."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Working directory parent\n"
+"    See 'Parent, working directory'.\n"
+msgstr "stampa la radice (top) della directory di lavoro corrente"
+
+msgid ""
+"Mercurial's internal web server, hgweb, can serve either a single\n"
+"repository, or a collection of them. In the latter case, a special\n"
+"configuration file can be used to specify the repository paths to use\n"
+"and global web configuration options."
+msgstr ""
+
+msgid ""
+"This file uses the same syntax as hgrc configuration files, but only\n"
+"the following sections are recognized:"
+msgstr ""
+
+msgid ""
+"  - web\n"
+"  - paths\n"
+"  - collections"
+msgstr ""
+
+msgid ""
+"The ``web`` section can specify all the settings described in the web\n"
+"section of the hgrc documentation."
+msgstr ""
+
+msgid ""
+"The ``paths`` section provides mappings of physical repository\n"
+"paths to virtual ones. For instance::"
+msgstr ""
+
+msgid ""
+"  [paths]\n"
+"  projects/a = /foo/bar\n"
+"  projects/b = /baz/quux\n"
+"  web/root = /real/root/*\n"
+"  / = /real/root2/*\n"
+"  virtual/root2 = /real/root2/**"
+msgstr ""
+
+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 ""
+
+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 ""
+
+msgid ""
+"  [collections]\n"
+"  /foo = /foo"
+msgstr ""
+
+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 ""
+
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character."
+msgstr ""
+
+msgid ""
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\"."
+msgstr ""
+
+msgid "If BEGIN is greater than END, revisions are treated in reverse order."
+msgstr ""
+
+msgid ""
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time."
+msgstr ""
+
+msgid ""
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns."
+msgstr ""
+
+msgid "Alternate pattern notations must be specified explicitly."
+msgstr ""
+
+msgid ""
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root."
+msgstr ""
+
+msgid ""
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``."
+msgstr ""
+
+msgid ""
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\"."
+msgstr ""
+
+msgid ""
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository."
+msgstr ""
+
+msgid "Plain examples::"
+msgstr ""
+
+msgid ""
+"  path:foo/bar   a name bar in a directory named foo in the root\n"
+"                 of the repository\n"
+"  path:path:name a file or directory named \"path:name\""
+msgstr ""
+
+msgid "Glob examples::"
+msgstr ""
+
+msgid ""
+"  glob:*.c       any name ending in \".c\" in the current directory\n"
+"  *.c            any name ending in \".c\" in the current directory\n"
+"  **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                 current directory including itself.\n"
+"  foo/*.c        any name ending in \".c\" in the directory foo\n"
+"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                 including itself."
+msgstr ""
+
+msgid "Regexp examples::"
+msgstr ""
+
+msgid ""
+"  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+
+msgid "Mercurial supports several ways to specify individual revisions."
+msgstr ""
+
+msgid ""
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth."
+msgstr ""
+
+msgid ""
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier."
+msgstr ""
+
+msgid ""
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier."
+msgstr ""
+
+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 ""
+
+msgid ""
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision."
+msgstr ""
+
+msgid ""
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0."
+msgstr ""
+
+msgid ""
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+
+msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"revisions."
+msgstr ""
+
+msgid ""
+"The language supports a number of predicates which are joined by infix\n"
+"operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as branch names must be quoted with single or double\n"
+"quotes if they contain characters outside of\n"
+"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
+"predicates. Special characters can be used in quoted identifiers by\n"
+"escaping them, e.g., ``\\n`` is interpreted as a newline."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+"  Changesets not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x::y``\n"
+"  A DAG range, meaning all changesets that are descendants of x and\n"
+"  ancestors of y, including x and y themselves. If the first endpoint\n"
+"  is left out, this is equivalent to ``ancestors(y)``, if the second\n"
+"  is left out it is equivalent to ``descendants(x)``."
+msgstr ""
+
+msgid "  An alternative syntax is ``x..y``."
+msgstr ""
+
+msgid ""
+"``x:y``\n"
+"  All changesets with revision numbers between x and y, both\n"
+"  inclusive. Either endpoint can be left out, they default to 0 and\n"
+"  tip."
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+"  The intersection of changesets in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+"  The union of changesets in x and y. There are two alternative short\n"
+"  forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+"  Changesets in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ""
+"``adds(pattern)``\n"
+"  Changesets that add a file matching pattern."
+msgstr ""
+
+msgid ""
+"``all()``\n"
+"  All changesets, the same as ``0:tip``."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+"  Greatest common ancestor of the two changesets."
+msgstr ""
+
+msgid ""
+"``ancestors(set)``\n"
+"  Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``author(string)``\n"
+"  Alias for ``user(string)``."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+"  The branch names are found for changesets in set, and the result is\n"
+"  all changesets belonging to one those branches."
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+"  Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``closed()``\n"
+"  Changeset is closed."
+msgstr ""
+
+msgid ""
+"``contains(pattern)``\n"
+"  Revision contains pattern."
+msgstr ""
+
+msgid ""
+"``date(interval)``\n"
+"  Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+"  Changesets which are decendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+"  Changesets which manually affected files matching pattern."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+"  An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+msgid ""
+"``grep(regex)``\n"
+"  Like ``keyword(string)`` but accepts a regex."
+msgstr ""
+
+msgid ""
+"``head()``\n"
+"  Changeset is a head."
+msgstr ""
+
+msgid ""
+"``heads(set)``\n"
+"  Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+"  Search commit message, user name, and names of changed files for\n"
+"  string."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+"  First n members of set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+"  Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+"  Changeset is a merge changeset."
+msgstr ""
+
+msgid ""
+"``modifies(pattern)``\n"
+"  Changesets which modify files matching pattern."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+"  Changesets missing in path."
+msgstr ""
+
+msgid ""
+"``p1(set)``\n"
+"  First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+"  Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+"  The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``removes(pattern)``\n"
+"  Changesets which remove files matching pattern."
+msgstr ""
+
+msgid ""
+"``reverse(set)``\n"
+"  Reverse order of set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+"  Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+"  Sort set by keys. The default sort order is ascending, specify a key\n"
+"  as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid "  The keys can be:"
+msgstr ""
+
+msgid ""
+"  - ``rev`` for the revision number,\n"
+"  - ``branch`` for the branch name,\n"
+"  - ``desc`` for the commit message (description),\n"
+"  - ``user`` for user name (``author`` can be used as an alias),\n"
+"  - ``date`` for the commit date"
+msgstr ""
+
+msgid ""
+"``tagged()``\n"
+"  Changeset is tagged."
+msgstr ""
+
+msgid ""
+"``user(string)``\n"
+"  User name is string."
+msgstr ""
+
+msgid "Command line equivalents for :hg:`log`::"
+msgstr ""
+
+msgid ""
+"  -f    ->  ::.\n"
+"  -d x  ->  date(x)\n"
+"  -k x  ->  keyword(x)\n"
+"  -m    ->  merge()\n"
+"  -u x  ->  user(x)\n"
+"  -b x  ->  branch(x)\n"
+"  -P x  ->  !::x\n"
+"  -l x  ->  limit(expr, x)"
+msgstr ""
+
+msgid "Some sample queries::"
+msgstr ""
+
+msgid ""
+"  hg log -r 'branch(default)'\n"
+"  hg log -r 'branch(default) and 1.5:: and not merge()'\n"
+"  hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
+"  hg log -r 'sort(date(\"May 2008\"), user)'\n"
+"  hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\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)."
+msgstr ""
+
+msgid ""
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog."
+msgstr ""
+
+msgid ""
+"Four styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact, changelog,\n"
+"and xml.\n"
+"Usage::"
+msgstr ""
+
+msgid "    $ hg log -r1 --style changelog"
+msgstr ""
+
+msgid ""
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::"
+msgstr ""
+
+msgid ""
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746"
+msgstr ""
+
+msgid ""
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:"
+msgstr ""
+
+msgid ":author: String. The unmodified author of the changeset."
+msgstr ""
+
+msgid ""
+":branches: String. The name of the branch on which the changeset was\n"
+"    committed. Will be empty if the branch name was default."
+msgstr ""
+
+msgid ":date: Date information. The date when the changeset was committed."
+msgstr ""
+
+msgid ":desc: String. The text of the changeset description."
+msgstr ""
+
+msgid ""
+":diffstat: String. Statistics of changes with the following format:\n"
+"    \"modified files: +added/-removed lines\""
+msgstr ""
+
+msgid ""
+":files: List of strings. All files modified, added, or removed by this\n"
+"    changeset."
+msgstr ""
+
+msgid ":file_adds: List of strings. Files added by this changeset."
+msgstr ""
+
+msgid ""
+":file_copies: List of strings. Files copied in this changeset with\n"
+"    their sources."
+msgstr ""
+
+msgid ""
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+"    only if the --copied switch is set."
+msgstr ""
+
+msgid ":file_mods: List of strings. Files modified by this changeset."
+msgstr ""
+
+msgid ":file_dels: List of strings. Files removed by this changeset."
+msgstr ""
+
+msgid ""
+":node: String. The changeset identification hash, as a 40-character\n"
+"    hexadecimal string."
+msgstr ""
+
+msgid ":parents: List of strings. The parents of the changeset."
+msgstr ""
+
+msgid ":rev: Integer. The repository-local changeset revision number."
+msgstr ""
+
+msgid ":tags: List of strings. Any tags associated with the changeset."
+msgstr ""
+
+msgid ""
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+"    changeset."
+msgstr ""
+
+msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgstr ""
+
+msgid ""
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. Be sure to use the stringify filter first when you're\n"
+"applying a string-input filter to a list-like input variable.\n"
+"You can also use a chain of filters to get the desired output::"
+msgstr ""
+
+msgid ""
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000"
+msgstr ""
+
+msgid "List of filters:"
+msgstr ""
+
+msgid ""
+":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"    every line except the last."
+msgstr ""
+
+msgid ""
+":age: Date. Returns a human-readable date/time difference between the\n"
+"    given date/time and the current date/time."
+msgstr ""
+
+msgid ""
+":basename: Any text. Treats the text as a path, and returns the last\n"
+"    component of the path after splitting by the path separator\n"
+"    (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
+"    \"baz\" and \"foo/bar//\" becomes \"bar\"."
+msgstr ""
+
+msgid ""
+":stripdir: Treat the text as path and strip a directory level, if\n"
+"    possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
+msgstr ""
+
+msgid ""
+":date: Date. Returns a date in a Unix date format, including the\n"
+"    timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
+msgstr ""
+
+msgid ""
+":domain: Any text. Finds the first string that looks like an email\n"
+"    address, and extracts just the domain component. Example: ``User\n"
+"    <[e-mail]>`` becomes ``example.com``."
+msgstr ""
+
+msgid ""
+":email: Any text. Extracts the first string that looks like an email\n"
+"    address. Example: ``User <[e-mail]>`` becomes\n"
+"    ``[e-mail]``."
+msgstr ""
+
+msgid ""
+":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
+"    and \">\" with XML entities."
+msgstr ""
+
+msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
+msgstr ""
+
+msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
+msgstr ""
+
+msgid ":firstline: Any text. Returns the first line of text."
+msgstr ""
+
+msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
+msgstr ""
+
+msgid ""
+":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
+"    25200\" (Unix timestamp, timezone offset)."
+msgstr ""
+
+msgid ""
+":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
+"    +0200\"."
+msgstr ""
+
+msgid ""
+":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+"    seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
+"    filter."
+msgstr ""
+
+msgid ":localdate: Date. Converts a date to local date."
+msgstr ""
+
+msgid ""
+":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
+"    XML entities."
+msgstr ""
+
+msgid ":person: Any text. Returns the text before an email address."
+msgstr ""
+
+msgid ""
+":rfc822date: Date. Returns a date using the same format used in email\n"
+"    headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
+msgstr ""
+
+msgid ""
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+"    specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
+msgstr ""
+
+msgid ""
+":short: Changeset hash. Returns the short form of a changeset hash,\n"
+"    i.e. a 12-byte hexadecimal string."
+msgstr ""
+
+msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
+msgstr ""
+
+msgid ":strip: Any text. Strips all leading and trailing whitespace."
+msgstr ""
+
+msgid ""
+":tabindent: Any text. Returns the text, with every line except the\n"
+"     first starting with a tab character."
+msgstr ""
+
+msgid ""
+":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
+"    \"foo bar\" becomes \"foo%20bar\"."
+msgstr ""
+
+msgid ":user: Any text. Returns the user portion of an email address.\n"
+msgstr ""
+
+msgid "Valid URLs are of the form::"
+msgstr ""
+
+msgid ""
+"  local/filesystem/path[#revision]\n"
+"  file://local/filesystem/path[#revision]\n"
+"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  ssh://[user[:pass]@]host[:port]/[path][#revision]"
+msgstr ""
+
+msgid ""
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
+"incoming --bundle`)."
+msgstr ""
+
+msgid ""
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also :hg:`help\n"
+"revisions`."
+msgstr ""
+
+msgid ""
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server."
+msgstr ""
+
+msgid "Some notes about using SSH with Mercurial:"
+msgstr ""
+
+msgid ""
+"- SSH requires an accessible shell account on the destination machine\n"
+"  and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+"  an extra slash at the start of a path to specify an absolute path::"
+msgstr ""
+
+msgid "    ssh://example.com//tmp/repository"
+msgstr ""
+
+msgid ""
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+"  to do is to configure it in your ~/.ssh/config, e.g.::"
+msgstr ""
+
+msgid ""
+"    Host *.mylocalnetwork.example.com\n"
+"      Compression no\n"
+"    Host *\n"
+"      Compression yes"
+msgstr ""
+
+msgid ""
+"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
+"  with the --ssh command line option."
+msgstr ""
+
+msgid ""
+"These URLs can all be stored in your hgrc with path aliases under the\n"
+"[paths] section like so::"
+msgstr ""
+
+msgid ""
+"  [paths]\n"
+"  alias1 = URL1\n"
+"  alias2 = URL2\n"
+"  ..."
+msgstr ""
+
+msgid ""
+"You can then use the alias for any command that uses a URL (for\n"
+"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)."
+msgstr ""
+
+msgid ""
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:"
+msgstr ""
+
+msgid ""
+"default:\n"
+"  When you create a repository with hg clone, the clone command saves\n"
+"  the location of the source repository as the new repository's\n"
+"  'default' path. This is then used when you omit path from push- and\n"
+"  pull-like commands (including incoming and outgoing)."
+msgstr ""
+
+msgid ""
+"default-push:\n"
+"  The push command will look for a path named 'default-push', and\n"
+"  prefer it over 'default' if both are defined.\n"
+msgstr ""
+
+#, fuzzy
+msgid "remote branch lookup not supported"
+msgstr "requisito '%s' non supportato"
+
+msgid "dirstate branch not accessible"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown branch '%s'"
+msgstr "revisione sconosciuta '%s'"
+
 msgid "can only share local repositories"
 msgstr ""
 
 msgid "destination already exists"
 msgstr "la destinazione esiste già"
 
 msgid "updating working directory\n"
 msgstr "sto aggiornando la directory di lavoro\n"
 
 #, python-format
 msgid "destination directory: %s\n"
 msgstr "directory di destinazione: %s\n"
 
 #, python-format
 msgid "destination '%s' already exists"
 msgstr "la destinazione '%s' esiste già"
 
 #, python-format
 msgid "destination '%s' is not empty"
 msgstr "la destinazione '%s' non è vuota"
 
-msgid "src repository does not support revision lookup and so doesn't support clone by revision"
+msgid ""
+"src repository does not support revision lookup and so doesn't support clone "
+"by revision"
 msgstr ""
 
 msgid "clone from remote to remote not supported"
 msgstr "clone da remoto a remoto non supportato"
 
 #, python-format
 msgid "updating to branch %s\n"
 msgstr "sto aggiornando al branch %s\n"
 
 #, python-format
-msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
+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 "usa 'hg resolve' per riprovare i merge sui file non risolti\n"
 
-msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"abandon\n"
 msgstr ""
 "usa 'hg resolve' per riprovare i merge sui file non risolti o\n"
 "'hg update -C' per abbandonare\n"
 
 msgid "(branch merge, don't forget to commit)\n"
 msgstr "(merge su branch, non dimenticare di effettuare il commit)\n"
 
 #, python-format
 msgid "error reading %s/.hg/hgrc: %s\n"
 msgstr "errore di lettura di %s/.hg/hgrc: %s\n"
 
 msgid "SSL support is unavailable"
 msgstr "Supporto SSL non disponibile"
 
 msgid "IPv6 is not available on this system"
 msgstr "IPv6 non è disponibile su questo sistema"
 
 #, python-format
 msgid "cannot start server at '%s:%d': %s"
 msgstr "impossibile avviare il server a '%s:%d': %s"
 
 #, python-format
 msgid "calling hook %s: %s\n"
 msgstr "sto invocando l'hook %s: %s\n"
 
 #, python-format
 msgid "%s hook is invalid (\"%s\" not in a module)"
 msgstr "l'hook %s non è valido (\"%s\" non in un modulo)"
 
+msgid "exception from first failed import attempt:\n"
+msgstr ""
+
+msgid "exception from second failed import attempt:\n"
+msgstr ""
+
 #, python-format
 msgid "%s hook is invalid (import of \"%s\" failed)"
 msgstr ""
 
 #, python-format
 msgid "%s hook is invalid (\"%s\" is not defined)"
 msgstr ""
 
 #, python-format
 msgid "%s hook is invalid (\"%s\" is not callable)"
 msgstr ""
 
 #, python-format
 msgid "error: %s hook failed: %s\n"
 msgstr ""
 
 #, python-format
 msgid "error: %s hook raised an exception: %s\n"
 msgstr ""
 
 #, python-format
 msgid "%s hook failed"
 msgstr ""
 
 #, python-format
 msgid "warning: %s hook failed\n"
 msgstr ""
 
 #, python-format
 msgid "running hook %s: %s\n"
 msgstr ""
 
 #, python-format
 msgid "%s hook %s"
 msgstr ""
 
 #, python-format
 msgid "warning: %s hook %s\n"
 msgstr ""
 
 msgid "connection ended unexpectedly"
 msgstr "connessione terminata inaspettatamente"
 
 #, python-format
 msgid "unsupported URL component: \"%s\""
 msgstr "componente URL non supportato: \"%s\""
 
 msgid "operation not supported over http"
 msgstr "operazione non supportata su http"
 
 msgid "authorization failed"
 msgstr "autorizzazione fallita"
 
 msgid "http error, possibly caused by proxy setting"
 msgstr "errore http, probabilmente causato dalle impostazioni del proxy"
 
 #, python-format
 msgid "real URL is %s\n"
 msgstr "il vero URL è %s\n"
 
-#, python-format
-msgid "'%s' does not appear to be an hg repository"
+#, fuzzy, python-format
+msgid ""
+"'%s' does not appear to be an hg repository:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
 msgstr "'%s' non sembra essere un repository hg"
 
 #, python-format
 msgid "'%s' sent a broken Content-Type header (%s)"
 msgstr "'%s' ha inviato un header Content-Type rotto (%s)"
 
 #, python-format
 msgid "'%s' uses newer protocol %s"
 msgstr ""
 
 msgid "look up remote revision"
 msgstr ""
 
 msgid "unexpected response:"
 msgstr "risposta inattesa: "
 
 msgid "look up remote changes"
 msgstr ""
 
 msgid "push failed (unexpected response):"
 msgstr "push fallito (risposta inattesa):"
 
+msgid "remote: "
+msgstr "remoto: "
+
 #, python-format
 msgid "push failed: %s"
 msgstr "push fallito: %s"
 
 msgid "Python support for SSL and HTTPS is not installed"
 msgstr "Supporto per Python per SSL e HTTPS non installato"
 
 msgid "cannot create new http repository"
 msgstr "impossibile creare un nuovo repository http"
 
 #, python-format
 msgid "ignoring invalid syntax '%s'"
 msgstr ""
 
 #, python-format
 msgid "skipping unreadable ignore file '%s': %s\n"
 msgstr "sto saltando file ignore non leggibile '%s': %s\n"
 
 #, python-format
 msgid "repository %s not found"
 msgstr "repository %s non trovato"
 
 #, python-format
 msgid "repository %s already exists"
 msgstr ""
 
 #, python-format
 msgid "requirement '%s' not supported"
 msgstr "requisito '%s' non supportato"
 
 #, python-format
 msgid ".hg/sharedpath points to nonexistent directory %s"
 msgstr ""
 
 #, python-format
 msgid "%r cannot be used in a tag name"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "warning: tag %s conflicts with existing branch name\n"
+msgstr "attenzione: conflitti durante il merge.\n"
+
 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
-msgstr "la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit manuale di .hgtags)"
+msgstr ""
+"la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit "
+"manuale di .hgtags)"
 
 #, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "la directory di lavoro ha il genitore sconosciuto '%s'"
 
 #, python-format
 msgid "unknown revision '%s'"
 msgstr "revisione sconosciuta '%s'"
 
-msgid "journal already exists - run hg recover"
-msgstr "il journal esiste già - eseguire hg recover"
+msgid "abandoned transaction found - run hg recover"
+msgstr ""
 
 msgid "rolling back interrupted transaction\n"
 msgstr "sto effettuando il rollback della transazione interrotta\n"
 
 msgid "no interrupted transaction available\n"
 msgstr "nessuna transazione interrotta disponibile\n"
 
-msgid "rolling back last transaction\n"
+#, python-format
+msgid "rolling back to revision %s (undo %s: %s)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "rolling back to revision %s (undo %s)\n"
+msgstr "Trovata revisione %s da %s\n"
+
+#, fuzzy
+msgid "rolling back unknown transaction\n"
 msgstr "sto effettuando il rollback dell'ultima transazione\n"
 
 #, python-format
 msgid "Named branch could not be reset, current branch still is: %s\n"
 msgstr ""
 
 msgid "no rollback information available\n"
 msgstr "nessuna informazione disponibile per il rollback\n"
 
 #, python-format
 msgid "waiting for lock on %s held by %r\n"
 msgstr "sto aspettando il lock su %s mantenuto da %r\n"
 
 #, python-format
 msgid "repository %s"
 msgstr "repository·%s"
 
 #, python-format
 msgid "working directory of %s"
 msgstr "directory di lavoro di %s"
 
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr ""
 
+#, fuzzy
+msgid "can't commit subrepos without .hgsub"
+msgstr "commit del subrepository %s\n"
+
 msgid "file not found!"
 msgstr "file non trovato!"
 
 msgid "no match under directory!"
 msgstr "nessuna corrispondenza sotto la directory!"
 
 msgid "file not tracked!"
 msgstr "file non tracciato!"
 
 msgid "unresolved merge conflicts (see hg resolve)"
 msgstr ""
 
 #, python-format
 msgid "committing subrepository %s\n"
 msgstr "commit del subrepository %s\n"
 
+#, fuzzy, python-format
+msgid "note: commit message saved in %s\n"
+msgstr "modifica il messaggio di commit"
+
 #, python-format
 msgid "trouble committing %s!\n"
 msgstr ""
 
-#, python-format
-msgid "%s does not exist!\n"
-msgstr "%s non esiste!\n"
-
-#, python-format
-msgid ""
-"%s: files over 10MB may cause memory and performance problems\n"
-"(use 'hg revert %s' to unadd the file)\n"
-msgstr ""
-"%s: file oltre i 10MB potrebbero causare problemi di memoria\n"
-"e performance (usare 'hg revert %s' per annullare l'aggiunta\n"
-"del file)\n"
-
-#, python-format
-msgid "%s not added: only files and symlinks supported currently\n"
-msgstr "%s non aggiunto: attualmente solo file e link simbolici sono supportati\n"
-
-#, python-format
-msgid "%s already tracked!\n"
-msgstr "%s è già tracciato!\n"
-
-#, python-format
-msgid "%s not added!\n"
-msgstr "%s non aggiunto!\n"
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr ""
-
-#, python-format
-msgid "%s not tracked!\n"
-msgstr "%s non è tracciato!\n"
-
-#, python-format
-msgid "%s not removed!\n"
-msgstr ""
-
-#, python-format
-msgid "copy failed: %s is not a file or a symbolic link\n"
-msgstr ""
-
-msgid "searching for changes\n"
-msgstr "sto cercando modifiche\n"
-
-msgid "already have changeset "
-msgstr ""
-
-msgid "warning: repository is unrelated\n"
-msgstr ""
-
-msgid "repository is unrelated"
-msgstr "il repository non è imparentato"
-
 msgid "requesting all changes\n"
 msgstr "sto richiedendo tutte le modifiche\n"
 
-msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
-msgstr ""
-
-#, python-format
-msgid "abort: push creates new remote branch '%s'!\n"
-msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
-
-msgid "abort: push creates new remote heads!\n"
-msgstr "abortito: push crea nuove head remote!\n"
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr "(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
-
-msgid "note: unsynced remote changes!\n"
-msgstr "nota: modifiche remote non sincronizzate!\n"
+msgid ""
+"Partial pull cannot be done because other repository doesn't support "
+"changegroupsubset."
+msgstr ""
 
 #, python-format
 msgid "%d changesets found\n"
 msgstr "%d changeset trovati\n"
 
+#, fuzzy
+msgid "bundling changes"
+msgstr "sto aggiungendo i changeset\n"
+
+msgid "chunks"
+msgstr ""
+
+#, fuzzy
+msgid "bundling manifests"
+msgstr "sto aggiungendo i manifesti\n"
+
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "revlog vuoto o mancante per %s"
 
+#, fuzzy
+msgid "bundling files"
+msgstr "sto annullando la rimozione di %s\n"
+
 msgid "adding changesets\n"
 msgstr "sto aggiungendo i changeset\n"
 
+#, fuzzy
+msgid "changesets"
+msgstr "sto aggiungendo i changeset\n"
+
 msgid "received changelog group is empty"
 msgstr "il gruppo di changelog ricevuto è vuoto"
 
 msgid "adding manifests\n"
 msgstr "sto aggiungendo i manifesti\n"
 
+#, fuzzy
+msgid "manifests"
+msgstr "sto aggiungendo i manifesti\n"
+
 msgid "adding file changes\n"
 msgstr "sto aggiungendo le modifiche ai file\n"
 
 msgid "received file revlog group is empty"
 msgstr "il gruppo di file revlog ricevuto è vuoto"
 
 #, python-format
+msgid "missing file data for %s:%s - run hg verify"
+msgstr ""
+
+#, python-format
 msgid " (%+d heads)"
 msgstr " (%+d head)"
 
 #, python-format
 msgid "added %d changesets with %d changes to %d files%s\n"
 msgstr "aggiunti %d changeset con %d modifiche a %d file%s\n"
 
 msgid "Unexpected response from remote server:"
 msgstr "Risposta inaspettata dal server remoto:"
 
 msgid "operation forbidden by server"
 msgstr "operazione vietata dal server"
 
 msgid "locking the remote repository failed"
 msgstr "lock del repository remoto fallito"
 
 msgid "the server sent an unknown error code"
 msgstr "il server ha inviato un codice d'errore sconosciuto"
 
 msgid "streaming all changes\n"
 msgstr "sto effettuando lo streaming di tutte le modifiche\n"
 
 #, python-format
 msgid "%d files to transfer, %s of data\n"
 msgstr "%d file da trasferire, %s di dati\n"
 
 #, python-format
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "trasferiti %s in %.1f secondi (%s/sec)\n"
 
 msgid "no [smtp]host in hgrc - cannot send mail"
 msgstr ""
 
 #, python-format
 msgid "sending mail: smtp host %s, port %s\n"
 msgstr ""
 
 msgid "can't use TLS: Python SSL support not installed"
 msgstr ""
 
 msgid "(using tls)\n"
 msgstr "(sto usando tls)\n"
 
 #, python-format
 msgid "(authenticating to mail server as %s)\n"
 msgstr ""
 
 #, python-format
 msgid "sending mail: %s\n"
 msgstr "sto inviando la mail: %s\n"
 
 msgid "smtp specified as email transport, but no smtp host configured"
 msgstr ""
 
 #, python-format
 msgid "%r specified as email transport, but not in PATH"
 msgstr ""
 
 #, python-format
 msgid "ignoring invalid sendcharset: %s\n"
 msgstr ""
 
 #, python-format
 msgid "invalid email address: %s"
 msgstr ""
 
 #, python-format
 msgid "invalid local address: %s"
 msgstr ""
 
 #, python-format
 msgid "failed to remove %s from manifest"
 msgstr ""
 
 #, python-format
 msgid "diff context lines count must be an integer, not %r"
 msgstr ""
 
 #, python-format
-msgid "untracked file in working directory differs from file in requested revision: '%s'"
+msgid ""
+"untracked file in working directory differs from file in requested revision: "
+"'%s'"
 msgstr ""
 
 #, python-format
 msgid "case-folding collision between %s and %s"
 msgstr ""
 
 #, python-format
 msgid ""
 " conflicting flags for %s\n"
 "(n)one, e(x)ec or sym(l)ink?"
 msgstr ""
 
 msgid "&None"
 msgstr ""
 
 msgid "E&xec"
 msgstr ""
 
 msgid "Sym&link"
 msgstr ""
 
 msgid "resolving manifests\n"
 msgstr "sto risolvendo i manifesti\n"
 
 #, python-format
 msgid ""
 " local changed %s which remote deleted\n"
 "use (c)hanged version or (d)elete?"
 msgstr ""
 
 msgid "&Changed"
 msgstr ""
 
 msgid "&Delete"
 msgstr ""
 
 #, python-format
 msgid ""
 "remote changed %s which local deleted\n"
 "use (c)hanged version or leave (d)eleted?"
 msgstr ""
 
 msgid "&Deleted"
 msgstr ""
 
+#, fuzzy
+msgid "updating"
+msgstr "sto aggiornando le tag\n"
+
 #, python-format
 msgid "update failed to remove %s: %s!\n"
 msgstr ""
 
 #, python-format
 msgid "getting %s\n"
 msgstr "sto ottenendo %s\n"
 
 #, python-format
 msgid "getting %s to %s\n"
 msgstr "sto ottenendo %s in %s\n"
 
 #, python-format
 msgid "warning: detected divergent renames of %s to:\n"
 msgstr ""
 
 #, python-format
 msgid "branch %s not found"
 msgstr "branch %s non trovata"
 
-msgid "can't merge with ancestor"
-msgstr "impossibile fare merge con un antenato"
+msgid "merging with a working directory ancestor has no effect"
+msgstr ""
 
 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
-msgstr "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
+msgstr ""
+"niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
 
 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
-msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit (usa"
-"'hg status' per elencarle)"
-
-msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
-msgstr ""
-
-msgid "crosses branches (use 'hg merge' or 'hg update -C')"
-msgstr ""
-
-msgid "crosses named branches (use 'hg update -C' to discard changes)"
+msgstr ""
+"ci sono modifiche in sospeso di cui non si è effettuato il commit (usa'hg "
+"status' per elencarle)"
+
+msgid ""
+"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
+"changes)"
+msgstr ""
+
+msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
 msgstr ""
 
 #, python-format
 msgid "cannot create %s: destination already exists"
 msgstr "impossibile creare %s: la destinazione esiste già"
 
 #, python-format
 msgid "cannot create %s: unable to create destination directory"
 msgstr "impossibile creare %s: impossibile creare la directory di destinazione"
 
 #, python-format
 msgid "unable to find '%s' for patching\n"
 msgstr ""
 
 #, python-format
 msgid "patching file %s\n"
 msgstr "sto applicando una patch al file %s\n"
 
 #, python-format
 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
 msgstr ""
 
 #, python-format
 msgid "bad hunk #%d %s (%d %d %d %d)"
 msgstr ""
 
 #, python-format
 msgid "file %s already exists\n"
 msgstr ""
 
 #, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
-msgstr ""
-
-#, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
+msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
 msgstr ""
 
 #, python-format
 msgid "Hunk #%d FAILED at %d\n"
 msgstr ""
 
 #, python-format
 msgid "bad hunk #%d"
 msgstr ""
 
 #, python-format
 msgid "bad hunk #%d old text line %d"
 msgstr ""
 
 msgid "could not extract binary patch"
 msgstr ""
 
 #, python-format
 msgid "binary patch is %d bytes, not %d"
 msgstr ""
 
 #, python-format
-msgid "unable to strip away %d dirs from %s"
+msgid "unable to strip away %d of %d dirs from %s"
 msgstr ""
 
 msgid "undefined source and destination files"
 msgstr ""
 
 #, python-format
 msgid "malformed patch %s %s"
 msgstr ""
 
 #, python-format
 msgid "unsupported parser state: %s"
 msgstr ""
 
 #, python-format
 msgid "patch command failed: %s"
 msgstr "comando patch fallito: %s"
 
 #, python-format
 msgid "Unsupported line endings type: %s"
 msgstr "Tipo di fine linea non supportato: %s"
 
+#, fuzzy
+msgid ""
+"internal patcher failed\n"
+"please report details to http://mercurial.selenic.com/bts/\n"
+"or [e-mail]\n"
+msgstr ""
+"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
+
 #, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
 msgstr "%d file modificati, %d inserimenti(+), %d cancellazioni(-)\n"
 
 #, python-format
 msgid "exited with status %d"
 msgstr "uscito con status %d"
 
 #, python-format
 msgid "killed by signal %d"
 msgstr "ucciso dal segnale %d"
 
-#, python-format
-msgid "saving bundle to %s\n"
+#, fuzzy, python-format
+msgid "saved backup bundle to %s\n"
 msgstr "sto salvando il bundle in %s\n"
 
 msgid "adding branch\n"
 msgstr ""
 
 #, python-format
+msgid "strip failed, full bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "strip failed, partial bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
 msgid "cannot %s; remote repository does not support the %r capability"
 msgstr "%s impossibile; il repository remoto non supporta la funzionalità %r"
 
 #, python-format
 msgid "unknown compression type %r"
 msgstr ""
 
+msgid "index entry flags need RevlogNG"
+msgstr ""
+
 #, python-format
 msgid "index %s unknown flags %#04x for format v0"
 msgstr ""
 
 #, python-format
 msgid "index %s unknown flags %#04x for revlogng"
 msgstr ""
 
 #, python-format
 msgid "index %s unknown format %d"
 msgstr ""
 
 #, python-format
 msgid "index %s is corrupted"
 msgstr "l'indice %s è corrotto"
 
 msgid "no node"
 msgstr "nessun nodo"
 
 msgid "ambiguous identifier"
 msgstr "identificatore ambiguo"
 
 msgid "no match found"
 msgstr ""
 
 #, python-format
 msgid "incompatible revision flag %x"
 msgstr ""
 
 #, python-format
 msgid "%s not found in the transaction"
 msgstr ""
 
 msgid "unknown base"
 msgstr "base sconosciuta"
 
 msgid "consistency error adding group"
 msgstr ""
 
+#, fuzzy
+msgid "unterminated string"
+msgstr "stringa vuota\n"
+
+#, fuzzy
+msgid "syntax error"
+msgstr "%s errore:\n"
+
+#, fuzzy
+msgid "missing argument"
+msgstr "argomenti non validi"
+
+#, python-format
+msgid "can't use %s here"
+msgstr ""
+
+msgid "can't use a list in this context"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "not a function: %s"
+msgstr "ora a: %s\n"
+
+msgid "limit wants two arguments"
+msgstr ""
+
+msgid "limit wants a number"
+msgstr ""
+
+#, fuzzy
+msgid "limit expects a number"
+msgstr "numero di revisione atteso"
+
+#, fuzzy
+msgid "ancestor wants two arguments"
+msgstr "argomenti incompatibili"
+
+#, fuzzy
+msgid "ancestor arguments must be single revisions"
+msgstr "mostra i genitori della revisione specificata"
+
+msgid "follow takes no arguments"
+msgstr ""
+
+#, fuzzy
+msgid "date wants a string"
+msgstr "una guardia non può essere una stringa vuota"
+
+msgid "keyword wants a string"
+msgstr ""
+
+#, fuzzy
+msgid "grep wants a string"
+msgstr "stringa vuota\n"
+
+msgid "author wants a string"
+msgstr ""
+
+#, fuzzy
+msgid "file wants a pattern"
+msgstr "Pattern dei Nomi dei File"
+
+msgid "contains wants a pattern"
+msgstr ""
+
+msgid "modifies wants a pattern"
+msgstr ""
+
+msgid "adds wants a pattern"
+msgstr ""
+
+msgid "removes wants a pattern"
+msgstr ""
+
+#, fuzzy
+msgid "merge takes no arguments"
+msgstr "nome della coda del merge"
+
+msgid "closed takes no arguments"
+msgstr ""
+
+#, fuzzy
+msgid "head takes no arguments"
+msgstr "argomenti non validi"
+
+msgid "sort wants one or two arguments"
+msgstr ""
+
+msgid "sort spec must be a string"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown sort key %r"
+msgstr "modalità di ordinamento sconosciuta: %s"
+
+#, fuzzy
+msgid "all takes no arguments"
+msgstr "annulla tutte le modifiche quando nessun argomento è stato fornito"
+
+#, fuzzy
+msgid "outgoing wants a repository path"
+msgstr "sto clonando il repository principale\n"
+
+msgid "tagged takes no arguments"
+msgstr ""
+
+#, fuzzy
+msgid "can't negate that"
+msgstr "impossibile fare merge con un antenato"
+
+msgid "not a symbol"
+msgstr ""
+
+#, fuzzy
+msgid "empty query"
+msgstr "stringa vuota\n"
+
+#, fuzzy
+msgid "searching for exact renames"
+msgstr "sto cercando modifiche\n"
+
+#, fuzzy
+msgid "searching for similar files"
+msgstr "sto cercando modifiche\n"
+
 #, python-format
 msgid "%s looks like a binary file."
 msgstr ""
 
 msgid "can only specify two labels."
 msgstr "possibile specificare solo due etichette."
 
 msgid "warning: conflicts during merge.\n"
 msgstr "attenzione: conflitti durante il merge.\n"
 
 #, python-format
 msgid "couldn't parse location %s"
 msgstr "non è stato possibile parsificare la posizione %s"
 
 msgid "could not create remote repo"
 msgstr "non è stato possibile creare il repository remoto"
 
 msgid "no suitable response from remote hg"
 msgstr "nessuna risposta accettabile dall'hg remoto"
 
-msgid "remote: "
-msgstr "remoto: "
-
 #, python-format
 msgid "push refused: %s"
 msgstr "push rifiutato: %s"
 
 msgid "unsynced changes"
 msgstr "modifiche non sincronizzate"
 
+#, python-format
+msgid "'%s' does not appear to be an hg repository"
+msgstr "'%s' non sembra essere un repository hg"
+
 msgid "cannot lock static-http repository"
 msgstr "impossibile bloccare il repository http statico"
 
 msgid "cannot create new static-http repository"
 msgstr "impossibile creare un nuovo repository http statico"
 
 #, python-format
 msgid "invalid entry in fncache, line %s"
 msgstr "voce non valida in fncache, linea %s"
 
+#, fuzzy, python-format
+msgid "subrepo spec file %s not found"
+msgstr "repository %s non trovato"
+
+#, fuzzy
+msgid "missing ] in subrepo source"
+msgstr "sto effettuando il push del subrepository %s\n"
+
 #, python-format
 msgid ""
 " subrepository sources for %s differ\n"
 "use (l)ocal source (%s) or (r)emote source (%s)?"
 msgstr ""
 
 msgid "&Remote"
 msgstr "&Remoto"
 
 #, python-format
 msgid ""
 " local changed subrepository %s which remote removed\n"
 "use (c)hanged version or (d)elete?"
 msgstr ""
 
 #, python-format
 msgid ""
 " remote changed subrepository %s which local removed\n"
 "use (c)hanged version or (d)elete?"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "unknown subrepo type %s"
+msgstr "modalità di ordinamento sconosciuta: %s"
+
 #, python-format
 msgid "removing subrepo %s\n"
 msgstr "sto rimuovendo il subrepository %s\n"
 
-#, python-format
-msgid "pulling subrepo %s\n"
+#, fuzzy, python-format
+msgid "pulling subrepo %s from %s\n"
 msgstr "sto effettuando il pull del subrepository %s\n"
 
-#, python-format
-msgid "pushing subrepo %s\n"
+#, fuzzy, python-format
+msgid "pushing subrepo %s to %s\n"
 msgstr "sto effettuando il push del subrepository %s\n"
 
+#, fuzzy
+msgid "cannot commit svn externals"
+msgstr "impossibile effettuare commit su una patch mq applicata"
+
+#, fuzzy, python-format
+msgid "not removing repo %s because it has changes.\n"
+msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
+
 #, python-format
 msgid "%s, line %s: %s\n"
 msgstr "%s, linea %s: %s\n"
 
 msgid "cannot parse entry"
 msgstr "impossibile parsificare la entry"
 
 #, python-format
 msgid "node '%s' is not well formed"
 msgstr "il nodo '%s' non è ben formato"
 
 msgid "unmatched quotes"
 msgstr ""
 
 #, python-format
 msgid "error expanding '%s%%%s'"
 msgstr "errore nell'espansione di '%s%%%s'"
 
 #, python-format
 msgid "unknown filter '%s'"
 msgstr "filtro sconosciuto '%s'"
 
 #, python-format
 msgid "style not found: %s"
 msgstr "stile non trovato: %s"
 
 #, python-format
 msgid "template file %s: %s"
 msgstr ""
 
 msgid "cannot use transaction when it is already committed/aborted"
 msgstr ""
 
 #, python-format
 msgid "failed to truncate %s\n"
 msgstr ""
 
 msgid "transaction abort!\n"
 msgstr "transazione abortita!\n"
 
 msgid "rollback completed\n"
 msgstr "rollback completato\n"
 
 msgid "rollback failed - please run hg recover\n"
 msgstr "rollback fallito - eseguire hg recover\n"
 
 #, python-format
 msgid "Not trusting file %s from untrusted user %s, group %s\n"
 msgstr ""
 
 #, python-format
 msgid "Ignored: %s\n"
 msgstr "Ignorato: %s\n"
 
 #, python-format
 msgid "ignoring untrusted configuration option %s.%s = %s\n"
 msgstr "ignoro l'opzione di configurazione non affidabile %s.%s = %s\n"
 
 #, python-format
 msgid "%s.%s not a boolean ('%s')"
 msgstr ""
 
 msgid "enter a commit username:"
 msgstr "inserire uno username per il commit:"
 
 #, python-format
 msgid "No username found, using '%s' instead\n"
 msgstr "Nessuno username trovato, uso '%s' invece\n"
 
-msgid "Please specify a username."
-msgstr "Si prega di specificare uno username."
+msgid "no username supplied (see \"hg help config\")"
+msgstr ""
 
 #, python-format
 msgid "username %s contains a newline\n"
 msgstr "lo username %s contiene un carattere di fine riga\n"
 
+#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr ""
+
 msgid "response expected"
 msgstr "risposta attesa"
 
 msgid "unrecognized response\n"
 msgstr "risposta non riconosciuta\n"
 
 msgid "password: "
 msgstr "password: "
 
 msgid "edit failed"
 msgstr "modifica fallita"
 
 msgid "http authorization required"
 msgstr "autorizzazione http richiesta"
 
 msgid "http authorization required\n"
 msgstr "autorizzazione http richiesta\n"
 
 #, python-format
 msgid "realm: %s\n"
 msgstr "reame: %s\n"
 
 #, python-format
 msgid "user: %s\n"
 msgstr "utente: %s\n"
 
 msgid "user:"
 msgstr "utente:"
 
 #, python-format
 msgid "http auth: user %s, password %s\n"
 msgstr "autenticazione http: utente %s, password %s\n"
 
 #, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr ""
+
+msgid "certificate checking requires Python 2.6"
+msgstr ""
+
+msgid "server identity verification succeeded\n"
+msgstr ""
+
+#, python-format
 msgid "command '%s' failed: %s"
 msgstr "comando '%s' fallito: %s"
 
 #, python-format
 msgid "path contains illegal component: %s"
 msgstr "il percorso contiene un componente non consentito: %s"
 
 #, python-format
 msgid "path %r is inside repo %r"
 msgstr "il percorso %r è all'interno del repository %r"
 
 #, python-format
 msgid "path %r traverses symbolic link %r"
 msgstr "il percorso %r attraversa il link simbolico %r"
 
 msgid "Hardlinks not supported"
 msgstr "Hardlink non supportati"
 
 #, python-format
 msgid "could not symlink to %r: %s"
 msgstr "impossibile creare un link simbolico a %r: %s"
 
 #, python-format
 msgid "invalid date: %r "
 msgstr "data non valida: %r "
 
 #, python-format
 msgid "date exceeds 32 bits: %d"
 msgstr "la data supera i 32 bit: %d"
 
 #, python-format
 msgid "impossible time zone offset: %d"
 msgstr "fuso orario impossibile: %d"
 
 #, python-format
 msgid "invalid day spec: %s"
 msgstr ""
 
 #, python-format
 msgid "%.0f GB"
 msgstr "%.0f GB"
 
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
 #, python-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #, python-format
 msgid "%.0f MB"
 msgstr "%.0f MB"
 
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #, python-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #, python-format
 msgid "%.0f KB"
 msgstr "%.0f KB"
 
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
 #, python-format
 msgid "%.2f KB"
 msgstr "%.2f KB"
 
 #, python-format
 msgid "%.0f bytes"
 msgstr "%.0f byte"
 
 msgid "cannot verify bundle or remote repos"
 msgstr "impossibile verificare bundle o repository remoti"
 
 msgid "interrupted"
 msgstr "interrotto"
 
 #, python-format
 msgid "empty or missing %s"
 msgstr "%s vuoto o mancante"
 
 #, python-format
 msgid "data length off by %d bytes"
 msgstr ""
 
 #, python-format
 msgid "index contains %d extra bytes"
 msgstr "l'indice contiene %d extra byte"
 
 #, python-format
 msgid "warning: `%s' uses revlog format 1"
 msgstr "attenzione: `%s' usa il formato di revlog 1"
 
 #, python-format
 msgid "warning: `%s' uses revlog format 0"
 msgstr "attenzione: `%s' usa il formato di revlog 0"
 
 #, python-format
 msgid "rev %d points to nonexistent changeset %d"
 msgstr "rev %d punta al changeset non esistente %d"
 
 #, python-format
 msgid "rev %d points to unexpected changeset %d"
 msgstr "rev %d punta al changeset inatteso %d"
 
 #, python-format
 msgid " (expected %s)"
 msgstr "(atteso %s)"
 
 #, python-format
 msgid "unknown parent 1 %s of %s"
 msgstr "genitore 1 %s di %s sconosciuto"
 
 #, python-format
 msgid "unknown parent 2 %s of %s"
 msgstr "genitore 2 %s di %s sconosciuto"
 
 #, python-format
 msgid "checking parents of %s"
 msgstr "sto controllando i genitori di %s"
 
 #, python-format
 msgid "duplicate revision %d (%d)"
 msgstr "revisione duplicata %d (%d)"
 
+msgid "abandoned transaction found - run hg recover\n"
+msgstr ""
+
 #, python-format
 msgid "repository uses revlog format %d\n"
 msgstr "il repository usa il formato di revlog %d\n"
 
 msgid "checking changesets\n"
 msgstr "sto controllando i changeset\n"
 
 #, python-format
 msgid "unpacking changeset %s"
 msgstr "sto spacchettando il changeset %s"
 
 msgid "checking manifests\n"
 msgstr "sto controllando i manifesti\n"
 
 #, python-format
 msgid "%s not in changesets"
 msgstr "%s non è nei changeset"
 
 msgid "file without name in manifest"
 msgstr "file senza nome nel manifesto"
 
 #, python-format
 msgid "reading manifest delta %s"
 msgstr "sto leggendo il delta del manifesto %s"
 
 msgid "crosschecking files in changesets and manifests\n"
-msgstr "sto facendo un controllo incrociato sui file nei changeset e nei manifesti\n"
+msgstr ""
+"sto facendo un controllo incrociato sui file nei changeset e nei manifesti\n"
+
+msgid "crosschecking"
+msgstr ""
 
 #, python-format
 msgid "changeset refers to unknown manifest %s"
 msgstr "il changeset si riferisce ad un manifesto sconosciuto %s"
 
 msgid "in changeset but not in manifest"
 msgstr "nel changeset ma non nel manifesto"
 
 msgid "in manifest but not in changeset"
 msgstr "nel manifesto ma non nel changeset"
 
 msgid "checking files\n"
 msgstr "sto controllando i file\n"
 
 #, python-format
 msgid "cannot decode filename '%s'"
 msgstr "impossibile decodificare il nome del file '%s'"
 
+#, fuzzy
+msgid "checking"
+msgstr "sto controllando i file\n"
+
 #, python-format
 msgid "broken revlog! (%s)"
 msgstr "revlog danneggiato! (%s)"
 
 msgid "missing revlog!"
 msgstr "revlog mancante!"
 
 #, python-format
 msgid "%s not in manifests"
 msgstr "%s non è nei manifesti"
 
 #, python-format
 msgid "unpacked size is %s, %s expected"
 msgstr "la dimensione spacchettata è %s, attesa %s"
 
 #, python-format
 msgid "unpacking %s"
 msgstr "sto spacchettando %s"
 
 #, 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 ""
 
 #, python-format
 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
 msgstr ""
 
 #, python-format
 msgid "checking rename of %s"
 msgstr "sto controllando la rinomina di %s"
 
 #, python-format
 msgid "%s in manifests not found"
 msgstr "%s non trovato nei manifesti"
 
 #, python-format
 msgid "warning: orphan revlog '%s'"
 msgstr "attenzione: revlog '%s' orfano"
 
 #, python-format
 msgid "%d files, %d changesets, %d total revisions\n"
 msgstr "%d file, %d changeset, %d revisioni totali\n"
 
 #, python-format
 msgid "%d warnings encountered!\n"
 msgstr "%d warning incontrati!\n"
 
 #, python-format
 msgid "%d integrity errors encountered!\n"
 msgstr "%d errori di integrit incontrati!\n"
 
 #, python-format
 msgid "(first damaged changeset appears to be %d)\n"
 msgstr "(il primo changeset danneggiato sembra essere %d)\n"
 
 msgid "user name not available - set USERNAME environment variable"
-msgstr "nome utente non disponibile - impostare la variabile d'ambiente USERNAME"
+msgstr ""
+"nome utente non disponibile - impostare la variabile d'ambiente USERNAME"
+
+#~ msgid "COMMANDS"
+#~ msgstr "COMANDI"
+
+#~ msgid "generating stats: %d%%"
+#~ msgstr "sto generando le statistiche: %d%%"
+
+#~ msgid "show progress"
+#~ msgstr "mostra progresso"
+
+#~ msgid "don't colorize output (DEPRECATED)"
+#~ msgstr "non colorare l'output (DEPRECATO)"
+
+#~ msgid "no tags found at revision %d\n"
+#~ msgstr "nessuna tag trovata alla revisione %d\n"
+
+#, fuzzy
+#~ msgid "show keyword status flags of all files (DEPRECATED)"
+#~ msgstr "mostra lo stato di tutti i file"
+
+#~ msgid ""
+#~ "\n"
+#~ "imported patch %s"
+#~ msgstr ""
+#~ "\n"
+#~ "patch %s importata"
+
+#~ msgid "force removal with local changes"
+#~ msgstr "forza la rimozione con modifiche locali"
+
+#~ msgid "rebase from a given revision"
+#~ msgstr "rebase da una data revisione"
+
+#~ msgid "rebase from the base of a given revision"
+#~ msgstr "rebase dalla base di una data revisione"
+
+#~ msgid "rebase onto a given revision"
+#~ msgstr "rebase su una data revisione"
+
+#~ msgid "y - record this change"
+#~ msgstr "y - registra questa modifica"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "    This is the symmetrical operation for pull. It moves changes from\n"
+#~ "    the current repository to a different one. If the destination is\n"
+#~ "    local this is identical to a pull in that directory from the\n"
+#~ "    current one."
+#~ msgstr ""
+#~ "    Questa è l'operazione simmetrica di pull. Aiuta a spostare modifiche\n"
+#~ "    dal repository corrente in un altro. Se la destinazione è locale "
+#~ "questo\n"
+#~ "    è identico ad un pull in quella directory verso questa."
+
+#, fuzzy
+#~ msgid ""
+#~ "    By default, push will refuse to run if it detects the result would\n"
+#~ "    increase the number of remote heads. This generally indicates the\n"
+#~ "    user forgot to pull and merge before pushing."
+#~ msgstr ""
+#~ "    Di default, il push verrà rifiutato se viene rivelato che aumenterà "
+#~ "il\n"
+#~ "    numerdo di head remote. Questo generalmente indica che il client ha\n"
+#~ "    dimenticato di fare pull e merge prima del push."
+
+#, fuzzy
+#~ msgid ""
+#~ "    (Use update -r to check out earlier revisions, revert does not\n"
+#~ "    change the working directory parents.)"
+#~ msgstr ""
+#~ "    (usare update -r per effettuare il checkout di revisioni\n"
+#~ "    precedenti, revert non cambia i genitori della directory di\n"
+#~ "    lavoro)"
+
+#, fuzzy
+#~ msgid "export the repository via HTTP"
+#~ msgstr "esporta il repository via HTTP"
+
+#, fuzzy
+#~ msgid "    Start a local HTTP repository browser and pull server."
+#~ msgstr "    Avvia un server HTTP locale per il pull e la navigazione."
+
+#, fuzzy
+#~ msgid ""
+#~ "    Update the repository's working directory to the specified\n"
+#~ "    revision, or the tip of the current branch if none is specified.\n"
+#~ "    Use null as the revision to remove the working copy (like 'hg\n"
+#~ "    clone -U')."
+#~ msgstr ""
+#~ "    Aggiorna la directory di lavoro del repository ad una revisione\n"
+#~ "    specifica, o al tip della branch corrente se nessuna è stata\n"
+#~ "    specificata. Usare null come revisione per rimuovere la copia di\n"
+#~ "    lavoro (come 'hg clone -U')."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When the working directory contains no uncommitted changes, it\n"
+#~ "    will be replaced by the state of the requested revision from the\n"
+#~ "    repository. When the requested revision is on a different branch,\n"
+#~ "    the working directory will additionally be switched to that\n"
+#~ "    branch."
+#~ msgstr ""
+#~ "    Quando la directory di lavoro non contiene modifiche di cui non si\n"
+#~ "    è eseguito il commit, sarà rimpiazzata dallo stato della revisione\n"
+#~ "    richiesta dal repository. Quando la revisione richiesta è su una\n"
+#~ "    branch differente, la directory di lavoro verrà inoltre spostata\n"
+#~ "    su quella branch."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When there are uncommitted changes, use option -C/--clean to\n"
+#~ "    discard them, forcibly replacing the state of the working\n"
+#~ "    directory with the requested revision. Alternately, use -c/--check\n"
+#~ "    to abort."
+#~ msgstr ""
+#~ "    Quandi ci sono modifiche di cui non si è eseguito il commit, usare\n"
+#~ "    l'opzione -C per scartarle, forzando la sostituzione dello stato\n"
+#~ "    della directory di lavoro con la revisione richiesta."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When there are uncommitted changes and option -C/--clean is not\n"
+#~ "    used, and the parent revision and requested revision are on the\n"
+#~ "    same branch, and one of them is an ancestor of the other, then the\n"
+#~ "    new working directory will contain the requested revision merged\n"
+#~ "    with the uncommitted changes. Otherwise, the update will fail with\n"
+#~ "    a suggestion to use 'merge' or 'update -C' instead."
+#~ msgstr ""
+#~ "    Quando ci sono modifiche di cui non si è eseguito il commit,\n"
+#~ "    l'opzione -C non è usata, la revisione del genitore e di quella\n"
+#~ "    richiesta sono sulla stessa branch e una di queste è un antenato\n"
+#~ "    dell'altro, allora la nuova directory di lavoro conterrà la\n"
+#~ "    revisione richiesta unita con le modifiche non salvate. Altrimenti\n"
+#~ "    l'aggiornamento fallirà con un suggerimento di usare invece\n"
+#~ "    'merge' o 'update -C'."
+
+#~ msgid "a changeset up to which you would like to bundle"
+#~ msgstr "un changeset fino al quale si desidera effettuare il bundle"
+
+#~ msgid "a changeset you would like to have after cloning"
+#~ msgstr "un changeset che si desidera avere dopo il clone"
+
+#, fuzzy
+#~ msgid "show only the active branch heads from open branches"
+#~ msgstr "mostra solo le head attive dalle branch aperte"
+
+#, fuzzy
+#~ msgid "[-r STARTREV] [REV]..."
+#~ msgstr "[-r REV] [REV]..."
+
+#~ msgid "a specific revision up to which you would like to pull"
+#~ msgstr "una specifica revisione fino alla quale si desidera fare il pull"
+
+#~ msgid "a specific revision up to which you would like to push"
+#~ msgstr ""
+#~ "una specifica revisione fino alla quale si desidera effettuare il push"
+
+#~ msgid "revision to revert to"
+#~ msgstr "revisione a cui annullare"
+
+#~ msgid "overwrite locally modified files (no backup)"
+#~ msgstr "sovrascrivi file modificati localmente (nessun backup)"
+
+#~ msgid "abort: could not import module %s!\n"
+#~ msgstr "abortito: non è stato possibile importare %s!\n"
+
+#~ msgid "journal already exists - run hg recover"
+#~ msgstr "il journal esiste già - eseguire hg recover"
+
+#~ msgid ""
+#~ "%s: files over 10MB may cause memory and performance problems\n"
+#~ "(use 'hg revert %s' to unadd the file)\n"
+#~ msgstr ""
+#~ "%s: file oltre i 10MB potrebbero causare problemi di memoria\n"
+#~ "e performance (usare 'hg revert %s' per annullare l'aggiunta\n"
+#~ "del file)\n"