i18n-it: synchronized with e06c940d554d

i18n/it.po

@@ -1,9510 +1,9085 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: \n"
-"POT-Creation-Date: 2009-03-27 18:18+0100\n"
-"PO-Revision-Date: 2009-03-03 20:05+0100\n"
+"Report-Msgid-Bugs-To: <[e-mail]>\n"
+"POT-Creation-Date: 2009-10-25 12:38+0100\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"
 
-msgid "    options:\n"
+#, fuzzy
+msgid ""
+"    options:\n"
+"\n"
 msgstr "    opzioni:\n"
 
 #, python-format
 msgid ""
 "    aliases: %s\n"
 "\n"
 msgstr ""
 "    alias: %s\n"
 "\n"
 
-msgid "return tuple of (match function, list enabled)."
-msgstr "restituisce una tupla di (funzione match, elenco abilitato)."
-
-#, python-format
-msgid "acl: %s not enabled\n"
-msgstr "acl: %s non abilitato\n"
-
-#, python-format
-msgid "acl: %s enabled, %d entries for user %s\n"
-msgstr "acl: %s abilitato, %d entry per l'utente %s\n"
+msgid ""
+"Some commands allow the user to specify a date, e.g.:\n"
+"\n"
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date.\n"
+"\n"
+"Many date formats are valid. Here are some examples::\n"
+"\n"
+"  \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+"  \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+"  \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+"  \"Dec 6\" (midnight)\n"
+"  \"13:18\" (today assumed)\n"
+"  \"3:39\" (3:39AM assumed)\n"
+"  \"3:39pm\" (15:39)\n"
+"  \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+"  \"2006-12-6 13:18\"\n"
+"  \"2006-12-6\"\n"
+"  \"12-6\"\n"
+"  \"12/6\"\n"
+"  \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"Lastly, there is Mercurial's internal format::\n"
+"\n"
+"  \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC).\n"
+"\n"
+"The log command also accepts date ranges::\n"
+"\n"
+"  \"<{datetime}\" - at or before a given date/time\n"
+"  \">{datetime}\" - on or after a given date/time\n"
+"  \"{datetime} to {datetime}\" - a date range, inclusive\n"
+"  \"-{days}\" - within a given number of days of today\n"
+msgstr ""
+
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools.\n"
+"\n"
+"While this standard format is often enough, it does not encode the\n"
+"following information:\n"
+"\n"
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files\n"
+"\n"
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format.\n"
+"\n"
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with \"hg export\"), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes.\n"
+"\n"
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your hgrc. You do not need to set this option when\n"
+"importing diffs in this format or using them in the mq extension.\n"
+msgstr ""
+
+msgid ""
+"HG\n"
+"    Path to the 'hg' executable, automatically passed when running\n"
+"    hooks, extensions or external tools. If unset or empty, this is\n"
+"    the hg executable's name if it's frozen, or an executable named\n"
+"    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+"    Windows) is searched.\n"
+"\n"
+"HGEDITOR\n"
+"    This is the name of the editor to run when committing. See EDITOR.\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"HGENCODING\n"
+"    This overrides the default locale setting detected by Mercurial.\n"
+"    This setting is used to convert data including usernames,\n"
+"    changeset descriptions, tag names, and branches. This setting can\n"
+"    be overridden with the --encoding command-line option.\n"
+"\n"
+"HGENCODINGMODE\n"
+"    This sets Mercurial's behavior for handling unknown characters\n"
+"    while transcoding user input. The default is \"strict\", which\n"
+"    causes Mercurial to abort if it can't map a character. Other\n"
+"    settings include \"replace\", which replaces unknown characters, and\n"
+"    \"ignore\", which drops them. This setting can be overridden with\n"
+"    the --encodingmode command-line option.\n"
+"\n"
+"HGMERGE\n"
+"    An executable to use for resolving merge conflicts. The program\n"
+"    will be executed with three arguments: local file, remote file,\n"
+"    ancestor file.\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"HGRCPATH\n"
+"    A list of files or directories to search for hgrc files. Item\n"
+"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
+"    platform default search path is used. If empty, only the .hg/hgrc\n"
+"    from the current repository is read.\n"
+"\n"
+"    For each element in HGRCPATH:\n"
+"\n"
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
+"    This is the string used as the author of a commit. If not set,\n"
+"    available values will be considered in this order:\n"
+"\n"
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with '@hostname' appended)\n"
+"\n"
+"    (deprecated, use .hgrc)\n"
+"\n"
+"EMAIL\n"
+"    May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"LOGNAME\n"
+"    May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"VISUAL\n"
+"    This is the name of the editor to use when committing. See EDITOR.\n"
+"\n"
+"EDITOR\n"
+"    Sometimes Mercurial needs to open a text file in an editor for a\n"
+"    user to modify, for example when writing commit messages. The\n"
+"    editor it uses is determined by looking at the environment\n"
+"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+"    non-empty one is chosen. If all of them are empty, the editor\n"
+"    defaults to 'vi'.\n"
+"\n"
+"PYTHONPATH\n"
+"    This is used by Python to find imported modules and may need to be\n"
+"    set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks.\n"
+"\n"
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed.\n"
+"\n"
+"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"the Python search path, create an entry for it in your hgrc, like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  foo =\n"
+"\n"
+"You may also specify the full path to an extension::\n"
+"\n"
+"  [extensions]\n"
+"  myfeature = ~/.hgext/myfeature.py\n"
+"\n"
+"To explicitly disable an extension enabled in an hgrc of broader\n"
+"scope, prepend its path with !::\n"
+"\n"
+"  [extensions]\n"
+"  # disabling extension bar residing in /path/to/extension/bar.py\n"
+"  hgext.bar = !/path/to/extension/bar.py\n"
+"  # ditto, but no path was supplied for extension baz\n"
+"  hgext.baz = !\n"
+msgstr ""
+
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character.\n"
+"\n"
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
+"\n"
+"If BEGIN is greater than END, revisions are treated in reverse order.\n"
+"\n"
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time.\n"
+"\n"
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns.\n"
+"\n"
+"Alternate pattern notations must be specified explicitly.\n"
+"\n"
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root.\n"
+"\n"
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``.\n"
+"\n"
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\".\n"
+"\n"
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository.\n"
+"\n"
+"Plain examples::\n"
+"\n"
+"  path:foo/bar   a name bar in a directory named foo in the root\n"
+"                 of the repository\n"
+"  path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"Glob examples::\n"
+"\n"
+"  glob:*.c       any name ending in \".c\" in the current directory\n"
+"  *.c            any name ending in \".c\" in the current directory\n"
+"  **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                 current directory including itself.\n"
+"  foo/*.c        any name ending in \".c\" in the directory foo\n"
+"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                 including itself.\n"
+"\n"
+"Regexp examples::\n"
+"\n"
+"  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+
+msgid ""
+"Mercurial supports several ways to specify individual revisions.\n"
+"\n"
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth.\n"
+"\n"
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier.\n"
+"\n"
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier.\n"
+"\n"
+"Any other string is treated as a tag or branch name. A tag name is a\n"
+"symbolic name associated with a revision identifier. A branch name\n"
+"denotes the tipmost revision of that branch. Tag and branch names must\n"
+"not contain the \":\" character.\n"
+"\n"
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision.\n"
+"\n"
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0.\n"
+"\n"
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+
+msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style).\n"
+"\n"
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog.\n"
+"\n"
+"Three styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact and changelog.\n"
+"Usage::\n"
+"\n"
+"    $ hg log -r1 --style changelog\n"
+"\n"
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::\n"
+"\n"
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:\n"
+"\n"
+":author:    String. The unmodified author of the changeset.\n"
+":branches:  String. The name of the branch on which the changeset\n"
+"            was committed. Will be empty if the branch name was\n"
+"            default.\n"
+":date:      Date information. The date when the changeset was\n"
+"            committed.\n"
+":desc:      String. The text of the changeset description.\n"
+":diffstat:  String. Statistics of changes with the following\n"
+"            format: \"modified files: +added/-removed lines\"\n"
+":files:     List of strings. All files modified, added, or removed\n"
+"            by this changeset.\n"
+":file_adds: List of strings. Files added by this changeset.\n"
+":file_mods: List of strings. Files modified by this changeset.\n"
+":file_dels: List of strings. Files removed by this changeset.\n"
+":node:      String. The changeset identification hash, as a\n"
+"            40-character hexadecimal string.\n"
+":parents:   List of strings. The parents of the changeset.\n"
+":rev:       Integer. The repository-local changeset revision\n"
+"            number.\n"
+":tags:      List of strings. Any tags associated with the\n"
+"            changeset.\n"
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+"            changeset.\n"
+":latesttagdistance: Integer. Longest path to the latest tag.\n"
+"\n"
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. You can also use a chain of filters to get the desired\n"
+"output::\n"
+"\n"
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000\n"
+"\n"
+"List of filters:\n"
+"\n"
+":addbreaks:   Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"              every line except the last.\n"
+":age:         Date. Returns a human-readable date/time difference\n"
+"              between the given date/time and the current\n"
+"              date/time.\n"
+":basename:    Any text. Treats the text as a path, and returns the\n"
+"              last component of the path after splitting by the\n"
+"              path separator (ignoring trailing separators). For\n"
+"              example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
+"              becomes \"bar\".\n"
+":stripdir:    Treat the text as path and strip a directory level,\n"
+"              if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+"              \"foo\".\n"
+":date:        Date. Returns a date in a Unix date format, including\n"
+"              the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+":domain:      Any text. Finds the first string that looks like an\n"
+"              email address, and extracts just the domain\n"
+"              component. Example: 'User <[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::\n"
+"\n"
+"  local/filesystem/path[#revision]\n"
+"  file://local/filesystem/path[#revision]\n"
+"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
+"\n"
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"incoming --bundle').\n"
+"\n"
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also 'hg help\n"
+"revisions'.\n"
+"\n"
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server.\n"
+"\n"
+"Some notes about using SSH with Mercurial:\n"
+"\n"
+"- SSH requires an accessible shell account on the destination machine\n"
+"  and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+"  an extra slash at the start of a path to specify an absolute path::\n"
+"\n"
+"    ssh://example.com//tmp/repository\n"
+"\n"
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+"  to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
+"    Host *.mylocalnetwork.example.com\n"
+"      Compression no\n"
+"    Host *\n"
+"      Compression yes\n"
+"\n"
+"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
+"  with the --ssh command line option.\n"
+"\n"
+"These URLs can all be stored in your hgrc with path aliases under the\n"
+"[paths] section like so::\n"
+"\n"
+"  [paths]\n"
+"  alias1 = URL1\n"
+"  alias2 = URL2\n"
+"  ...\n"
+"\n"
+"You can then use the alias for any command that uses a URL (for\n"
+"example 'hg pull alias1' would pull from the 'alias1' path).\n"
+"\n"
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:\n"
+"\n"
+"default:\n"
+"  When you create a repository with hg clone, the clone command saves\n"
+"  the location of the source repository as the new repository's\n"
+"  'default' path. This is then used when you omit path from push- and\n"
+"  pull-like commands (including incoming and outgoing).\n"
+"\n"
+"default-push:\n"
+"  The push command will look for a path named 'default-push', and\n"
+"  prefer it over 'default' if both are defined.\n"
+msgstr ""
+
+msgid ""
+"hooks for controlling repository access\n"
+"\n"
+"This hook makes it possible to allow or deny write access to portions\n"
+"of a repository when receiving incoming changesets.\n"
+"\n"
+"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).\n"
+"\n"
+"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.\n"
+"\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.acl =\n"
+"\n"
+"  [hooks]\n"
+"  pretxnchangegroup.acl = python:hgext.acl.hook\n"
+"\n"
+"  [acl]\n"
+"  # Check whether the source of incoming changes is in this list\n"
+"  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
+"  sources = serve\n"
+"\n"
+"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. ::\n"
+"\n"
+"  [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\n"
+"\n"
+"  [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"
 
 #, python-format
-msgid "acl: changes have source \"%s\" - skipping\n"
-msgstr "acl: le modifiche hanno sorgente \"%s\" - saltato\n"
-
-#, python-format
-msgid "acl: user %s denied on %s\n"
-msgstr "acl: utente %s bloccato su %s\n"
-
-#, python-format
 msgid "acl: access denied for changeset %s"
 msgstr "acl: accesso negato per il changeset %s"
 
-#, python-format
-msgid "acl: user %s not allowed on %s\n"
-msgstr "acl: l'utente %s non pu avere accesso a %s\n"
-
-#, python-format
-msgid "acl: allowing changeset %s\n"
-msgstr "acl: consentendo il changeset %s\n"
-
-msgid ""
-"allow user-defined command aliases\n"
-"\n"
-"To use, create entries in your hgrc of the form\n"
-"\n"
-"[alias]\n"
-"mycmd = cmd --args\n"
-msgstr ""
-"consente alias definiti dall'utente\n"
-"\n"
-"Per usarlo, crea entry nel tuo hgrc della forma\n"
-"\n"
-"[alias]\n"
-"mycmd = cmd --args\n"
-
-msgid ""
-"defer command lookup until needed, so that extensions loaded\n"
-"    after alias can be aliased"
-msgstr ""
-"ritarda la ricerca del comando fin quando necessario, in modo che si "
-"attivino gli alias\n"
-"    per le estensioni caricate dopo alias"
-
-#, python-format
-msgid "*** [alias] %s: command %s is unknown"
-msgstr "*** [alias] %s: il comando %s  sconosciuto"
-
-#, python-format
-msgid "*** [alias] %s: command %s is ambiguous"
-msgstr "*** [alias] %s: il comando %s  ambiguo"
-
-#, python-format
-msgid "*** [alias] %s: circular dependency on %s"
-msgstr "*** [alias] %s: dipendenza circolare su %s"
-
-#, python-format
-msgid "*** [alias] %s: no definition\n"
-msgstr "*** [alias] %s: nessuna definizione\n"
-
-msgid ""
-"mercurial bookmarks\n"
-"\n"
-"Mercurial bookmarks are local moveable pointers to changesets. Every\n"
-"bookmark points to a changeset identified by its hash. If you commit a\n"
+#, fuzzy
+msgid ""
+"track a line of development with movable markers\n"
+"\n"
+"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 is forwarded to the new changeset.\n"
+"bookmark shifts to the new changeset.\n"
 "\n"
 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
 "merge, hg update).\n"
 "\n"
-"The bookmark extension offers the possiblity to have a more git-like "
-"experience\n"
-"by adding the following configuration option to your .hgrc:\n"
-"\n"
-"[bookmarks]\n"
-"track.current = True\n"
-"\n"
-"This will cause bookmarks to track the bookmark that you are currently on, "
-"and\n"
-"just updates it. This is similar to git's approach of branching.\n"
+"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::\n"
+"\n"
+"  [bookmarks]\n"
+"  track.current = True\n"
+"\n"
+"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 ""
 "mercurial bookmarks\n"
 "\n"
 "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"
 "changeset basato su un changeset che ha un segnalibro, \n"
 "il segnalibro  spostato sul nuovo changeset\n"
 "\n"
 "E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es. hg\n"
 "merge, hg update).\n"
 "\n"
 "L'estensione bookmark offre la possibilit di avere un'esperienza pi simile a "
 "git\n"
 "aggiungendo la seguente opzione di configurazione al tuo .hgrc:\n"
 "\n"
 "[bookmarks]\n"
 "track.current = True\n"
 "\n"
 "Questo porter i segnalibri a tener traccia del segnalibro su cui sei "
 "attualmente,e\n"
 "ad aggiornarlo. Questo  simile all'approccio di branching di git.\n"
 
 msgid ""
-"Parse .hg/bookmarks file and return a dictionary\n"
-"\n"
-"    Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n"
-"    in the .hg/bookmarks file. They are read by the parse() method and\n"
-"    returned as a dictionary with name => hash values.\n"
-"\n"
-"    The parsed dictionary is cached until a write() operation is done.\n"
-"    "
-msgstr ""
-"Parsifica il file .hg/bookmarks e restituisce un dizionario\n"
-"\n"
-"    I segnalibri sono memorizzati nel file .hg/bookmarks come \n"
-"    valori {HASH}\\s{NAME} (formato di localtags).\n"
-"    Sono letti dal metodo parse() e restituiti come dizionario con \n"
-"    nome => valore di hash.\n"
-"\n"
-"    Il dizionario parsificato viene memorizzato in cache finchè\n"
-"    un'operazione di write() non viene eseguita.\n"
-"    "
-
-msgid ""
-"Write bookmarks\n"
-"\n"
-"    Write the given bookmark => hash dictionary to the .hg/bookmarks file\n"
-"    in a format equal to those of localtags.\n"
-"\n"
-"    We also store a backup of the previous state in undo.bookmarks that\n"
-"    can be copied back on rollback.\n"
-"    "
-msgstr ""
-"Scrive segnalibri\n"
-"\n"
-"    Scrive il dato dizionario segnalibro => hash nel file\n"
-"    .hg/bookmarks nello stesso formato di localtags.\n"
-"\n"
-"    Viene anche effettuato un backup dello stato\n"
-"    precedente in undo.bookmarks che può essere\n"
-"    ripristinato con rollback.\n"
-"    "
-
-msgid ""
-"Get the current bookmark\n"
-"\n"
-"    If we use gittishsh branches we have a current bookmark that\n"
-"    we are on. This function returns the name of the bookmark. It\n"
-"    is stored in .hg/bookmarks.current\n"
-"    "
-msgstr ""
-"Ottiene il segnalibro corrente\n"
-"\n"
-"    Se si usano branch in stile git si ha un segnalibro\n"
-"    corrente attivo. Questa funzione restituisce il\n"
-"    nome del segnalibro. Questi è memorizzato in\n"
-"    .hg/bookmarks.current\n"
-"    "
-
-msgid ""
-"Set the name of the bookmark that we are currently on\n"
-"\n"
-"    Set the name of the bookmark that we are on (hg update <bookmark>).\n"
-"    The name is recoreded in .hg/bookmarks.current\n"
-"    "
-msgstr ""
-"Imposta il nome del segnalibro sul quale ci si trova attualmente\n"
-"\n"
-"    Imposta il nome del segnalibro sul quale ci si trova\n"
-"    (hg update <bookmark>). Il nome viene memorizzato in\n"
-"    .hg/bookmarks.current\n"
-"    "
-
-msgid ""
-"mercurial bookmarks\n"
+"track a line of development with movable markers\n"
 "\n"
 "    Bookmarks are pointers to certain commits that move when\n"
-"    commiting. Bookmarks are local. They can be renamed, copied and\n"
-"    deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n"
-"    update' to update to a given bookmark.\n"
-"\n"
-"    You can use 'hg bookmark NAME' to set a bookmark on the current\n"
-"    tip with the given name. If you specify a revision using -r REV\n"
-"    (where REV may be an existing bookmark), the bookmark is set to\n"
-"    that revision.\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.\n"
+"\n"
+"    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"
 
 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 ""
-"Strip bookmarks if revisions are stripped using\n"
-"    the mercurial.strip method. This usually happens during\n"
-"    qpush and qpop"
-msgstr ""
-"Elimina i segnalibri se revisioni sono rimosse usando il metodo\n"
-"    mercurial.strip. Questo di norma succede durante qpush e qpop"
-
-msgid ""
-"Add a revision to the repository and\n"
-"            move the bookmark"
-msgstr ""
-"Aggiunge una revisione al repository e\n"
-"            sposta il segnalibro"
-
-msgid "Merge bookmarks with normal tags"
-msgstr "Fa il merge dei segnalibri con tag normali"
-
-msgid ""
-"Set the current bookmark\n"
-"\n"
-"    If the user updates to a bookmark we update the .hg/bookmarks.current\n"
-"    file.\n"
-"    "
-msgstr ""
-"Imposta il segnalibro corrente\n"
-"\n"
-"    Se l'utente fa l'update ad un segnalibro viene aggiornato il file\n"
-"    .hg/bookmarks.current\n"
-"    "
-
 msgid "force"
 msgstr "forza"
 
 msgid "revision"
 msgstr "revisione"
 
 msgid "delete a given bookmark"
 msgstr "elimina un dato segnalibro"
 
 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 ""
-"Bugzilla integration\n"
+"hooks for integrating with the Bugzilla bug tracker\n"
 "\n"
 "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 bug\n"
-"status.\n"
-"\n"
-"The hook updates the Bugzilla database directly. Only Bugzilla "
-"installations\n"
-"using MySQL are supported.\n"
-"\n"
-"The hook relies on a Bugzilla script to send bug change notification "
-"emails.\n"
-"That script changes between Bugzilla versions; the 'processmail' script "
-"used\n"
-"prior to 2.18 is replaced in 2.18 and subsequent versions by\n"
-"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the "
+"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
+"bug status.\n"
+"\n"
+"The hook updates the Bugzilla database directly. Only Bugzilla\n"
+"installations using MySQL are supported.\n"
+"\n"
+"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.\n"
+"\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+"  Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+"  Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
 "user\n"
-"pushing the change; you will need to ensure the Bugzilla install file\n"
-"permissions are set appropriately.\n"
-"\n"
-"Configuring the extension:\n"
-"\n"
-"    [bugzilla]\n"
-"    host       Hostname of the MySQL server holding the Bugzilla database.\n"
-"    db         Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-"    user       Username to use to access MySQL server. Default 'bugs'.\n"
-"    password   Password to use to access MySQL server.\n"
-"    timeout    Database connection timeout (seconds). Default 5.\n"
-"    version    Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 "
-"and\n"
-"               later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n"
-"               versions prior to 2.18.\n"
-"    bzuser     Fallback Bugzilla user name to record comments with, if\n"
-"               changeset committer cannot be found as a Bugzilla user.\n"
-"    bzdir      Bugzilla install directory. Used by default notify.\n"
-"               Default '/var/www/html/bugzilla'.\n"
-"    notify     The command to run to get Bugzilla to send bug change\n"
-"               notification emails. Substitutes from a map with 3 keys,\n"
-"               'bzdir', 'id' (bug id) and 'user' (committer bugzilla "
-"email).\n"
-"               Default depends on version; from 2.18 it is\n"
-"               \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %"
-"(user)s\".\n"
-"    regexp     Regular expression to match bug IDs in changeset commit "
-"message.\n"
-"               Must contain one \"()\" group. The default expression "
-"matches\n"
-"               'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n"
-"               'Bugs 1234,5678', 'Bug 1234 and 5678' and variations "
-"thereof.\n"
-"               Matching is case insensitive.\n"
-"    style      The style file to use when formatting comments.\n"
-"    template   Template to use when formatting comments. Overrides\n"
-"               style if specified. In addition to the usual Mercurial\n"
-"               keywords, the extension specifies:\n"
-"                   {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.\n"
-"               Default 'changeset {node|short} in repo {root} refers '\n"
-"                       'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-"    strip      The number of slashes to strip from the front of {root}\n"
-"               to produce {webroot}. Default 0.\n"
-"    usermap    Path of file containing Mercurial committer ID to Bugzilla "
-"user\n"
-"               ID mappings. If specified, the file should contain one "
-"mapping\n"
-"               per line, \"committer\"=\"Bugzilla user\". See also the\n"
-"               [usermap] section.\n"
-"\n"
-"    [usermap]\n"
-"    Any entries in this section specify mappings of Mercurial committer ID\n"
-"    to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"    \"committer\"=\"Bugzilla user\"\n"
-"\n"
-"    [web]\n"
-"    baseurl    Base URL for browsing Mercurial repositories. Reference from\n"
-"               templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"  Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+"  Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+"  Database connection timeout (seconds). Default 5.\n"
+"\n"
+"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.\n"
+"\n"
+"bzuser\n"
+"  Fallback Bugzilla user name to record comments with, if changeset\n"
+"  committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+"   Bugzilla install directory. Used by default notify. Default\n"
+"   '/var/www/html/bugzilla'.\n"
+"\n"
+"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\".\n"
+"\n"
+"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.\n"
+"\n"
+"style\n"
+"  The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+"  Template to use when formatting comments. Overrides style if\n"
+"  specified. In addition to the usual Mercurial keywords, the\n"
+"  extension specifies::\n"
+"\n"
+"    {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.\n"
+"\n"
+"  Default 'changeset {node|short} in repo {root} refers '\n"
+"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+"  The number of slashes to strip from the front of {root} to produce\n"
+"  {webroot}. Default 0.\n"
+"\n"
+"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.\n"
+"\n"
+"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\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+"  Base URL for browsing Mercurial repositories. Reference from\n"
+"  templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
 "\n"
 "    [extensions]\n"
 "    hgext.bugzilla =\n"
 "\n"
 "    [hooks]\n"
 "    # run bugzilla hook on every change pulled or pushed in here\n"
 "    incoming.bugzilla = python:hgext.bugzilla.hook\n"
 "\n"
 "Example configuration:\n"
 "\n"
-"This example configuration is for a collection of Mercurial repositories\n"
-"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n"
-"/opt/bugzilla-3.2.\n"
+"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. ::\n"
 "\n"
 "    [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"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
 "    strip=5\n"
 "\n"
 "    [web]\n"
 "    baseurl=http://dev.domain.com/hg\n"
 "\n"
 "    [usermap]\n"
 "    [e-mail]=[e-mail]\n"
 "\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
 "\n"
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
 "\n"
 "    Changeset commit comment. Bug 1234.\n"
 msgstr ""
 
-msgid "support for bugzilla version 2.16."
-msgstr "supporto per la versione di bugzilla 2.16."
-
 #, python-format
 msgid "connecting to %s:%s as %s, password %s\n"
 msgstr "sto connettendomi a %s:%s come %s, password %s\n"
 
-msgid "run a query."
-msgstr "esegue una query."
-
 #, 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 "get identity of longdesc field"
-msgstr ""
-
 msgid "unknown database schema"
 msgstr "schema del database sconosciuto"
 
-msgid "filter not-existing bug ids from list."
-msgstr "filtra id di bug non esistenti dalla lista"
-
-msgid "filter bug ids from list that already refer to this changeset."
-msgstr ""
-
 #, python-format
 msgid "bug %d already knows about changeset %s\n"
 msgstr "il bug %d  gi a conoscenza del changeset %s\n"
 
-msgid "tell bugzilla to send mail."
-msgstr "dice a bugzilla di inviare la mail."
-
 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"
 
-msgid "look up numeric bugzilla user id."
-msgstr "cerca l'identificatore utente numerico di bugzilla"
-
 #, python-format
 msgid "looking up user %s\n"
 msgstr "ricercando l'utente %s\n"
 
-msgid "map name of committer to bugzilla user name."
-msgstr "mappa il nome del committente al nome utente bugzilla"
-
-msgid ""
-"see if committer is a registered bugzilla user. Return\n"
-"        bugzilla username and userid if so. If not, return default\n"
-"        bugzilla username and userid."
-msgstr ""
-"controlla se il committente è un utente registrato bugzilla. In tal\n"
-"        caso restituisce userid e username bugzilla. Altrimenti\n"
-"        restituisce userid e username bugzilla di default."
-
 #, 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"
 
-msgid ""
-"add comment to bug. try adding comment as committer of\n"
-"        changeset, otherwise as default bugzilla user."
-msgstr ""
-
-msgid "support for bugzilla 2.18 series."
-msgstr "supporto per la serie di bugzilla 2.18."
-
-msgid "support for bugzilla 3.0 series."
-msgstr "sopporto per la serie di bugzilla 3.0."
-
-msgid ""
-"return object that knows how to talk to bugzilla version in\n"
-"        use."
-msgstr ""
-
 #, python-format
 msgid "bugzilla version %s not supported"
 msgstr "versione di bugzilla %s non supportata"
 
 msgid ""
-"find valid bug ids that are referred to in changeset\n"
-"        comments and that do not already have references to this\n"
-"        changeset."
-msgstr ""
-
-msgid "update bugzilla bug with reference to changeset."
-msgstr "aggiorna il bug bugzilla con riferimento al changeset."
-
-msgid ""
-"strip leading prefix of repo root and turn into\n"
-"            url-safe path."
-msgstr ""
-
-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}"
 
-msgid ""
-"add comment to bugzilla for each changeset that refers to a\n"
-"    bugzilla bug id. only add a comment once per bug, so same change\n"
-"    seen multiple times does not fill bug with duplicate data."
-msgstr ""
-
 #, 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 ""
-"show the children of the given or working dir revision\n"
-"\n"
-"    Print the children of the working directory's revisions.\n"
-"    If a revision is given via --rev, the children of that revision\n"
-"    will be printed. If a file argument is given, revision in\n"
-"    which the file was last changed (after the working directory\n"
-"    revision or the argument to --rev if given) is printed.\n"
+#, fuzzy
+msgid "command to display child changesets"
+msgstr "usa il comando per controllare lo stato del changeset"
+
+#, fuzzy
+msgid ""
+"show the children of the given or working directory revision\n"
+"\n"
+"    Print the children of the working directory's revisions. If a\n"
+"    revision is given via -r/--rev, the children of that revision will\n"
+"    be printed. If a file argument is given, revision in which the\n"
+"    file was last changed (after the working directory revision or the\n"
+"    argument to --rev if given) is printed.\n"
 "    "
 msgstr ""
-
-msgid "show children of the specified rev"
+"mostra i genitori della directory di lavoro o di una revisione\n"
+"\n"
+"    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 "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 show certain statistics about revision history"
+#, fuzzy
+msgid "command to display statistics about repository history"
 msgstr "comando per mostrare alcune statistiche sulla storia delle revisioni"
 
-msgid "Calculate stats"
-msgstr "Calcola statistiche"
-
 #, python-format
 msgid "Revision %d is a merge, ignoring...\n"
 msgstr "La revisione %d è un merge, ignoro...\n"
 
-#, python-format
-msgid "\rgenerating stats: %d%%"
+#, fuzzy, python-format
+msgid "generating stats: %d%%"
 msgstr "\rsto generando le statistiche: %d%%"
 
 msgid ""
-"graph count of revisions grouped by template\n"
-"\n"
-"    Will graph count of changed lines or revisions grouped by template or\n"
-"    alternatively by date, if dateformat is used. In this case it will "
-"override\n"
-"    template.\n"
-"\n"
-"    By default statistics are counted for number of changed lines.\n"
-"\n"
-"    Examples:\n"
+"histogram of changes to the repository\n"
+"\n"
+"    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.\n"
+"\n"
+"    Statistics are based on the number of changed lines, or\n"
+"    alternatively the number of matching revisions if the\n"
+"    --changesets option is specified.\n"
+"\n"
+"    Examples::\n"
 "\n"
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'\n"
 "\n"
 "      # display daily activity graph\n"
 "      hg churn -f '%H' -s -c\n"
 "\n"
 "      # display activity of developers by month\n"
 "      hg churn -f '%Y-%m' -s -c\n"
 "\n"
 "      # display count of lines changed in every year\n"
 "      hg churn -f '%Y' -s\n"
 "\n"
-"    The map file format used to specify aliases is fairly simple:\n"
-"\n"
-"    <alias email> <actual email>"
-msgstr ""
-
-#, python-format
-msgid "assuming %i character terminal\n"
-msgstr "assumo carattere di terminazione %i\n"
+"    It is possible to map alternate email addresses to a main address\n"
+"    by providing a file using the following format::\n"
+"\n"
+"      <alias email> <actual email>\n"
+"\n"
+"    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 ""
 
-msgid "count rate for revs matching date spec"
-msgstr ""
+#, fuzzy
+msgid "count rate for revisions matching date spec"
+msgstr "mostra le revisioni che corrispondono ad una data fornita"
 
 msgid "template to group changesets"
 msgstr ""
 
 msgid "strftime-compatible format for grouping by date"
 msgstr ""
 
 msgid "count rate by number of changesets"
 msgstr ""
 
 msgid "sort by key (default: sort by count)"
 msgstr "ordina per chiave (default: ordina per conteggio)"
 
 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]"
 msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [--progress] [FILE]"
 
 msgid ""
-"add color output to status, qseries, and diff-related commands\n"
-"\n"
-"This extension modifies the status command to add color to its output to\n"
-"reflect file status, the qseries command to add color to reflect patch "
-"status\n"
-"(applied, unapplied, missing), and to diff-related commands to highlight\n"
-"additions, removals, diff headers, and trailing whitespace.\n"
-"\n"
-"Other effects in addition to color, like bold and underlined text, are also\n"
-"available.  Effects are rendered with the ECMA-48 SGR control function (aka\n"
-"ANSI escape codes).  This module also provides the render_text function,\n"
-"which can be used to add effects to any text.\n"
-"\n"
-"To enable this extension, add this to your .hgrc file:\n"
-"[extensions]\n"
-"color =\n"
-"\n"
-"Default effects my be overriden from the .hgrc file:\n"
-"\n"
-"[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\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"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"
-msgstr ""
-
-msgid "Wrap text in commands to turn on each effect."
-msgstr ""
-
-msgid "run the status command with colored output"
-msgstr "esegue il comando status con output colorato"
-
-msgid "run the qseries command with colored output"
-msgstr "esegue il comando qseries con output colorato"
-
-msgid "wrap ui.write for colored diff output"
-msgstr ""
-
-msgid "wrap cmdutil.changeset_printer.showpatch with colored output"
-msgstr ""
-
-msgid "run the diff command with colored output"
-msgstr "esegue il comando diff con output colorato"
-
-msgid "Initialize the extension."
-msgstr "Inizializza l'estensione."
-
-msgid "patch in command to command table and load effect map"
+"colorize output from some commands\n"
+"\n"
+"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"
+"patch status (applied, unapplied, missing), and to diff-related\n"
+"commands to highlight additions, removals, diff headers, and trailing\n"
+"whitespace.\n"
+"\n"
+"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.\n"
+"\n"
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+"  [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\n"
+"\n"
+"  # 'none' turns off all effects\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  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"
 msgstr ""
 
 msgid "when to colorize (always, auto, or never)"
 msgstr "quando colorare (sempre, auto o mai)"
 
-msgid "don't colorize output"
+#, fuzzy
+msgid "don't colorize output (DEPRECATED)"
 msgstr "non colorare l'output"
 
-msgid "converting foreign VCS repositories to Mercurial"
+#, python-format
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr ""
+
+#, fuzzy
+msgid "import revisions from foreign VCS repositories into Mercurial"
 msgstr "converte repository di altri VCS in Mercurial"
 
 msgid ""
 "convert a foreign SCM repository to a Mercurial one.\n"
 "\n"
 "    Accepted source formats [identifiers]:\n"
+"\n"
 "    - 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]\n"
 "\n"
 "    Accepted destination formats [identifiers]:\n"
+"\n"
 "    - Mercurial [hg]\n"
 "    - Subversion [svn] (history on branches is not preserved)\n"
 "\n"
-"    If no revision is given, all revisions will be converted. Otherwise,\n"
-"    convert will only import up to the named revision (given in a format\n"
-"    understood by the source).\n"
+"    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).\n"
 "\n"
 "    If no destination directory name is specified, it defaults to the\n"
-"    basename of the source with '-hg' appended.  If the destination\n"
+"    basename of the source with '-hg' appended. If the destination\n"
 "    repository doesn't exist, it will be created.\n"
 "\n"
+"    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:\n"
+"\n"
+"    --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.\n"
+"\n"
+"    --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.\n"
+"\n"
+"    --sourcesort  try to preserve source revisions order, only\n"
+"                  supported by Mercurial sources.\n"
+"\n"
 "    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\n"
-"    file that maps each source commit ID to the destination ID for\n"
-"    that revision, like so:\n"
-"    <source ID> <destination ID>\n"
-"\n"
-"    If the file doesn't exist, it's automatically created.  It's updated\n"
-"    on each commit copied, so convert-repo can be interrupted and can\n"
-"    be run repeatedly to copy new commits.\n"
-"\n"
-"    The [username mapping] file is a simple text file that maps each source\n"
-"    commit author to a destination commit author. It is handy for source "
-"SCMs\n"
-"    that use unix logins to identify authors (eg: CVS). One line per author\n"
-"    mapping and the line format is:\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::\n"
+"\n"
+"      <source ID> <destination ID>\n"
+"\n"
+"    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.\n"
+"\n"
+"    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\n"
 "\n"
 "    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:\n"
+"    and directories. Comment lines start with '#'. Each line can\n"
+"    contain one of the following directives::\n"
 "\n"
 "      include path/to/file\n"
 "\n"
 "      exclude path/to/file\n"
 "\n"
 "      rename from/file to/file\n"
 "\n"
 "    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 dirs not explicitely included.\n"
-"    The 'exclude' directive causes files or directories to be omitted.\n"
-"    The 'rename' directive renames a file or directory.  To rename from a\n"
-"    subdirectory into the root of the repository, use '.' as the path to\n"
-"    rename to.\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.\n"
 "\n"
 "    The splicemap is a file that allows insertion of synthetic\n"
-"    history, letting you specify the parents of a revision.  This is\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"
+"    graft two disconnected series of history together. Each entry\n"
 "    contains a key, followed by a space, followed by one or two\n"
-"    values, separated by spaces.  The key is the revision ID in the\n"
-"    source revision control system whose parents should be modified\n"
-"    (same format as a key in .hg/shamap).  The values are the revision\n"
-"    IDs (in either the source or destination revision control system)\n"
-"    that should be used as the new parents for that node.\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.\n"
+"\n"
+"    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.\n"
 "\n"
 "    Mercurial Source\n"
-"    -----------------\n"
-"\n"
-"    --config convert.hg.ignoreerrors=False (boolean)\n"
+"    ----------------\n"
+"\n"
+"    --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 "
-"change)\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\n"
 "\n"
 "    CVS Source\n"
 "    ----------\n"
 "\n"
 "    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\n"
-"    the repository is :local:. The conversion uses the top level\n"
-"    directory in the sandbox to find the CVS repository, and then uses\n"
-"    CVS rlog commands to find files to convert. This means that unless\n"
-"    a filemap is given, all files under the starting directory will be\n"
-"    converted, and that any directory reorganisation in the CVS\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.\n"
 "\n"
-"    Because CVS does not have changesets, it is necessary to collect\n"
-"    individual commits to CVS and merge them into changesets. CVS\n"
-"    source uses its internal changeset merging code by default but can\n"
-"    be configured to call the external 'cvsps' program by setting:\n"
-"        --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
-"    This is a legacy option and may be removed in future.\n"
-"\n"
 "    The options shown are the defaults.\n"
 "\n"
-"    Internal cvsps is selected by setting\n"
-"        --config convert.cvsps=builtin\n"
-"    and has a few more configurable options:\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\n"
-"            of a changeset then the default may not be long enough.\n"
-"        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages are\n"
-"            matched. If a match occurs, then the conversion process will\n"
-"            insert a dummy revision merging the branch on which this log\n"
-"            message occurs to the branch indicated in the regex.\n"
-"        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"            Specify a regular expression to which commit log messages are\n"
-"            matched. If a match occurs, then the conversion process will\n"
-"            add the most recent revision on the branch indicated in the\n"
-"            regex as the second parent of the changeset.\n"
-"\n"
-"    The hgext/convert/cvsps wrapper script allows the builtin changeset\n"
-"    merging code to be run without doing a conversion. Its parameters and\n"
-"    output are similar to that of cvsps 2.1.\n"
+"    --config convert.cvsps.cache=True         (boolean)\n"
+"        Set to False to disable remote log caching, for testing and\n"
+"        debugging purposes.\n"
+"    --config convert.cvsps.fuzz=60            (integer)\n"
+"        Specify the maximum time (in seconds) that is allowed between\n"
+"        commits with identical user and log message in a single\n"
+"        changeset. When very large files were checked in as part of a\n"
+"        changeset then the default may not be long enough.\n"
+"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        insert a dummy revision merging the branch on which this log\n"
+"        message occurs to the branch indicated in the regex.\n"
+"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+"        Specify a regular expression to which commit log messages are\n"
+"        matched. If a match occurs, then the conversion process will\n"
+"        add the most recent revision on the branch indicated in the\n"
+"        regex as the second parent of the changeset.\n"
+"\n"
+"    An additional \"debugcvsps\" Mercurial command allows the builtin\n"
+"    changeset merging code to be run without doing a conversion. Its\n"
+"    parameters and output are similar to that of cvsps 2.1. Please see\n"
+"    the command help for more details.\n"
 "\n"
 "    Subversion Source\n"
 "    -----------------\n"
 "\n"
 "    Subversion source detects classical trunk/branches/tags layouts.\n"
 "    By default, the supplied \"svn://repo/path/\" source URL is\n"
-"    converted as a single branch. If \"svn://repo/path/trunk\" exists\n"
-"    it replaces the default branch. If \"svn://repo/path/branches\"\n"
-"    exists, its subdirectories are listed as possible branches. If\n"
+"    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 overriden with following options. Set them to paths\n"
-"    relative to the source URL, or leave them blank to disable\n"
-"    autodetection.\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.\n"
 "\n"
 "    --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\n"
 "\n"
 "    Source history can be retrieved starting at a specific revision,\n"
 "    instead of being integrally converted. Only single branch\n"
 "    conversions are supported.\n"
 "\n"
 "    --config convert.svn.startrev=0           (svn revision number)\n"
 "        specify start Subversion revision.\n"
 "\n"
 "    Perforce Source\n"
 "    ---------------\n"
 "\n"
-"    The Perforce (P4) importer can be given a p4 depot path or a client\n"
-"    specification as source. It will convert all files in the source to\n"
-"    a flat Mercurial repository, ignoring labels, branches and "
-"integrations.\n"
-"    Note that when a depot path is given you then usually should specify a\n"
-"    target directory, because otherwise the target may be named ...-hg.\n"
-"\n"
-"    It is possible to limit the amount of source history to be converted\n"
-"    by specifying an initial Perforce revision.\n"
-"\n"
-"    --config convert.p4.startrev=0           (perforce changelist number)\n"
+"    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.\n"
+"\n"
+"    It is possible to limit the amount of source history to be\n"
+"    converted by specifying an initial Perforce revision.\n"
+"\n"
+"    --config convert.p4.startrev=0            (perforce changelist number)\n"
 "        specify initial Perforce revision.\n"
 "\n"
-"\n"
 "    Mercurial Destination\n"
 "    ---------------------\n"
 "\n"
 "    --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\n"
 "\n"
 "    "
 msgstr ""
 
 msgid ""
 "create changeset information from CVS\n"
 "\n"
-"    This command is intended as a debugging tool for the CVS to Mercurial\n"
-"    converter, and can be used as a direct replacement for cvsps.\n"
-"\n"
-"    Hg debugcvsps reads the CVS rlog for current directory (or any named\n"
-"    directory) in the CVS repository, and converts the log to a series of\n"
-"    changesets based on matching commit log entries and dates."
+"    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.\n"
+"\n"
+"    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 ""
+
+#, fuzzy
+msgid "try to sort changesets by branches"
+msgstr "prova ad ordinare i changeset per data"
+
 msgid "try to sort changesets by date"
 msgstr "prova ad ordinare i changeset per data"
 
+#, fuzzy
+msgid "preserve source changesets order"
+msgstr "prova ad ordinare i changeset per data"
+
 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"
+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 \"%s\""
 
 #, python-format
-msgid "running: %s\n"
-msgstr "sto eseguendo: %s\n"
-
-#, python-format
 msgid "%s error:\n"
 msgstr "%s errore:\n"
 
 #, python-format
-msgid "%s %s"
-msgstr "%s %s"
+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"
 
 #, python-format
 msgid "%s: missing or unsupported repository"
 msgstr "%s: repository mancante o non supportato"
 
 #, python-format
 msgid "convert: %s\n"
 msgstr "convert: %s\n"
 
 #, python-format
 msgid "%s: unknown repository type"
 msgstr "%s: tipo di repository sconosciuto"
 
+#, fuzzy, python-format
+msgid "unknown sort mode: %s"
+msgstr "risposta CVS 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 "Overriding mapping for author %s, was %s, will be %s\n"
-msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n"
+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 "Ignoring bad line in author map file %s: %s\n"
-msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n"
+#, fuzzy, 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"
 
 #, python-format
 msgid "assuming destination %s\n"
 msgstr "assumo destinazione %s\n"
 
-#, python-format
-msgid "revision %s is not a patchset number or date"
+#, fuzzy
+msgid "more than one sort mode specified"
+msgstr "troppe opzioni specificate"
+
+msgid "--sourcesort is not supported by this data source"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "revision %s is not a patchset number"
 msgstr "la revisione %s non è un numero di patchset o una data"
 
-msgid "using builtin cvsps\n"
-msgstr "sto usando cvsps integrato\n"
-
 #, python-format
 msgid "connecting to %s\n"
 msgstr "sto connettendomi a %s\n"
 
 msgid "CVS pserver authentication failed"
 msgstr "autenticazione al pserver CVS fallita"
 
-msgid "server sucks"
-msgstr "il server fa schifo"
+#, python-format
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgstr ""
 
 #, python-format
 msgid "%d bytes missing from remote file"
 msgstr "%d byte mancanti dal file remoto"
 
 #, 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"
 
 #, 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"
 
-#, python-format
-msgid "prefix=%r directory=%r root=%r\n"
-msgstr "prefisso=%r directory=%r radice=%r\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"
 
 #, python-format
-msgid "found synthetic rev in %s: %r\n"
-msgstr "trovata revisione sintetica in %s: %r\n"
-
-#, 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"
 
+#, 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"
 
-#, python-format
-msgid "cleaning up %s\n"
-msgstr "sto ripulendo %s\n"
-
 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"
 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"
 msgstr ""
 "analisi dell'albero interrotta in quanto punta ad un archivio non\n"
 "      registrato %s...\n"
 
 #, python-format
-msgid "applying revision %s...\n"
-msgstr "sto applicando la revisione %s...\n"
-
-#, python-format
-msgid "computing changeset between %s and %s...\n"
-msgstr "sto calcolando il changeset tra %s e %s...\n"
-
-#, python-format
-msgid "obtaining revision %s...\n"
-msgstr "sto ottenendo la revisione %s...\n"
-
-#, python-format
-msgid "analysing revision %s...\n"
-msgstr "sto analizzando la revisione %s...\n"
-
-#, python-format
 msgid "could not parse cat-log of %s"
 msgstr ""
 
 #, python-format
 msgid "%s is not a local Mercurial repo"
 msgstr "%s non è un repository locale Mercurial"
 
 #, python-format
 msgid "initializing destination %s repository\n"
 msgstr "sto inizializzando il repository destinatario %s\n"
 
-msgid "run hg sink pre-conversion action\n"
-msgstr ""
-
-msgid "run hg sink post-conversion action\n"
-msgstr ""
-
 #, python-format
 msgid "pulling from %s into %s\n"
 msgstr "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"
 
-msgid "run hg source pre-conversion action\n"
-msgstr ""
-
-msgid "run hg source post-conversion action\n"
-msgstr ""
-
 #, python-format
 msgid "%s does not look like a monotone repo"
 msgstr "%s non sembra essere un repository monotone"
 
 #, python-format
-msgid "copying file in renamed dir from '%s' to '%s'"
+msgid "copying file in renamed directory from '%s' to '%s'"
 msgstr ""
 
 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 "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"
 
 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"
 
 #, 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 with more than one branch"
+#, fuzzy
+msgid "svn: start revision is not supported with more than one branch"
 msgstr "svn: non è supportata una revisione iniziale con più di una branch"
 
 #, 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 "ignoring foreign branch %r\n"
-msgstr "ignoro la branch straniera %r\n"
-
-#, python-format
 msgid "%s not found up to revision %d"
 msgstr "%s non trovato fino alla revisione %d"
 
 #, python-format
-msgid "branch renamed from %s to %s at %d\n"
-msgstr "branch rinominata da %s a %s in %d\n"
-
-#, python-format
-msgid "reparent to %s\n"
-msgstr "riassociato il genitore come %s\n"
-
-#, python-format
-msgid "copied to %s from %s@%s\n"
-msgstr "copiato in %s da %s@%s\n"
-
-#, python-format
-msgid "gone from %s\n"
-msgstr "andato da %s\n"
-
-#, python-format
-msgid "found parent directory %s\n"
-msgstr "trovata directory genitore %s\n"
-
-#, python-format
-msgid "base, entry %s %s\n"
-msgstr "base, voce %s %s\n"
-
-msgid "munge-o-matic\n"
-msgstr "munge-o-matic\n"
-
-#, python-format
-msgid "info: %s %s %s %s\n"
-msgstr "info: %s %s %s %s\n"
-
-#, python-format
-msgid "unknown path in revision %d: %s\n"
-msgstr "percorso sconosciuto nella revisione %d: %s\n"
-
-#, python-format
-msgid "mark %s came from %s:%d\n"
-msgstr "%s marcato come proveniente da %s:%d\n"
-
-#, python-format
-msgid "parsing revision %d (%d changes)\n"
-msgstr "sto effettuando il parsing della revisione %d (%d modifiche)\n"
-
-#, python-format
 msgid "found parent of branch %s at %d: %s\n"
 msgstr "trovato genitore della branch %s in %d: %s\n"
 
-msgid "no copyfrom path, don't know what to do.\n"
-msgstr ""
-
 #, python-format
 msgid "fetching revision log for \"%s\" from %d to %d\n"
 msgstr ""
 
 #, python-format
-msgid "skipping blacklisted revision %d\n"
-msgstr "sto saltando la revisione nella blacklist %d\n"
-
-#, python-format
-msgid "revision %d has no entries\n"
-msgstr "la revisione %d non ha voci\n"
-
-#, python-format
 msgid "svn: branch has no revision %s"
 msgstr "svn: la branch non ha nessuna revisione %s"
 
 #, python-format
-msgid "%r is not under %r, ignoring\n"
-msgstr "%r non è sotto %r, ignoro\n"
-
-#, python-format
 msgid "initializing svn repo %r\n"
 msgstr "inizializzo il repository svn %r\n"
 
 #, python-format
 msgid "initializing svn wc %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 ""
-"\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working dir.  The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"command to allow external programs to compare revisions\n"
+"\n"
+"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.\n"
 "\n"
-"To enable this extension:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.extdiff =\n"
-"\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
 "\n"
 "  [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\n"
 "\n"
 "  # add new command called vdiff, runs kdiff3\n"
 "  vdiff = kdiff3\n"
 "\n"
 "  # add new command called meld, runs meld (no need to name twice)\n"
 "  meld =\n"
 "\n"
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-"  #(see http://www.vim.org/scripts/script.php?script_id=102)\n"
-"  # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\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)'\n"
 "\n"
-"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 ""
-
-msgid "snapshot files as of some revision"
+"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"
 msgstr ""
 
 #, python-format
 msgid "making snapshot of %d files from rev %s\n"
 msgstr ""
 
-msgid ""
-"snapshot files from working directory.\n"
-"    if not using snapshot, -I/-X does not work and recursive diff\n"
-"    in tools like kdiff3 and meld displays too many files."
-msgstr ""
-
-#, python-format
-msgid "making snapshot of %d files from working dir\n"
-msgstr ""
-
-msgid ""
-"Do the actuall diff:\n"
-"\n"
-"    - copy to a temp structure if diffing 2 internal revisions\n"
-"    - copy to a temp structure if diffing working revision with\n"
-"      another one and more than 1 file is changed\n"
-"    - just invoke the diff for a single file in the working dir\n"
-"    "
+#, 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"
 
-#, python-format
-msgid "running %r in %s\n"
-msgstr "sto eseguendo %r in %s\n"
-
-#, python-format
-msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
-msgstr "file modificato durante il diff. Sovrascrivo: %s (sorgente: %s)\n"
-
 msgid "cleaning up temp directory\n"
 msgstr "sto ripulendo la directory temporanea\n"
 
 msgid ""
 "use external program to diff repository (or selected files)\n"
 "\n"
 "    Show differences between revisions for the specified files, using\n"
-"    an external program.  The default program used is diff, with\n"
+"    an external program. The default program used is diff, with\n"
 "    default options \"-Npru\".\n"
 "\n"
-"    To select a different program, use the -p option.  The program\n"
-"    will be passed the names of two directories to compare.  To pass\n"
-"    additional options to the program, use the -o option.  These will\n"
-"    be passed before the names of the directories to compare.\n"
-"\n"
-"    When two revision arguments are given, then changes are\n"
-"    shown between those revisions. If only one revision is\n"
-"    specified then that revision is compared to the working\n"
-"    directory, and, when no revisions are specified, the\n"
-"    working directory files are compared to its parent."
+"    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.\n"
+"\n"
+"    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 "comparison program to run"
 msgstr "programma per i confronti da eseguire"
 
 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]..."
 
-msgid "use closure to save diff command to use"
+#, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+"    Show differences between revisions for the specified files, using the\n"
+"    %(path)s program.\n"
+"\n"
+"    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 ""
 
 #, python-format
 msgid "hg %s [OPTION]... [FILE]..."
 msgstr "hg %s [OPZIONI]... [FILE]..."
 
-msgid "pulling, updating and merging in one command"
+#, 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.\n"
 "\n"
 "    This finds all changes from the repository at the specified path\n"
 "    or URL and adds them to the local repository.\n"
 "\n"
-"    If the pulled changes add a new branch head, the head is automatically\n"
-"    merged, and the result of the merge is committed.  Otherwise, the\n"
-"    working directory is updated to include the new changes.\n"
+"    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.\n"
 "\n"
 "    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"
+"    \"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.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "effettua il pull delle modifiche da un repository remoto, effettua il merge "
 "delle nuove modifiche se necessario.\n"
 "\n"
 "    Questo trova tutte le modifiche dal repository al percorso o URL "
 "specificato\n"
 "    e le aggiunge al repository locale.\n"
 "\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.\n"
 "\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.\n"
 "\n"
 "    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)"
 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)"
 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 "fetch -r doesn't work for remote repositories yet"
-msgstr ""
+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 "Automated merge with %s"
-msgstr "Merge automatico con %s"
-
-#, 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"
 
 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]"
 
-msgid " returns of the good and bad signatures"
-msgstr " restituisce le firme valide e non valide"
+#, 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"
 
-msgid "create a new gpg instance"
-msgstr "crea una nuova istanza gpg"
-
-msgid ""
-"\n"
-"    walk over every sigs, yields a couple\n"
-"    ((node, version, sig), (filename, linenumber))\n"
-"    "
-msgstr ""
-"\n"
-"    percorre ogni firma, restituendo una coppia\n"
-"    ((nodo, versione, firma), (nome del file, numero di riga))\n"
-"    "
-
-msgid "get the keys who signed a data"
-msgstr "ottiene le chiavi di chi ha firmato i dati"
-
 #, 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"
 
 #, python-format
 msgid "No valid signature for %s\n"
 msgstr "Nessuna firma valida per %s\n"
 
-msgid "associate a string to a key (username, comment)"
-msgstr "associa una stringa ad una chiave (username, commento)"
-
 msgid ""
 "add a signature for the current or given revision\n"
 "\n"
 "    If no revision is given, the parent of the working directory is used,\n"
 "    or tip if no revision is checked out.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "aggiunge una firma per la revisione corrente o data\n"
 "\n"
 "    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.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per\n"
 "    -d/--date.\n"
 "    "
 
 msgid "uncommitted merge - please provide a specific revision"
 msgstr ""
 "merge di cui non si è effettuato il commit - si prega di fornire una "
 "revisione specifica"
 
 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)"
 
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr "Aggiunta firma per il changeset %s"
-
-msgid "map a manifest into some text"
-msgstr "associa un manifesto ad un qualche testo"
-
 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 "the key id to sign with"
 msgstr "l'id della chiave con cui firmare"
 
 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 ""
-"show revision graphs in terminal windows\n"
+"command to view revision graphs from a shell\n"
 "\n"
 "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"
+"commands. When this options is given, an ASCII representation of the\n"
 "revision graph is also shown.\n"
 msgstr ""
 
-msgid ""
-"cset DAG generator yielding (rev, node, [parents]) tuples\n"
-"\n"
-"    This generator function walks through the revision history from "
-"revision\n"
-"    start to revision stop (which must be less than or equal to start).\n"
-"    "
-msgstr ""
-
-msgid ""
-"file cset DAG generator yielding (rev, node, [parents]) tuples\n"
-"\n"
-"    This generator function walks through the revision history of a single\n"
-"    file from revision start to revision stop (which must be less than or\n"
-"    equal to start).\n"
-"    "
-msgstr ""
-
-msgid ""
-"grapher for asciigraph on a list of nodes and their parents\n"
-"\n"
-"    nodes must generate tuples (node, parents, char, lines) where\n"
-"     - parents must generate the parents of node, in sorted order,\n"
-"       and max length 2,\n"
-"     - char is the char to print as the node symbol, and\n"
-"     - lines are the lines to display next to the node.\n"
-"    "
-msgstr ""
-
-msgid ""
-"prints an ASCII graph of the DAG returned by the grapher\n"
-"\n"
-"    grapher is a generator that emits tuples with the following elements:\n"
-"\n"
-"      - Character to use as node's symbol.\n"
-"      - List of lines to display as the node's text.\n"
-"      - Column of the current node in the set of ongoing edges.\n"
-"      - Edges; a list of (col, next_col) indicating the edges between\n"
-"        the current node and its parents.\n"
-"      - Number of columns (ongoing edges) in the current revision.\n"
-"      - The difference between the number of columns (ongoing edges)\n"
-"        in the next revision and the number of columns (ongoing edges)\n"
-"        in the current revision. That is: -1 means one column removed;\n"
-"        0 means no columns added or removed; 1 means one column added.\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\n"
 "\n"
 "    Print a revision history alongside a revision graph drawn with\n"
 "    ASCII characters.\n"
 "\n"
 "    Nodes printed as an @ character are parents of the working\n"
 "    directory.\n"
 "    "
 msgstr ""
 
-msgid ""
-"show the outgoing changesets alongside an ASCII revision graph\n"
-"\n"
-"    Print the outgoing changesets alongside a revision graph drawn with\n"
-"    ASCII characters.\n"
-"\n"
-"    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 incoming changesets alongside an ASCII revision graph\n"
-"\n"
-"    Print the incoming changesets alongside a revision graph drawn with\n"
-"    ASCII characters.\n"
-"\n"
-"    Nodes printed as an @ character are parents of the working\n"
-"    directory.\n"
-"    "
-msgstr ""
-
-msgid "wrap the command"
-msgstr ""
-
 msgid "show the revision DAG"
 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 ""
-"CIA notification\n"
-"\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[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\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
-msgstr ""
-
-msgid " A CIA message "
-msgstr ""
-
-msgid " CIA notification class "
+"hooks for integrating with the CIA.vc notification service\n"
+"\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+"  [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\n"
+"\n"
+"  [hooks]\n"
+"  # one of these:\n"
+"  changegroup.cia = python:hgcia.hook\n"
+"  #incoming.cia = python:hgcia.hook\n"
+"\n"
+"  [web]\n"
+"  # If you want hyperlinks (optional)\n"
+"  baseurl = http://server/path/to/repo\n"
 msgstr ""
 
 #, python-format
 msgid "hgcia: sending update to %s\n"
 msgstr ""
 
-msgid " send CIA notification "
-msgstr "invia notifica CIA"
-
 msgid "email.from must be defined when sending by email"
 msgstr "email.from deve essere definito quando si mandano mail"
 
-msgid "cia: no user specified"
-msgstr ""
-
-msgid "cia: no project specified"
-msgstr ""
-
-msgid ""
-"browsing the repository in a graphical way\n"
+msgid ""
+"browse the repository in a graphical way\n"
 "\n"
 "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\n"
-"not distributed with Mercurial.)\n"
+"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
+"distributed with Mercurial.)\n"
 "\n"
 "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"
+"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 hgk.py can be found in the hgext directory.\n"
-"\n"
-"To load the hgext.py extension, add it to your .hgrc file (you have\n"
-"to use your global $HOME/.hgrc file, not one in a repository). You\n"
-"can specify an absolute path:\n"
-"\n"
-"  [extensions]\n"
-"  hgk=/usr/local/lib/hgk.py\n"
-"\n"
-"Mercurial can also scan the default python library path for a file\n"
-"named 'hgk.py' if you set hgk empty:\n"
-"\n"
-"  [extensions]\n"
-"  hgk=\n"
+"the contrib directory, and the extension is shipped in the hgext\n"
+"repository, and needs to be enabled.\n"
 "\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\n"
-"specify the path to hgk in your .hgrc file:\n"
+"to work, hgk must be in your search path. Alternately, you can specify\n"
+"the path to hgk in your .hgrc file::\n"
 "\n"
 "  [hgk]\n"
 "  path=/location/of/hgk\n"
 "\n"
 "hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
 "\n"
 "  [hgk]\n"
 "  vdiff=vdiff\n"
 "\n"
 "Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"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"
 
-msgid "hg debug-merge-base node node"
-msgstr "hg debug-merge-base nodo nodo"
+#, 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"
 
-msgid "hg debug-rev-list [options] revs"
-msgstr "hg debug-rev-list [opzioni] revs"
-
-msgid ""
-"syntax highlighting in hgweb, based on Pygments\n"
-"\n"
-"It depends on the pygments syntax highlighting library:\n"
+#, fuzzy
+msgid "hg debug-rev-list [OPTION]... REV..."
+msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..."
+
+msgid ""
+"syntax highlighting for hgweb (requires Pygments)\n"
+"\n"
+"It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/\n"
 "\n"
-"To enable the extension add this to hgrc:\n"
-"\n"
-"[extensions]\n"
-"hgext.highlight =\n"
-"\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+"  [web]\n"
+"  pygments_style = <style>\n"
 "\n"
 "The default is 'colorful'.\n"
-"\n"
-"-- Adam Hupp <[e-mail]>\n"
-msgstr ""
-
-msgid "inotify-based status acceleration for Linux systems\n"
-msgstr "accelerazione di status per sistemi Linux basata su inotify\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 "(found dead inotify server socket; removing it)\n"
-msgstr "(trovato socket morto del server inotify; lo rimuovo)\n"
-
-msgid "(starting inotify server)\n"
-msgstr "(sto avviando il server inotify)\n"
-
-#, python-format
-msgid "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"
-msgstr "impossibile comunicare con il nuovo server inotify: %s\n"
-
-msgid "(inotify server not running)\n"
-msgstr "(server inotify non in esecuzione\n"
-
-#, python-format
-msgid "failed to contact inotify server: %s\n"
-msgstr "non sono riuscito a contattare il server inotify: %s\n"
+msgid ""
+"debugging information for inotify extension\n"
+"\n"
+"    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"
 
-msgid "hg inserve [OPT]..."
+#, fuzzy
+msgid "hg inserve [OPTION]..."
 msgstr "hg inserve [OPT]..."
 
+msgid "(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"
+msgstr "impossibile avviare il server inotify: %s\n"
+
+#, python-format
+msgid "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"
+msgstr "non sono riuscito a contattare il server inotify: %s\n"
+
+#, fuzzy
+msgid "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"
 
 #, 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 dir(%d) -> %s\n"
-msgstr "status: %r dir(%d) -> %s\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 "%s processing %d deferred events as %d\n"
-msgstr ""
-
-#, python-format
 msgid "could not start server: %s"
 msgstr ""
 
 #, python-format
+msgid "answering query for %r\n"
+msgstr ""
+
+#, python-format
 msgid "received query from incompatible client version %d\n"
 msgstr ""
 
-#, python-format
-msgid "answering query for %r\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "unrecognized query type: %s\n"
+msgstr "risposta non riconosciuta\n"
 
 msgid "finished setup\n"
 msgstr ""
 
-msgid "polling: no timeout\n"
-msgstr ""
-
-#, python-format
-msgid "polling: %sms timeout\n"
+msgid ""
+"expand expressions into changelog and summaries\n"
+"\n"
+"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.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
+"\n"
+"  [interhg]\n"
+"  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
+"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
+"i\n"
+"  boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
 msgstr ""
 
 #, python-format
 msgid "interhg: invalid pattern for %s: %s\n"
 msgstr ""
 
 #, python-format
 msgid "interhg: invalid regexp for %s: %s\n"
 msgstr ""
 
 msgid ""
-"keyword expansion in local repositories\n"
-"\n"
-"This extension expands RCS/CVS-like or self-customized $Keywords$\n"
-"in tracked text files selected by your configuration.\n"
-"\n"
-"Keywords are only expanded in local repositories and not stored in\n"
-"the change history. The mechanism can be regarded as a convenience\n"
-"for the current user or for archive distribution.\n"
-"\n"
-"Configuration is done in the [keyword] and [keywordmaps] sections\n"
-"of hgrc files.\n"
-"\n"
-"Example:\n"
+"expand keywords in tracked files\n"
+"\n"
+"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
+"tracked text files selected by your configuration.\n"
+"\n"
+"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.\n"
+"\n"
+"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
+"hgrc files.\n"
+"\n"
+"Example::\n"
 "\n"
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore\n"
 "\n"
-"Note: the more specific you are in your filename patterns\n"
-"      the less you lose speed in huge repos.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
 "\n"
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
-"\n"
-"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n"
-"with customized keywords and templates.\n"
-"Again, run \"hg kwdemo\" to control the results of your config changes.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
+"\n"
+"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.\n"
 "\n"
 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
-"the risk of inadvertedly storing expanded keywords in the change history.\n"
+"the risk of inadvertently storing expanded keywords in the change\n"
+"history.\n"
 "\n"
 "To force expansion after enabling it, or a configuration change, run\n"
 "\"hg kwexpand\".\n"
 "\n"
-"Also, when committing with the record extension or using mq's qrecord, be "
-"aware\n"
-"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n"
-"question to update keyword expansions after all changes have been checked "
-"in.\n"
+"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.\n"
 "\n"
 "Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
-msgstr ""
-
-msgid "Returns hgdate in cvs-like UTC format."
-msgstr ""
-
-msgid ""
-"\n"
-"    Sets up keyword templates, corresponding keyword regex, and\n"
-"    provides keyword substitution functions.\n"
-"    "
-msgstr ""
-
-msgid "Replaces keywords in data with expanded template."
-msgstr ""
-
-msgid "Returns data with keywords expanded."
-msgstr ""
-
-msgid ""
-"Returns true if path matches [keyword] pattern\n"
-"        and is not a symbolic link.\n"
-"        Caveat: localrepository._link fails on Windows."
-msgstr ""
-
-msgid "Overwrites selected files expanding/shrinking keywords."
-msgstr ""
-
-#, python-format
-msgid "overwriting %s %s keywords\n"
-msgstr ""
-
-msgid "Unconditionally removes all keyword substitutions from text."
-msgstr ""
-
-msgid "Returns text with all keyword substitutions removed."
-msgstr ""
-
-msgid "Returns lines with keyword substitutions removed."
-msgstr ""
-
-msgid ""
-"If in restricted mode returns data read from wdir with\n"
-"        keyword substitutions removed."
-msgstr ""
-
-msgid ""
-"\n"
-"    Subclass of filelog to hook into its read, add, cmp methods.\n"
-"    Keywords are \"stored\" unexpanded, and processed on reading.\n"
-"    "
-msgstr ""
-
-msgid "Expands keywords when reading filelog."
-msgstr ""
-
-msgid "Removes keyword substitutions when adding to filelog."
-msgstr ""
-
-msgid "Removes keyword substitutions for comparison."
-msgstr ""
-
-msgid ""
-"Bails out if [keyword] configuration is not active.\n"
-"    Returns status of working directory."
-msgstr ""
-"Esce se la configurazione [keyword] non è attiva.\n"
-"    Restituisce lo stato della directory di lavoro."
+"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 "Selects files and passes them to kwtemplater.overwrite."
-msgstr ""
-
 msgid ""
 "print [keywordmaps] configuration and an expansion example\n"
 "\n"
-"    Show current, custom, or default keyword template maps\n"
-"    and their expansion.\n"
-"\n"
-"    Extend current configuration by specifying maps as arguments\n"
-"    and optionally by reading from an additional hgrc file.\n"
-"\n"
-"    Override current keyword template maps with \"default\" option.\n"
+"    Show current, custom, or default keyword template maps and their\n"
+"    expansions.\n"
+"\n"
+"    Extend the current configuration by specifying maps as arguments\n"
+"    and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+"    Use -d/--default to disable current configuration.\n"
+"\n"
+"    See \"hg help templates\" for information on templates and filters.\n"
 "    "
 msgstr ""
 
-#, python-format
-msgid ""
-"\n"
-"\t%s\n"
-msgstr ""
-
-#, python-format
-msgid "creating temporary repo at %s\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\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"
 msgstr ""
 
-#, python-format
-msgid ""
-"\n"
-"removing temporary repo %s\n"
-msgstr ""
-
-msgid ""
-"expand keywords in working directory\n"
+msgid ""
+"\n"
+"\tkeywords expanded\n"
+msgstr ""
+
+msgid ""
+"expand keywords in the working directory\n"
 "\n"
 "    Run after (re)enabling keyword expansion.\n"
 "\n"
 "    kwexpand refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid ""
-"print files currently configured for keyword expansion\n"
-"\n"
-"    Crosscheck which files in working directory are potential targets for\n"
-"    keyword expansion.\n"
-"    That is, files matched by [keyword] config patterns but not symlinks.\n"
+"show files configured for keyword expansion\n"
+"\n"
+"    List which files in the working directory are matched by the\n"
+"    [keyword] configuration patterns.\n"
+"\n"
+"    Useful to prevent inadvertent keyword expansion and to speed up\n"
+"    execution by including only files that are actual candidates for\n"
+"    expansion.\n"
+"\n"
+"    See \"hg help keyword\" on how to construct patterns both for\n"
+"    inclusion and exclusion of files.\n"
+"\n"
+"    With -A/--all and -v/--verbose the codes used to show the status\n"
+"    of files are::\n"
+"\n"
+"      K = keyword expansion candidate\n"
+"      k = keyword expansion candidate (not tracked)\n"
+"      I = ignored\n"
+"      i = ignored (not tracked)\n"
 "    "
 msgstr ""
 
 msgid ""
-"revert expanded keywords in working directory\n"
-"\n"
-"    Run before changing/disabling active keywords\n"
-"    or if you experience problems with \"hg import\" or \"hg merge\".\n"
+"revert expanded keywords in the working directory\n"
+"\n"
+"    Run before changing/disabling active keywords or if you experience\n"
+"    problems with \"hg import\" or \"hg merge\".\n"
 "\n"
 "    kwshrink refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
-msgid ""
-"Collects [keyword] config in kwtools.\n"
-"    Monkeypatches dispatch._parse if needed."
-msgstr ""
-
-msgid "Monkeypatch dispatch._parse to obtain running hg command."
-msgstr ""
-
-msgid ""
-"Sets up repo as kwrepo for keyword substitution.\n"
-"    Overrides file method to return kwfilelog instead of filelog\n"
-"    if file matches user configuration.\n"
-"    Wraps commit to overwrite configured files with updated\n"
-"    keyword substitutions.\n"
-"    Monkeypatches patch and webcommands."
-msgstr ""
-
-msgid ""
-"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n"
-"        rejects or conflicts due to expanded keywords in working dir."
-msgstr ""
-
-msgid ""
-"Monkeypatch patch.diff to avoid expansion except when\n"
-"        comparing against working dir."
-msgstr ""
-
-msgid "Wraps webcommands.x turning off keyword expansion."
-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 ""
 
-msgid "additionally show untracked files"
+#, 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 ""
-"patch management and development\n"
+"manage a stack of patches\n"
 "\n"
 "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"
+"repository. It manages two stacks of patches - all known patches, and\n"
 "applied patches (subset of known patches).\n"
 "\n"
 "Known patches are represented as patch files in the .hg/patches\n"
-"directory.  Applied patches are both patch files and changesets.\n"
-"\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches   qinit\n"
-"create new patch                          qnew\n"
-"import existing patch                     qimport\n"
-"\n"
-"print patch series                        qseries\n"
-"print applied patches                     qapplied\n"
-"print name of top applied patch           qtop\n"
-"\n"
-"add known patch to applied stack          qpush\n"
-"remove patch from applied stack           qpop\n"
-"refresh contents of top applied patch     qrefresh\n"
-msgstr ""
-
-msgid ""
-"Update all references to a field in the patch header.\n"
-"        If none found, add it email style."
-msgstr ""
-"Aggiorna tutti i riferimenti ad un campo nell'intestazione della patch.\n"
-"        If none found, add it email style."
-
-msgid ""
-"Remove existing message, keeping the rest of the comments fields.\n"
-"        If comments contains 'subject: ', message will prepend\n"
-"        the field and a blank line."
+"directory. Applied patches are both patch files and changesets.\n"
+"\n"
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+"  prepare repository to work with patches   qinit\n"
+"  create new patch                          qnew\n"
+"  import existing patch                     qimport\n"
+"\n"
+"  print patch series                        qseries\n"
+"  print applied patches                     qapplied\n"
+"\n"
+"  add known patch to applied stack          qpush\n"
+"  remove patch from applied stack           qpop\n"
+"  refresh contents of top applied patch     qrefresh\n"
 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 "active guards: %s\n"
-msgstr "guardie attive: %s\n"
-
-#, 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 ""
-"Apply patchfile  to the working directory.\n"
-"        patchfile: file name of patch"
-msgstr ""
-
 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"
 
-#, python-format
-msgid "Unable to read %s\n"
-msgstr "Impossibile leggere %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 ""
 
-msgid ""
-"options:\n"
-"           msg: a string or a no-argument function returning a string\n"
-"        "
-msgstr ""
-
 #, python-format
 msgid "patch \"%s\" already exists"
 msgstr "la patch \"%s\" esiste gi"
 
 #, python-format
 msgid "error unlinking %s\n"
 msgstr ""
 
-msgid "returns (index, rev, patch)"
-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"
 
-msgid "(working directory not at tip)\n"
+#, fuzzy
+msgid "(working directory not at a head)\n"
 msgstr "(directory di lavoro non  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"
 
 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"
 
 #, 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"
 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"
 
-msgid ""
-"If all_patches is False, return the index of the next pushable patch\n"
-"        in the series, or the series length. If all_patches is True, return "
-"the\n"
-"        index of the first patch past the last applied one.\n"
-"        "
-msgstr ""
-
 #, 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 -"
 
 #, python-format
 msgid "adding %s to series file\n"
 msgstr "sto aggiungendo %s al file series\n"
 
 msgid ""
 "remove patches from queue\n"
 "\n"
-"    The patches must not be applied, unless they are arguments to\n"
-"    the --rev parameter. At least one patch or revision is required.\n"
-"\n"
-"    With --rev, mq will stop managing the named revisions (converting\n"
-"    them to regular mercurial changesets). The qfinish command should be\n"
-"    used as an alternative for qdel -r, as the latter option is deprecated.\n"
-"\n"
-"    With --keep, the patch files are preserved in the patch directory."
+"    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.\n"
+"\n"
+"    To stop managing a patch and move it into permanent history,\n"
+"    use the 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\n"
 "\n"
-"    The patch is inserted into the series after the last applied patch.\n"
-"    If no patches have been applied, qimport prepends the patch\n"
+"    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.\n"
 "\n"
 "    The patch will have the same name as its source file unless you\n"
-"    give it a new one with --name.\n"
-"\n"
-"    You can register an existing patch inside the patch directory\n"
-"    with the --existing flag.\n"
-"\n"
-"    With --force, an existing patch of the same name will be overwritten.\n"
-"\n"
-"    An existing changeset may be placed under mq control with --rev\n"
+"    give it a new one with -n/--name.\n"
+"\n"
+"    You can register an existing patch inside the patch directory with\n"
+"    the -e/--existing flag.\n"
+"\n"
+"    With -f/--force, an existing patch of the same name will be\n"
+"    overwritten.\n"
+"\n"
+"    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 --git, patches imported with --rev will use the git diff\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 "
-"changes.\n"
+"    important for preserving rename/copy information and permission\n"
+"    changes.\n"
+"\n"
+"    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\n"
 "\n"
-"    The queue repository is unversioned by default. If -c is\n"
-"    specified, qinit will create a separate nested repository\n"
-"    for patches (qinit -c may also be run later to convert\n"
-"    an unversioned patch repository into a versioned one).\n"
-"    You can use qcommit to commit changes to this queue repository."
+"    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 ""
 "inizializza un nuovo repository della coda\n"
 "\n"
 "    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 ""
 "clone main and patch repository at same time\n"
 "\n"
-"    If source is local, destination will have no patches applied.  If\n"
+"    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"
+"    applied in destination. If you clone remote repository, be sure\n"
 "    before that it has no patches applied.\n"
 "\n"
 "    Source patch repository is looked for in <src>/.hg/patches by\n"
-"    default.  Use -p <url> to change.\n"
-"\n"
-"    The patch directory must be a nested mercurial repository, as\n"
+"    default. Use -p <url> to change.\n"
+"\n"
+"    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)"
 
-msgid "cloning main repo\n"
+#, fuzzy
+msgid "cloning main repository\n"
 msgstr "sto clonando il repository principale\n"
 
-msgid "cloning patch repo\n"
+#, fuzzy
+msgid "cloning patch repository\n"
 msgstr "sto clonando il repository delle patch\n"
 
-msgid "stripping applied patches from destination repo\n"
+#, fuzzy
+msgid "stripping applied patches from destination repository\n"
 msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n"
 
-msgid "updating destination repo\n"
+#, fuzzy
+msgid "updating destination repository\n"
 msgstr "sto aggiornando il repository di destinazione\n"
 
 msgid "commit changes in the queue repository"
 msgstr "effettua il commit delle modifiche nel repository della coda"
 
 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 "all patches applied\n"
-msgstr "tutte le patch sono state applicate\n"
-
 msgid "print the name of the previous patch"
 msgstr "stampa il nome della patch precedente"
 
-msgid "only one patch applied\n"
-msgstr " stata applicata solo una patch\n"
-
+#, fuzzy
 msgid ""
 "create a new patch\n"
 "\n"
-"    qnew creates a new patch on top of the currently-applied patch (if "
-"any).\n"
-"    It will refuse to run if there are any outstanding changes unless -f is\n"
-"    specified, in which case the patch will be initialized with them. You\n"
-"    may also use -I, -X, 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 as\n"
-"    uncommitted modifications.\n"
-"\n"
-"    -u and -d can be used to set the (given) user and date, respectively.\n"
-"    -U and -D set user to current user and date to current date.\n"
-"\n"
-"    -e, -m or -l set the patch header as well as the commit message. If "
-"none\n"
-"    is specified, the header is empty and the commit message is '[mq]: "
-"PATCH'.\n"
-"\n"
-"    Use the --git option to keep the patch in the git extended diff\n"
+"    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"
+"    -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.\n"
+"\n"
+"    -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.\n"
+"\n"
+"    -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'.\n"
+"\n"
+"    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 ""
 "crea una nuova patch\n"
 "\n"
 "    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.\n"
 "\n"
 "    -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.\n"
 "\n"
 "    -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'.\n"
 "\n"
 "    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\n"
 "\n"
-"    If any file patterns are provided, the refreshed patch will contain "
-"only\n"
-"    the modifications that match those patterns; the remaining "
-"modifications\n"
-"    will remain in the working directory.\n"
-"\n"
-"    If --short is specified, files currently included in the patch will\n"
-"    be refreshed just like matched files and remain in the patch.\n"
-"\n"
-"    hg add/remove/copy/rename work as usual, though you might want to use\n"
-"    git-style patches (--git or [diff] git=1) to track copies and renames.\n"
-"    See the diffs help topic for more information on the git diff format.\n"
+"    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.\n"
+"\n"
+"    If -s/--short is specified, files currently included in the patch\n"
+"    will be refreshed just like matched files and remain in the patch.\n"
+"\n"
+"    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\n"
 "\n"
-"    Shows a diff which includes the current patch as well as any changes "
-"which\n"
-"    have been made in the working directory since the last refresh (thus\n"
-"    showing what the current patch would become after a qrefresh).\n"
-"\n"
-"    Use 'hg diff' if you only want to see the changes made since the last\n"
-"    qrefresh, or 'hg export qtip' if you want to see changes made by the\n"
-"    current patch without including changes made since the qrefresh.\n"
+"    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).\n"
+"\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 made\n"
+"    by the current patch without including changes made since the\n"
+"    qrefresh.\n"
 "    "
 msgstr ""
 
 msgid ""
 "fold the named patches into the current patch\n"
 "\n"
 "    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\n"
-"    be deleted. With -k/--keep, the folded patch files will not\n"
-"    be removed afterwards.\n"
-"\n"
-"    The header for each folded patch will be concatenated with\n"
-"    the current patch header, separated by a line of '* * *'."
+"    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.\n"
+"\n"
+"    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\n"
 "\n"
 "    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"
 "    has activated it.\n"
 "\n"
 "    With no arguments, print the currently active guards.\n"
 "    With arguments, set guards for the named patch.\n"
 "    NOTE: Specifying negative guards now requires '--'.\n"
 "\n"
 "    To set guards on another patch:\n"
 "      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\n"
 "\n"
-"    When --force is applied, all local changes in patched files will be "
-"lost.\n"
+"    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\n"
 "\n"
-"    By default, pops off the top of the patch stack. If given a patch name,\n"
-"    keeps popping off patches until the named patch is at the top of the "
-"stack.\n"
+"    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\n"
 "\n"
 "    With one argument, renames the current patch to PATCH1.\n"
 "    With two arguments, renames PATCH1 to PATCH2."
 msgstr ""
 "rinomina una patch\n"
 "\n"
 "    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"
 
-msgid "restore the queue state saved by a rev"
+#, fuzzy
+msgid "restore the queue state saved by a revision"
 msgstr "ripristina lo stato della coda salvato da una revisione"
 
 msgid "save current queue state"
 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\n"
 "\n"
-"    If one of the working dir's parent revisions is stripped, the working\n"
-"    directory will be updated to the parent of the stripped revision.\n"
+"    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"
 "    "
 msgstr ""
 "elimina una revisione e tutti i suoi discendenti dal repository\n"
 "\n"
 "    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 ""
 "set or print guarded patches to push\n"
 "\n"
 "    Use the 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 it\n"
-"    has no guards or any positive guards match the currently selected "
-"guard,\n"
-"    but will not be pushed if any negative guards match the current guard.\n"
-"    For example:\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:\n"
 "\n"
 "        qguard foo.patch -stable    (negative guard)\n"
 "        qguard bar.patch +stable    (positive guard)\n"
 "        qselect stable\n"
 "\n"
 "    This activates the \"stable\" guard. mq will skip foo.patch (because\n"
-"    it has a negative match) but push bar.patch (because it\n"
-"    has a positive match).\n"
+"    it has a negative match) but push bar.patch (because it has a\n"
+"    positive match).\n"
 "\n"
 "    With no arguments, prints the currently active guards.\n"
 "    With one argument, sets the active guard.\n"
 "\n"
 "    Use -n/--none to deactivate guards (no other arguments needed).\n"
-"    When no guards are active, patches with positive guards are skipped\n"
-"    and patches with negative guards are pushed.\n"
+"    When no guards are active, patches with positive guards are\n"
+"    skipped and patches with negative guards are pushed.\n"
 "\n"
 "    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 applied\n"
-"    patch that is not guarded. Use --reapply (which implies --pop) to push\n"
-"    back to the current patch afterwards, but skip guarded patches.\n"
-"\n"
-"    Use -s/--series to print a list of all guards in the series file (no\n"
-"    other arguments needed). Use -v for more information."
+"    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.\n"
+"\n"
+"    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"
 
 #, 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\n"
 "\n"
-"    Finishes the specified revisions (corresponding to applied patches) by\n"
-"    moving them out of mq control into regular repository history.\n"
-"\n"
-"    Accepts a revision range or the --applied option. If --applied is\n"
-"    specified, all applied mq revisions are removed from mq control.\n"
-"    Otherwise, the given revisions must be at the base of the stack of\n"
-"    applied patches.\n"
-"\n"
-"    This can be especially useful if your changes have been applied to an\n"
-"    upstream repository, or if you are about to push your changes to "
-"upstream.\n"
+"    Finishes the specified revisions (corresponding to applied\n"
+"    patches) by moving them out of mq control into regular repository\n"
+"    history.\n"
+"\n"
+"    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.\n"
+"\n"
+"    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 "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"
 
 msgid "print first line of patch header"
 msgstr "stampa la prima riga dell'intestazione della patch"
 
-msgid "hg qapplied [-s] [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 "location of source patch repo"
+#, 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"
 
-msgid "stop managing a revision"
+#, 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]..."
 msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARDIA]... [-GUARDIA]..."
 
 msgid "hg qheader [PATCH]"
 msgstr "hg qheader [PATCH]"
 
-msgid "import file in patch dir"
+#, fuzzy
+msgid "import file in patch directory"
 msgstr "importa il file nella directory delle patch"
 
-msgid "patch file name"
-msgstr "nome del file della 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 "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..."
+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"
 
 msgid "add \"From: <current user>\" to patch"
 msgstr "aggiunge \"Da: <utente corrente>\" alla patch"
 
 msgid "add \"From: <given 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"
 msgstr "aggiunge \"Data: <data fornita>\" alla patch"
 
 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] 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"
 msgstr "nome della coda da disapplicare"
 
-msgid "forget any local changes"
+#, 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"
 msgstr "effettua il merge da un'altra coda"
 
 msgid "merge queue name"
 msgstr "nome della coda del merge"
 
 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [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 \"From: <current user>\" in patch"
-msgstr "aggiunge/aggiorna \"Da: <utente corrente>\" nella patch"
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr "aggiunge/aggiorna \"Da: <utente fornito>\" nella patch"
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr "aggiorna \"Data: <data corrente>\" nella patch (se presente)"
-
-msgid "update \"Date: <given date>\" in patch (if present)"
+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"
 
-msgid "update queue working dir"
+#, 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"
 msgstr ""
 
 msgid "no backups"
 msgstr "nessun backup"
 
 msgid "hg strip [-f] [-b] [-n] REV"
 msgstr "hg strip [-f] [-b] [-n] REV"
 
 msgid "hg qtop [-s]"
 msgstr "hg qtop [-s]"
 
-msgid "hg qunapplied [-s] [PATCH]"
+#, 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"
 
-msgid "hg qfinish [-a] [REV...]"
+#, fuzzy
+msgid "hg qfinish [-a] [REV]..."
 msgstr "hg qfinish [-a] [REV...]"
 
 msgid ""
-"hook extension to email notifications on commits/pushes\n"
-"\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-"   [extensions]\n"
-"   hgext.notify =\n"
-"\n"
-"   [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\n"
-"\n"
-"   [notify]\n"
-"   # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-"   config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-"   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 "
+"hooks for sending email notifications at commit/push time\n"
+"\n"
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.notify =\n"
+"\n"
+"  [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\n"
+"\n"
+"  [notify]\n"
+"  # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+"  config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+"  test = True            # print messages to stdout for testing\n"
+"  strip = 3              # number of slashes to strip for url paths\n"
+"  domain = example.com   # domain to use if committer missing domain\n"
+"  style = ...            # style file to use when formatting email\n"
+"  template = ...         # template to use when formatting email\n"
+"  incoming = ...         # template to use when run as incoming hook\n"
+"  changegroup = ...      # template when run as changegroup hook\n"
+"  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
+"  maxsubject = 67        # truncate subject line longer than this\n"
+"  diffstat = True        # add a diffstat before the diff content\n"
+"  sources = serve        # notify if source of incoming changes in this "
 "list\n"
-"                          # (serve == ssh or http, push, pull, bundle)\n"
-"   [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\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-"   [usersubs]\n"
-"   # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-"   user@host = pattern\n"
-"\n"
-"   [reposubs]\n"
-"   # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-"   pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repo root.\n"
-"\n"
-" if you like, you can put notify config file in repo that users can\n"
-" push changes to, they can manage their own subscriptions."
-msgstr ""
-
-msgid "email notification class."
-msgstr "classe per la notifica via email."
-
-msgid "strip leading slashes from local path, turn into web-safe path."
-msgstr ""
-
-msgid "try to clean up email addresses."
-msgstr "prova a pulire gli indirizzi email."
-
-msgid "return list of email addresses of subscribers to this repo."
-msgstr "restituisce gli indirizzi email dei sottoscritti a questo repository"
-
-msgid "format one changeset."
-msgstr "formatta un changeset."
-
-msgid "true if incoming changes from this source should be skipped."
-msgstr ""
-"vero se le modifiche in entrata da questa sorgente dovrebbero essere saltate."
-
-msgid "send message."
-msgstr "invia messaggio."
+"                         # (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\n"
+"\n"
+"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.\n"
+"\n"
+"::\n"
+"\n"
+"  [usersubs]\n"
+"  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+"  user@host = pattern\n"
+"\n"
+"  [reposubs]\n"
+"  # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+"  pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"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):\n"
 "\n"
 msgstr ""
 "\n"
 "diff (troncati da %d linee a %d):\n"
 "\n"
 
 #, python-format
 msgid ""
 "\n"
 "diffs (%d lines):\n"
 "\n"
 msgstr ""
 "\n"
 "diff (%d linee):\n"
 "\n"
 
-msgid ""
-"send email notifications to interested subscribers.\n"
-"\n"
-"    if used as changegroup hook, send one email for all changesets in\n"
-"    changegroup. else send one email per changeset."
-msgstr ""
-
-#, python-format
-msgid "notify: no subscribers to repo %s\n"
-msgstr ""
-
-#, python-format
-msgid "notify: changes have source \"%s\" - skipping\n"
-msgstr ""
-
-msgid ""
-"browse command output with external pager\n"
-"\n"
-"To set the pager that should be used, set the application variable:\n"
+#, python-format
+msgid "notify: suppressing notification for merge %d:%s\n"
+msgstr ""
+
+msgid ""
+"browse command output with an external pager\n"
+"\n"
+"To set the pager that should be used, set the application variable::\n"
 "\n"
 "  [pager]\n"
 "  pager = LESS='FSRX' less\n"
 "\n"
-"If no pager is set, the pager extensions uses the environment\n"
-"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n"
-"is used.\n"
-"\n"
-"If you notice \"BROKEN PIPE\" error messages, you can disable them\n"
-"by setting:\n"
+"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.\n"
+"\n"
+"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
+"setting::\n"
 "\n"
 "  [pager]\n"
 "  quiet = True\n"
 "\n"
 "You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
 "\n"
 "  [pager]\n"
 "  ignore = version, help, update\n"
 "\n"
-"You can also enable the pager only for certain commands using pager.attend:\n"
+"You can also enable the pager only for certain commands using\n"
+"pager.attend::\n"
 "\n"
 "  [pager]\n"
 "  attend = log\n"
 "\n"
 "If pager.attend is present, pager.ignore will be ignored.\n"
 "\n"
-"To ignore global commands like \"hg version\" or \"hg help\", you have to "
-"specify\n"
-"them in the global .hgrc\n"
-msgstr ""
-
-msgid ""
-"use suffixes to refer to ancestor revisions\n"
-"\n"
-"This extension allows you to use git-style suffixes to refer to\n"
-"the ancestors of a specific revision.\n"
-"\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo:\n"
+"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
+"specify them in the global .hgrc\n"
+msgstr ""
+
+msgid ""
+"interpret suffixes to refer to ancestor revisions\n"
+"\n"
+"This extension allows you to use git-style suffixes to refer to the\n"
+"ancestors of a specific revision.\n"
+"\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+"  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\n"
 "\n"
-"- foo~N = Nth first grandparent of foo\n"
+"  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 ""
-"sending Mercurial changesets as a series of patch emails\n"
-"\n"
-"The series is started off with a \"[PATCH 0 of N]\" introduction,\n"
-"which describes the series as a whole.\n"
-"\n"
-"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 body parts:\n"
-"\n"
-"  The remainder of the changeset description.\n"
-"\n"
-"  [Optional] The result of running diffstat on the patch.\n"
-"\n"
-"  The patch itself, as generated by \"hg export\".\n"
-"\n"
-"Each message refers to all of its predecessors using the In-Reply-To\n"
-"and References headers, so they will show up as a sequence in\n"
-"threaded mail and news readers, and in mail archives.\n"
-"\n"
-"For each changeset, you will be prompted with a diffstat summary and\n"
-"the changeset summary, so you can be sure you are sending the right "
-"changes.\n"
-"\n"
-"To enable this extension:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.patchbomb =\n"
-"\n"
-"To configure other defaults, add a section like this to your hgrc file:\n"
+"command to send changesets as (a series of) patch emails\n"
+"\n"
+"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
+"describes the series as a whole.\n"
+"\n"
+"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:\n"
+"\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
+"\n"
+"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.\n"
+"\n"
+"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.\n"
+"\n"
+"To configure other defaults, add a section like this to your hgrc\n"
+"file::\n"
 "\n"
 "  [email]\n"
 "  from = My Name <my@email>\n"
 "  to = recipient1, recipient2, ...\n"
 "  cc = cc1, cc2, ...\n"
 "  bcc = bcc1, bcc2, ...\n"
 "\n"
 "Then you can use the \"hg email\" command to mail a series of changesets\n"
 "as a patchbomb.\n"
 "\n"
 "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"
-"prompted for an email recipient address, a subject an an introductory\n"
-"message describing the patches of your patchbomb.  Then when all is\n"
-"done, patchbomb messages are displayed. If PAGER environment variable\n"
-"is set, your pager will be fired up once for each patchbomb message, so\n"
-"you can verify everything is alright.\n"
-"\n"
-"The \"-m\" (mbox) option is also very useful.  Instead of previewing\n"
-"each patchbomb message in a pager or sending the messages directly,\n"
-"it will create a UNIX mailbox file with the patch emails.  This\n"
-"mailbox file can be previewed with any mail user agent which supports\n"
-"UNIX mbox files, e.g. with mutt:\n"
+"the \"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.\n"
+"\n"
+"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::\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
-"(a utility that is commonly installed as part of the procmail package),\n"
-"to send each message out:\n"
+"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::\n"
 "\n"
 "  % formail -s sendmail -bm -t < mbox\n"
 "\n"
 "That should be all. Now your patchbomb is on its way out.\n"
 "\n"
 "You can also either configure the method option in the email section\n"
-"to be a sendmail compatable mailer or fill out the [smtp] section so\n"
-"that the patchbomb extension can automatically send patchbombs directly\n"
-"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n"
-"for details."
-msgstr ""
+"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"
+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? "
 msgstr "il diffstat di sopra sembra corretto? "
 
 msgid "diffstat rejected"
 msgstr "diffstat rifiutato"
 
 msgid ""
 "send changesets by email\n"
 "\n"
 "    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"
+"    one per message. The series starts with a \"[PATCH 0 of N]\"\n"
 "    introduction, which describes the series as a whole.\n"
 "\n"
 "    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 body parts.  First, the rest of\n"
-"    the changeset description.  Next, (optionally) if the diffstat\n"
-"    program is installed, the result of running diffstat on the patch.\n"
-"    Finally, the patch itself, as generated by \"hg export\".\n"
-"\n"
-"    With --outgoing, emails will be generated for patches not\n"
-"    found in the destination repository (or only those which are\n"
-"    ancestors of the specified revisions if any are provided)\n"
-"\n"
-"    With --bundle, changesets are selected as for --outgoing,\n"
-"    but a single email containing a binary Mercurial bundle as an\n"
-"    attachment will be sent.\n"
-"\n"
-"    Examples:\n"
-"\n"
-"    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)\n"
-"\n"
-"    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\n"
-"\n"
-"    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 "
+"    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\".\n"
+"\n"
+"    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.\n"
+"\n"
+"    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)\n"
+"\n"
+"    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.\n"
+"\n"
+"    Examples::\n"
+"\n"
+"      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)\n"
+"\n"
+"      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\n"
+"\n"
+"      hg email -b               # send bundle of all patches not in default\n"
+"      hg email -b DEST          # send bundle of all patches not in DEST\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
 "default\n"
-"    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST\n"
-"\n"
-"    Before using this command, you will need to enable email in your hgrc.\n"
-"    See the [email] section in hgrc(5) for details.\n"
+"      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in "
+"DEST\n"
+"\n"
+"    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 "Return the revisions present locally but not in dest"
-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.\n"
 "\n"
 msgstr ""
 "\n"
 "Scrivi il messaggio introduttivo per la serie di patch.\n"
 "\n"
 
 #, python-format
 msgid ""
 "This patch series consists of %d patches.\n"
 "\n"
 msgstr ""
 "Questa serie di patch consiste di %d patch.\n"
 "\n"
 
 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"
 
 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"
 
-msgid "file name of the bundle attachment"
+#, 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"
 
-msgid "run even when remote repository is unrelated (with -b)"
+#, fuzzy
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
 msgstr "esegui anche quando il repository remoto non è collegato (con -b)"
 
-msgid "a base changeset to specify instead of a destination (with -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]..."
 
+#, 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\n"
 "\n"
-"    Delete files not known to Mercurial. This is useful to test local and\n"
-"    uncommitted changes in an otherwise-clean source tree.\n"
+"    Delete files not known to Mercurial. This is useful to test local\n"
+"    and uncommitted changes in an otherwise-clean source tree.\n"
 "\n"
 "    This means that purge will delete:\n"
-"     - Unknown files: files marked with \"?\" by \"hg status\"\n"
-"     - Empty directories: in fact Mercurial ignores directories unless they\n"
-"       contain files under source control managment\n"
+"\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\n"
+"\n"
 "    But it will leave untouched:\n"
-"     - Modified and unmodified tracked files\n"
-"     - Ignored files (unless --all is specified)\n"
-"     - New files added to the repository (with \"hg add\")\n"
+"\n"
+"    - Modified and unmodified tracked files\n"
+"    - Ignored files (unless --all is specified)\n"
+"    - New files added to the repository (with \"hg add\")\n"
 "\n"
 "    If directories are given on the command line, only files in these\n"
 "    directories are considered.\n"
 "\n"
-"    Be careful with purge, as you could irreversibly delete some files you\n"
-"    forgot to add to the repository. If you only want to print the list of\n"
-"    files that this program would delete, use the --print option.\n"
+"    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"
 
-msgid "print the file names instead of deleting them"
+#, fuzzy
+msgid "print filenames instead of deleting them"
 msgstr "stampa i nomi dei file invece di cancellarli"
 
-msgid "end filenames with NUL, for use with xargs (implies -p)"
+#, 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]..."
 
-msgid ""
-"move sets of revisions to a different ancestor\n"
-"\n"
-"This extension lets you rebase changesets in an existing Mercurial "
+#, fuzzy
+msgid ""
+"command to move sets of revisions to a different ancestor\n"
+"\n"
+"This extension lets you rebase changesets in an existing Mercurial\n"
 "repository.\n"
 "\n"
 "For more information:\n"
-"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 "sposta insiemi di revisioni su un antenato differente\n"
 "\n"
 "Questa estensione consente di effettuare il rebase di changeset in un\n"
 "repository Mercurial esistente.\n"
 "\n"
 "Per maggiori informazioni:\n"
 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
 
-msgid "return the correct ancestor"
-msgstr "restituisce l'antenato corretto"
-
-msgid "first revision, do not change ancestor\n"
-msgstr "prima revisione, non cambia l'antenato\n"
-
+#, fuzzy
 msgid ""
 "move changeset (and descendants) to a different branch\n"
 "\n"
-"    Rebase uses repeated merging to graft changesets from one part of "
-"history\n"
-"    onto another. This can be useful for linearizing local changes relative "
-"to\n"
-"    a master development tree.\n"
-"\n"
-"    If a rebase is interrupted to manually resolve a merge, it can be "
-"continued\n"
-"    with --continue or aborted with --abort.\n"
+"    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.\n"
+"\n"
+"    If a rebase is interrupted to manually resolve a merge, it can be\n"
+"    continued with --continue/-c or aborted with --abort/-a.\n"
 "    "
 msgstr ""
 "sposta changeset (e discendenti) su una branch differente\n"
 "\n"
 "    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.\n"
 "\n"
 "    Se un rebase viene interrotto per risolvere manualmente un merge,\n"
 "    può essere ripreso con --continue o abortito con --abort.\n"
 "    "
 
-msgid "cannot use both keepbranches and extrafn"
-msgstr "non è possibile usare sia keepbranches sia extrafn"
-
 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"
 
 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 "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 "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"
 
 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 ""
-"Skip commit if collapsing has been required and rev is not the last\n"
-"    revision, commit otherwise\n"
-"    "
-msgstr ""
-"Salta il commit se è stato richiesto di collassare e rev non è l'ultima\n"
-"    revisione, effettua il commit altrimenti\n"
-"    "
-
-msgid " set parents\n"
-msgstr " imposta i genitori\n"
-
-msgid "Rebase a single revision"
-msgstr "Rebase di una singola revisione"
-
-#, python-format
-msgid "rebasing %d:%s\n"
-msgstr "sto effettuando il rebase di %d:%s\n"
-
-#, python-format
-msgid " future parents are %d and %d\n"
-msgstr " i genitori futuri sono %d e %d\n"
-
-#, python-format
-msgid " update to %d:%s\n"
-msgstr " aggiorno a %d:%s\n"
-
-msgid " already in target\n"
-msgstr " già su target\n"
-
-#, python-format
-msgid " merge against %d:%s\n"
-msgstr " merge con %d:%s\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"
 
-msgid "resuming interrupted rebase\n"
-msgstr "sto riprendendo un rebase interrotto\n"
-
 #, python-format
 msgid "no changes, revision %d skipped\n"
 msgstr "nessuna modifica, revisione %d saltata\n"
 
 #, python-format
-msgid "next revision set to %s\n"
-msgstr "prossima revisione impostata su %s\n"
-
-msgid "Return the new parent relationship of the revision that will be rebased"
-msgstr ""
-"Restituisce la nuova relazione di parentela della revisione di cui si farà "
-"il rebase"
-
-#, 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"
 
-msgid "Update rebased mq patches - finalize and then import them"
-msgstr ""
-"Aggiorna le patch mq di cui si è effettuato il rebase - le finalizza e poi "
-"le importa"
-
-#, python-format
-msgid "revision %d is an mq patch (%s), finalize it.\n"
-msgstr "la revisione %d è una patch mq (%s), la finalizzo.\n"
-
-#, python-format
-msgid "import mq patch %d (%s)\n"
-msgstr "import della patch mq %d (%s)\n"
-
-msgid "Store the current status to allow recovery"
-msgstr "Salva lo status corrente per consentire il recupero"
-
-msgid "rebase status stored\n"
-msgstr "status del rebase salvato\n"
-
-msgid "Remove the status files"
-msgstr "Rimuove i file dello stato"
-
-msgid "Restore a previously stored status"
-msgstr "Ripristina uno stato precedentemente salvato"
-
-msgid "rebase status resumed\n"
-msgstr "status di rebase recuperato\n"
-
 msgid "no rebase in progress"
 msgstr "nessun rebase in corso"
 
-msgid "Restore the repository to its original state"
-msgstr "Ripristina il repository al suo stato originale"
-
 msgid "warning: new changesets detected on target branch, not stripping\n"
 msgstr ""
 "attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
 
 msgid "rebase aborted\n"
 msgstr "rebase abortito\n"
 
-msgid "Define which revisions are going to be rebased and where"
-msgstr "Definisce di quali revisioni si farà il rebase e dove"
-
 msgid "cannot rebase onto an applied mq patch"
 msgstr "non è possibile effettuare il rebase su una patch mq applicata"
 
-msgid "cannot rebase an ancestor"
-msgstr "non è possibile effettuare il rebase di un antenato"
-
-msgid "cannot rebase a descendant"
-msgstr "non è possibile effettuare il rebase di un discendente"
-
-msgid "already working on current\n"
-msgstr "sto già lavorando su current\n"
-
-msgid "already working on the current branch\n"
-msgstr "sto già lavorando sulla branch corrente\n"
-
-#, python-format
-msgid "rebase onto %d starting from %d\n"
-msgstr "rebase su %d partendo da %d\n"
+#, 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 "Call rebase after pull if the latter has been invoked with --rebase"
-msgstr "Invoca rebase dopo pull se l'ultimo è stato invocato con --rebase"
-
-msgid "--update and --rebase are not compatible, ignoring the update flag\n"
-msgstr "--update e --rebase non sono compatibili, ignoro il flag update\n"
-
-msgid "Replace pull with a decorator to provide --rebase option"
-msgstr "Rimpiazza pull con un decoratore per fornire l'opzione --rebase"
-
 msgid "rebase working directory to branch head"
 msgstr "effettua il rebase della directory di lavoro sulla head della branch"
 
-msgid "keep original revisions"
-msgstr "mantiene le revisioni originali"
-
-msgid "keep original branches"
-msgstr "mantiene le branch originali"
-
 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 "collapse the rebased revisions"
+#, 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 "continue an interrupted rebase"
 msgstr "continua un rebase interrotto"
 
 msgid "abort an interrupted rebase"
 msgstr "abortisce un rebase interrotto"
 
-msgid ""
-"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
+#, 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 "interactive change selection during commit or qrefresh"
+#, fuzzy
+msgid "commands to interactively select changes for commit/qrefresh"
 msgstr "cambia interattivamente la selezione durante un commit o qrefresh"
 
-msgid ""
-"like patch.iterhunks, but yield different events\n"
-"\n"
-"    - ('file',    [header_lines + fromfile + tofile])\n"
-"    - ('context', [context_lines])\n"
-"    - ('hunk',    [hunk_lines])\n"
-"    - ('range',   (-start,len, +start,len, diffp))\n"
-"    "
-msgstr ""
-
-msgid "scan lr while predicate holds"
-msgstr "scansiona lr fino a quando il predicato vale"
-
-msgid ""
-"patch header\n"
-"\n"
-"    XXX shoudn't we move this to mercurial/patch.py ?\n"
-"    "
-msgstr ""
-"intestazione della patch\n"
-"\n"
-"    XXX non dovremmo spostare questo in mercurial/patch.py ?\n"
-"    "
-
 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 "hunk -> (n+,n-)"
-msgstr "hunk -> (n+,n-)"
-
-msgid ""
-"patch hunk\n"
-"\n"
-"    XXX shouldn't we merge this with patch.hunk ?\n"
-"    "
-msgstr ""
-
-msgid "patch -> [] of hunks "
-msgstr ""
-
-msgid "patch parsing state machine"
-msgstr ""
-
-msgid "Interactively filter patch chunks into applied-only chunks"
-msgstr ""
-
-msgid ""
-"fetch next portion from chunks until a 'header' is seen\n"
-"        NB: header == new-file mark\n"
-"        "
-msgstr ""
-
-msgid ""
-"prompt query, and process base inputs\n"
-"\n"
-"        - y/n for the rest of file\n"
-"        - y/n for the rest\n"
-"        - ? (help)\n"
-"        - q (quit)\n"
-"\n"
-"        else, input is returned to the caller.\n"
-"        "
-msgstr ""
-
 msgid "[Ynsfdaq?]"
 msgstr "[Ynsfdaq?]"
 
-msgid "y"
-msgstr "y"
-
-msgid "?"
+#, 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 "s"
-msgstr "s"
-
-msgid "f"
-msgstr "f"
-
-msgid "d"
-msgstr "d"
-
-msgid "a"
-msgstr "a"
-
-msgid "q"
-msgstr "q"
-
 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\n"
 "\n"
 "    If a list of files is omitted, all changes reported by \"hg status\"\n"
 "    will be candidates for recording.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "\n"
 "    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:\n"
-"\n"
-"    y - record this change\n"
-"    n - skip this change\n"
-"\n"
-"    s - skip remaining changes to this file\n"
-"    f - record remaining changes to this file\n"
-"\n"
-"    d - done, skip remaining changes and files\n"
-"    a - record all changes to all remaining files\n"
-"    q - quit, recording no changes\n"
-"\n"
-"    ? - display help"
+"    change to use. For each query, the following responses are\n"
+"    possible::\n"
+"\n"
+"      y - record this change\n"
+"      n - skip this change\n"
+"\n"
+"      s - skip remaining changes to this file\n"
+"      f - record remaining changes to this file\n"
+"\n"
+"      d - done, skip remaining changes and files\n"
+"      a - record all changes to all remaining files\n"
+"      q - quit, recording no changes\n"
+"\n"
+"      ? - display help"
 msgstr ""
 "seleziona interattivamente le modifiche di cui eseguire il commit\n"
 "\n"
 "    Se viene omesso un elenco di file, tutte le modifiche\n"
 "    riportate da \"hg status\" saranno candidati per la\n"
 "    registrazione.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco di formati\n"
 "    validi per -d/--date.\n"
 "\n"
 "    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:\n"
 "\n"
 "    y - registra questa modifica\n"
 "    n - salta questa modifica\n"
 "\n"
 "    s - salta le modifiche rimanenti di questo file\n"
 "    f - registra le modifiche rimanenti di questo file\n"
 "\n"
 "    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\n"
 "\n"
 "    ? - mostra il messaggio di aiuto"
 
-msgid ""
-"interactively record a new patch\n"
-"\n"
-"    see 'hg help qnew' & 'hg help record' for more information and usage\n"
-"    "
-msgstr ""
-
 msgid "'mq' extension not loaded"
 msgstr "estensione 'mq' non caricata"
 
 msgid "running non-interactively, use commit instead"
 msgstr ""
 
-msgid ""
-"This is generic record driver.\n"
-"\n"
-"        It's job is to interactively filter local changes, and accordingly\n"
-"        prepare working dir into a state, where the job can be delegated to\n"
-"        non-interactive commit command such as 'commit' or 'qrefresh'.\n"
-"\n"
-"        After the actual job is done by non-interactive command, working "
-"dir\n"
-"        state is restored to original.\n"
-"\n"
-"        In the end we'll record intresting changes, and everything else will "
-"be\n"
-"        left in place, so the user can continue his work.\n"
-"        "
-msgstr ""
-
 msgid "no changes to record\n"
 msgstr "nessuna modifica da registrare\n"
 
-#, python-format
-msgid "backup %r as %r\n"
-msgstr "backup %r come %r\n"
-
-msgid "applying patch\n"
-msgstr "sto applicando una patch\n"
-
 msgid "patch failed to apply"
 msgstr ""
 
-#, python-format
-msgid "restoring %r to %r\n"
-msgstr ""
-
 msgid "hg record [OPTION]... [FILE]..."
 msgstr "hg record [OPZIONI]... [FILE]..."
 
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..."
 
-msgid ""
-"patch transplanting tool\n"
+msgid "share a common history between several working directories"
+msgstr ""
+
+msgid ""
+"create a new shared repository (experimental)\n"
+"\n"
+"    Initialize a new repository and working directory that shares its\n"
+"    history with another repository.\n"
+"\n"
+"    NOTE: actions that change history such as rollback or moving the\n"
+"    source may confuse sharers.\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\n"
 "\n"
 "This extension allows you to transplant patches from another branch.\n"
 "\n"
-"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n"
-"from a changeset hash to its hash in the source repository.\n"
-msgstr ""
-
-msgid ""
-"returns True if a node is already an ancestor of parent\n"
-"        or has already been transplanted"
-msgstr ""
-
-msgid "apply the revisions in revmap one by one in revision order"
+"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 ""
 
-msgid "arbitrarily rewrite changeset before applying it"
-msgstr ""
-
 #, python-format
 msgid "filtering %s\n"
 msgstr "sto filtrando %s\n"
 
 msgid "filter failed"
 msgstr "filtraggio fallito"
 
-msgid "apply the patch in patchfile to the repository as a transplant"
-msgstr ""
-
 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 ""
 
-msgid "recover last transaction and apply remaining changesets"
-msgstr ""
-
 #, python-format
 msgid "%s transplanted as %s\n"
 msgstr "%s trapiantato come %s\n"
 
-msgid "commit working directory using journal metadata"
-msgstr ""
-
 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 "journal changelog metadata for later recover"
-msgstr ""
-
-msgid "remove changelog journal"
-msgstr ""
-
-msgid "interactively transplant changesets"
-msgstr ""
-
 msgid "apply changeset? [ynmpcq?]:"
 msgstr "applicare il changeset? [ynmpcq?]:"
 
 msgid ""
 "transplant changesets from another branch\n"
 "\n"
 "    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:\n"
-"\n"
-"    (transplanted from CHANGESETHASH)\n"
+"    specified, log messages will have a comment appended of the form::\n"
+"\n"
+"      (transplanted from CHANGESETHASH)\n"
 "\n"
 "    You can rewrite the changelog message with the --filter option.\n"
-"    Its argument will be invoked with the current changelog message\n"
-"    as $1 and the patch as $2.\n"
-"\n"
-"    If --source is specified, selects changesets from the named\n"
-"    repository. If --branch is specified, selects changesets from the\n"
-"    branch holding the named revision, up to that revision. If --all\n"
-"    is specified, all changesets on the branch will be transplanted,\n"
-"    otherwise you will be prompted to select the changesets you want.\n"
-"\n"
-"    hg transplant --branch REVISION --all will rebase the selected branch\n"
-"    (up to the named revision) onto your current working directory.\n"
-"\n"
-"    You can optionally mark selected transplanted changesets as\n"
-"    merge changesets. You will not be prompted to transplant any\n"
-"    ancestors of a merged transplant, and you can merge descendants\n"
-"    of them normally instead of transplanting them.\n"
+"    Its argument will be invoked with the current changelog message as\n"
+"    $1 and the patch as $2.\n"
+"\n"
+"    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.\n"
+"\n"
+"    hg transplant --branch REVISION --all will rebase the selected\n"
+"    branch (up to the named revision) onto your current working\n"
+"    directory.\n"
+"\n"
+"    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.\n"
 "\n"
 "    If no merges or revisions are provided, hg transplant will start\n"
 "    an interactive changeset browser.\n"
 "\n"
-"    If a changeset application fails, you can fix the merge by hand and\n"
-"    then resume where you left off by calling hg transplant --continue.\n"
+"    If a changeset application fails, you can fix the merge by hand\n"
+"    and then resume where you left off by calling hg transplant\n"
+"    --continue/-c.\n"
 "    "
 msgstr ""
 
 msgid "--continue is incompatible with branch, all or merge"
 msgstr ""
 
 msgid "no source URL, branch tag or revision list provided"
 msgstr ""
 
 msgid "--all requires a branch revision"
 msgstr ""
 
 msgid "--all is incompatible with a revision list"
 msgstr ""
 
 msgid "no revision checked out"
 msgstr ""
 
 msgid "outstanding uncommitted merges"
 msgstr ""
 
 msgid "outstanding local changes"
 msgstr ""
 
 msgid "pull patches from REPOSITORY"
 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]..."
 msgstr ""
 
 msgid ""
-"allow to use MBCS path with problematic encoding.\n"
-"\n"
-"Some MBCS encodings are not good for some path operations\n"
-"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n"
-"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n"
-"encoding\".  This extension can be used to fix the issue with those\n"
-"encodings by wrapping some functions to convert to unicode string\n"
-"before path operation.\n"
-"\n"
-"This extension is usefull for:\n"
-" * 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\n"
-"   on case-insensitive file system.\n"
+"allow the use of MBCS paths with problematic encodings\n"
+"\n"
+"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.\n"
+"\n"
+"This extension is useful for:\n"
+"\n"
+"- 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.\n"
 "\n"
 "This extension is not needed for:\n"
-" * Any user who use only ascii chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
 "\n"
 "Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or HGENCODING.\n"
-"\n"
-"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n"
-"\n"
-"  [extensions]\n"
-"  hgext.win32mbcs =\n"
-"\n"
-"Path encoding conversion are done between unicode and util._encoding\n"
-"which is decided by mercurial from current locale setting or HGENCODING.\n"
-"\n"
-msgstr ""
-
-#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+"  HGENCODING.\n"
+"\n"
+"Path encoding conversion are done between Unicode and\n"
+"encoding.encoding which is decided by Mercurial from current locale\n"
+"setting or HGENCODING.\n"
+msgstr ""
+
+#, python-format
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
 msgstr ""
 
 msgid "[win32mbcs] cannot activate on this platform.\n"
 msgstr ""
 
-#, python-format
-msgid "[win32mbcs] activated with encoding: %s\n"
+msgid ""
+"perform automatic newline conversion\n"
+"\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+"  [extensions]\n"
+"  hgext.win32text =\n"
+"  [encode]\n"
+"  ** = cleverencode:\n"
+"  # or ** = macencode:\n"
+"\n"
+"  [decode]\n"
+"  ** = cleverdecode:\n"
+"  # or ** = macdecode:\n"
+"\n"
+"If not doing conversion, to make sure you do not commit CRLF/CR by "
+"accident::\n"
+"\n"
+"  [hooks]\n"
+"  pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+"  # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"\n"
+"To do the same check on a server to prevent CRLF/CR from being\n"
+"pushed or pulled::\n"
+"\n"
+"  [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:\n"
 "\n"
 "[hooks]\n"
 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
 "\n"
 "and also consider adding:\n"
 "\n"
 "[extensions]\n"
 "hgext.win32text =\n"
 "[encode]\n"
 "** = %sencode:\n"
 "[decode]\n"
 "** = %sdecode:\n"
 msgstr ""
 
 msgid ""
-"zeroconf support for mercurial repositories\n"
-"\n"
-"Zeroconf enabled repositories will be announced in a network without the "
-"need\n"
-"to configure a server or a service. They can be discovered without knowing\n"
-"their actual IP address.\n"
-"\n"
-"To use the zeroconf extension add the following entry to your hgrc file:\n"
-"\n"
-"[extensions]\n"
-"hgext.zeroconf =\n"
-"\n"
-"To allow other people to discover your repository using run \"hg serve\" in "
-"your\n"
-"repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"discover and advertise repositories on the local network\n"
+"\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.\n"
+"\n"
+"To allow other people to discover your repository using run \"hg serve\"\n"
+"in your repository::\n"
+"\n"
+"  $ cd test\n"
+"  $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+"  $ 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 ""
 
 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 file name"
+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 ""
 
 #, 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"
 
 #, 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"
 
 #, 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 file names"
-msgstr ""
-
-#, python-format
-msgid "file %s not found!"
-msgstr "file %s non trovato!"
-
-#, python-format
-msgid "no match under directory %s!"
-msgstr "nessuna corrispondenza sotto la directory %s!"
-
-#, python-format
-msgid "can't commit %s: unsupported file type!"
-msgstr "impossibile fare il commit di %s: tipo di file non supportato!"
-
-#, python-format
-msgid "file %s not tracked!"
-msgstr "il file %s non è tracciato!"
+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 ""
+
+#, fuzzy, python-format
+msgid "HG: user: %s"
+msgstr "utente: %s\n"
+
+msgid "HG: branch merge"
+msgstr ""
+
+#, python-format
+msgid "HG: branch '%s'"
+msgstr ""
+
+#, python-format
+msgid "HG: subrepo %s"
+msgstr ""
+
+#, python-format
+msgid "HG: added %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "HG: changed %s"
+msgstr "aggiungo changeset %s\n"
+
+#, fuzzy, python-format
+msgid "HG: removed %s"
+msgstr "rimossi"
+
+#, fuzzy
+msgid "HG: no files changed"
+msgstr "sto aggiungendo le modifiche ai file\n"
+
+msgid "empty commit message"
+msgstr "messaggio di commit vuoto"
 
 msgid ""
 "add the specified files on the next commit\n"
 "\n"
-"    Schedule files to be version controlled and added to the repository.\n"
+"    Schedule files to be version controlled and added to the\n"
+"    repository.\n"
 "\n"
 "    The files will be added to the repository at the next commit. To\n"
-"    undo an add before that, see hg revert.\n"
+"    undo an add before that, see hg forget.\n"
 "\n"
 "    If no names are given, add all files to the repository.\n"
 "    "
 msgstr ""
 
 msgid ""
 "add all new files, delete all missing files\n"
 "\n"
-"    Add all new files and remove all missing files from the repository.\n"
-"\n"
-"    New files are ignored if they match any of the patterns in .hgignore. "
-"As\n"
-"    with add, these changes take effect at the next commit.\n"
-"\n"
-"    Use the -s option to detect renamed files. With a parameter > 0,\n"
-"    this compares every removed file with every added file and records\n"
-"    those similar enough as renames. This option takes a percentage\n"
-"    between 0 (disabled) and 100 (files must be identical) as its\n"
-"    parameter. Detecting renamed files this way can be expensive.\n"
+"    Add all new files and remove all missing files from the\n"
+"    repository.\n"
+"\n"
+"    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.\n"
+"\n"
+"    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"
 "    "
 msgstr ""
 
 msgid "similarity must be a number"
 msgstr ""
 
 msgid "similarity must be between 0 and 100"
 msgstr ""
 
 msgid ""
-"show changeset information per file line\n"
-"\n"
-"    List changes in files, showing the revision id responsible for each "
-"line\n"
-"\n"
-"    This command is useful to discover who did a change or when a change "
-"took\n"
-"    place.\n"
-"\n"
-"    Without the -a option, annotate will avoid processing files it\n"
-"    detects as binary. With -a, annotate will generate an annotation\n"
-"    anyway, probably with undesirable results.\n"
+"show changeset information by line for each file\n"
+"\n"
+"    List changes in files, showing the revision id responsible for\n"
+"    each line\n"
+"\n"
+"    This command is useful for discovering when a change was made and\n"
+"    by whom.\n"
+"\n"
+"    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"
 "    "
 msgstr ""
 
-msgid "at least one file name or pattern required"
+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 unversioned archive of a repository revision\n"
+"create an unversioned archive of a repository revision\n"
 "\n"
 "    By default, the revision used is the parent of the working\n"
-"    directory; use \"-r\" to specify a different revision.\n"
-"\n"
-"    To specify the type of archive to create, use \"-t\". Valid\n"
-"    types are:\n"
-"\n"
-"    \"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\n"
+"    directory; use -r/--rev to specify a different revision.\n"
+"\n"
+"    To specify the type of archive to create, use -t/--type. Valid\n"
+"    types are::\n"
+"\n"
+"      \"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\n"
 "\n"
 "    The exact name of the destination archive or directory is given\n"
-"    using a format string; see \"hg help export\" for details.\n"
+"    using a format string; see 'hg help export' for details.\n"
 "\n"
 "    Each member added to an archive file has a directory prefix\n"
-"    prepended. Use \"-p\" to specify a format string for the prefix.\n"
-"    The default is the basename of the archive, with suffixes removed.\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"
 "    "
 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\n"
 "\n"
 "    Commit the backed out changes as a new changeset. The new\n"
 "    changeset is a child of the backed out changeset.\n"
 "\n"
-"    If you back out a changeset other than the tip, a new head is\n"
+"    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 (current one by default).\n"
+"    backout changeset with another head.\n"
 "\n"
 "    The --merge option remembers the parent of the working directory\n"
 "    before starting the backout, then merges the new head with that\n"
-"    changeset afterwards. This saves you from doing the merge by\n"
-"    hand. The result of this merge is not committed, as with a normal\n"
-"    merge.\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.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "inverte l'effetto di un changeset precedente\n"
 "\n"
 "    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.\n"
 "\n"
 "    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).\n"
 "\n"
 "    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.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
 "    "
 
 msgid "please specify just one revision"
 msgstr ""
 
 msgid "please specify a revision to backout"
 msgstr ""
 
-msgid "cannot back out change on a different branch"
-msgstr ""
-
-msgid "cannot back out a change with no parents"
-msgstr ""
-
-msgid "cannot back out a merge changeset without --parent"
+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 "Backed out changeset %s"
-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\n"
 "\n"
-"    This command helps to find changesets which introduce problems.\n"
-"    To use, mark the earliest changeset you know exhibits the problem\n"
-"    as bad, then mark the latest changeset which is free from the\n"
-"    problem as good. Bisect will update your working directory to a\n"
-"    revision for testing (unless the --noupdate option is specified).\n"
-"    Once you have performed tests, mark the working directory as bad\n"
-"    or good and bisect will either update to another candidate changeset\n"
+"    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.\n"
 "\n"
 "    As a shortcut, you can also use the revision argument to mark a\n"
 "    revision as good or bad without checking it out first.\n"
 "\n"
-"    If you supply a command it will be used for automatic bisection. Its "
-"exit\n"
-"    status will be used as flag to mark revision as bad or good. In case "
-"exit\n"
-"    status is 0 the revision is marked as good, 125 - skipped, 127 (command "
-"not\n"
-"    found) - bisection will be aborted; any other status bigger than 0 will\n"
-"    mark revision as bad.\n"
+"    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"
 "    "
 msgstr ""
 
-#, python-format
-msgid "The first %s revision is:\n"
+#, fuzzy
+msgid "The first good revision is:\n"
 msgstr "La prima revisione %s è:\n"
 
-#, python-format
-msgid "Due to skipped revisions, the first %s revision could be any of:\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"
 
-#, python-format
-msgid "Changeset %s: %s\n"
+#, fuzzy, python-format
+msgid "Changeset %d:%s: %s\n"
 msgstr "Changeset %s: %s\n"
 
 #, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
 msgstr ""
 
 msgid ""
 "set or show the current branch name\n"
 "\n"
 "    With no argument, show the current branch name. With one argument,\n"
-"    set the working directory branch name (the branch does not exist in\n"
-"    the repository until the next commit).\n"
-"\n"
-"    Unless --force is specified, branch will not let you set a\n"
-"    branch name that shadows an existing branch.\n"
-"\n"
-"    Use --clean to reset the working directory branch to that of the\n"
-"    parent of the working directory, negating a previous branch change.\n"
-"\n"
-"    Use the command 'hg update' to switch to an existing branch.\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.\n"
+"\n"
+"    Unless -f/--force is specified, branch will not let you set a\n"
+"    branch name that already exists, even if it's inactive.\n"
+"\n"
+"    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.\n"
+"\n"
+"    Use the command 'hg update' to switch to an existing branch. Use\n"
+"    'hg commit --close-branch' to mark this branch as closed.\n"
 "    "
 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)"
 
 #, python-format
 msgid "marked working directory as branch %s\n"
 msgstr "marcata directory di lavoro come branch %s\n"
 
 msgid ""
 "list repository named branches\n"
 "\n"
 "    List the repository's named branches, indicating which ones are\n"
-"    inactive. If active is specified, only show active branches.\n"
-"\n"
-"    A branch is considered active if it contains repository heads.\n"
+"    inactive. If -c/--closed is specified, also list branches which have\n"
+"    been marked closed (see hg commit --close-branch).\n"
+"\n"
+"    If -a/--active is specified, only show active branches. A branch\n"
+"    is considered active if it contains repository heads.\n"
 "\n"
 "    Use the command 'hg update' to switch to an existing branch.\n"
 "    "
 msgstr ""
 
 msgid ""
 "create a changegroup file\n"
 "\n"
 "    Generate a compressed changegroup file collecting changesets not\n"
 "    known to be in another repository.\n"
 "\n"
 "    If no destination repository is specified the destination is\n"
 "    assumed to have all the nodes specified by one or more --base\n"
 "    parameters. To create a bundle containing all changesets, use\n"
-"    --all (or --base null). To change the compression method applied,\n"
-"    use the -t option (by default, bundles are compressed using bz2).\n"
-"\n"
-"    The bundle file can then be transferred using conventional means and\n"
-"    applied to another repository with the unbundle or pull command.\n"
-"    This is useful when direct push and pull are not available or when\n"
-"    exporting an entire repository is undesirable.\n"
+"    -a/--all (or --base null).\n"
+"\n"
+"    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).\n"
+"\n"
+"    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.\n"
 "\n"
 "    Applying bundles preserves all changeset contents including\n"
 "    permissions, copy/rename information, and revision history.\n"
 "    "
 msgstr ""
 
-msgid "--base is incompatible with specifiying a destination"
-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\n"
 "\n"
-"    Print the specified files as they were at the given revision.\n"
-"    If no revision is given, the parent of the working directory is used,\n"
+"    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.\n"
 "\n"
 "    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:\n"
-"\n"
-"    %s   basename of file being printed\n"
-"    %d   dirname of file being printed, or '.' if in repo root\n"
-"    %p   root-relative path name of file being printed\n"
+"    for the export command, with the following additions::\n"
+"\n"
+"      %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"
 "    "
 msgstr ""
 
 msgid ""
 "make a copy of an existing repository\n"
 "\n"
 "    Create a copy of an existing repository in a new directory.\n"
 "\n"
 "    If no destination directory name is specified, it defaults to the\n"
 "    basename of the source.\n"
 "\n"
 "    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.\n"
 "\n"
+"    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.\n"
+"\n"
+"    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).\n"
+"\n"
+"    See 'hg help urls' for valid source format details.\n"
+"\n"
+"    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.\n"
+"\n"
 "    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"
 "    filesystems, such as AFS, implement hardlinking incorrectly, but\n"
 "    do not report errors. In these cases, use the --pull option to\n"
 "    avoid hardlinking.\n"
 "\n"
 "    In some cases, you can clone repositories and checked out files\n"
-"    using full hardlinks with\n"
+"    using full hardlinks with ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
 "\n"
-"    This is the fastest way to clone, but it is not always safe.  The\n"
+"    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"
+"    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"
-"\n"
-"    If you use the -r option to clone up to a specific revision, no\n"
-"    subsequent revisions will be present in the cloned repository.\n"
-"    This option implies --pull, even on local repositories.\n"
-"\n"
-"    If the -U option is used, the new clone will contain only a repository\n"
-"    (.hg) and no working copy (the working copy parent is the null "
-"revision).\n"
-"\n"
-"    See 'hg help urls' for valid source format details.\n"
-"\n"
-"    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"
-"    Look at the help text for urls for important details about ssh:// URLs.\n"
 "    "
 msgstr ""
-"crea una copia di un repository esistente\n"
-"\n"
-"    Crea una copia di un repository esistente in una nuova directory.\n"
-"\n"
-"    Se non viene specificato nessun nome di directory\n"
-"    destinazione, di default viene usata la directory base\n"
-"    della sorgente.\n"
-"\n"
-"    La posizione della sorgente viene aggiunta al file .hg/hgrc\n"
-"    del nuovo repository, come default da usare per pull futuri.\n"
-"\n"
-"    Per efficienza, si usano hardlink per clonare ogni volta che\n"
-"    la sorgente e la destinazione sono sullo stesso filesystem\n"
-"    (notare che questo vale per i dati del repository, non per\n"
-"    per i file di cui si è fatto il check out). Alcuni\n"
-"    filesystem, tipo AFS, non implementano correttamente gli\n"
-"    hardlink, ma non riportano errori. In questi casi, usare\n"
-"    l'opzione --pull per evitare gli hardlink.\n"
-"\n"
-"    In alcuni casi, è possibile clonare i repository e i file di\n"
-"    cui si è fatto il check out usando hardlink completi con\n"
-"\n"
-"      $ cp -al REPO REPOCLONE\n"
-"\n"
-"    Questo è il modo più veloce per clonare, ma non è sempre\n"
-"    sicuro. L'operazione non è atomica (spetta all'utente\n"
-"    assicurarsi che REPO non venga modificato durante la\n"
-"    operazione) e bisogna assicurarsi che l'editor usato spezzi\n"
-"    gli hardlink (Emacs e i principali tool del Kernel Linux lo\n"
-"    fanno). Inoltre, questo non è compatibile con alcune\n"
-"    estensioni che mettono i loro metadati sotto la directory\n"
-"    .hg, tipo mq.\n"
-"\n"
-"    Se viene usata l'opzione -r per clonare fino ad una\n"
-"    revisione specifica, nessuna revisione seguente sarà presente\n"
-"    nel repository clonato. Questa opzione implica --pull, anche\n"
-"    per repository locali.\n"
-"\n"
-"    Se viene usata l'opzione -U, il nuovo clone conterrà solo un\n"
-"    repository (.hg) e nessuna copia di lavoro (il genitore\n"
-"    della copia di lavoro è la revisione nulla).\n"
-"\n"
-"    Vedere 'hg help urls' per dettagli sui formati di sorgenti\n"
-"    validi.\n"
-"\n"
-"    E' possibile specificare un URL ssh:// come destinazione, ma\n"
-"    nessun .hg/hgrc e directory di lavoro verranno creati sul\n"
-"    lato remoto. Riferirsi al testo di aiuto per gli url per\n"
-"    dettagli importanti riguardo gli URL ssh://.\n"
-"    "
-
+
+#, fuzzy
 msgid ""
 "commit the specified files or all outstanding changes\n"
 "\n"
-"    Commit changes to the given files into the repository.\n"
+"    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.\n"
 "\n"
 "    If a list of files is omitted, all changes reported by \"hg status\"\n"
 "    will be committed.\n"
 "\n"
 "    If you are committing the result of a merge, do not provide any\n"
-"    file names or -I/-X filters.\n"
-"\n"
-"    If no commit message is specified, the configured editor is started to\n"
-"    prompt you for a message.\n"
+"    filenames or -I/-X filters.\n"
+"\n"
+"    If no commit message is specified, the configured editor is\n"
+"    started to prompt you for a message.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "effettua il commit dei file specificati o di tutte le modifiche pendenti\n"
 "\n"
 "    Effettua il commit delle modifiche sui file dati nel repository.\n"
 "\n"
 "    Se si omette un elenco di file, si farà il commit di tutte le\n"
 "    modifiche riportate da \"hg status\".\n"
 "\n"
 "    Se si sta effettuando il commit del risultato di un merge, non\n"
 "    fornire nessun nome di file o filtri -I/-X.\n"
 "\n"
 "    Se non è specificato nessun messaggio di commit, l'editor\n"
 "    configurato viene lanciato per inserire un messaggio.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco dei formati validi per\n"
 "    -d/--date.\n"
 "    "
 
+msgid "nothing changed\n"
+msgstr "nulla è cambiato\n"
+
 msgid "created new head\n"
 msgstr "creata una nuova head\n"
 
 #, 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\n"
 "\n"
 "    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.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    stand in the working directory. If invoked with --after, the\n"
+"    exist in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
 "    This command takes effect with the next commit. To undo a copy\n"
 "    before that, see hg revert.\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 "returns the completion list associated with the given command"
 msgstr "restituisce l'elenco di completamento associato al dato comando"
 
 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\n"
 "\n"
-"    With no args, print names and values of all config items.\n"
-"\n"
-"    With one arg of the form section.name, print just the value of\n"
-"    that config item.\n"
-"\n"
-"    With multiple args, print names and values of all config items\n"
-"    with matching section names."
+"    With no arguments, print names and values of all config items.\n"
+"\n"
+"    With one argument of the form section.name, print just the value\n"
+"    of that config item.\n"
+"\n"
+"    With multiple arguments, print names and values of all config\n"
+"    items with matching section names.\n"
+"\n"
+"    With --debug, the source (filename and line number) is printed\n"
+"    for each config item.\n"
+"    "
 msgstr ""
 
 msgid "only one config item permitted"
 msgstr ""
 
 msgid ""
 "manually set the parents of the current working directory\n"
 "\n"
 "    This is useful for writing repository conversion tools, but should\n"
 "    be used with care.\n"
 "    "
 msgstr ""
 
 msgid "show the contents of the current dirstate"
 msgstr ""
 
 #, python-format
 msgid "copy: %s -> %s\n"
 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 .dot file"
+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://www.selenic."
-"com/mercurial/bts\n"
+" 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)\n"
 "\n"
 "    Show differences between revisions for the specified files.\n"
 "\n"
 "    Differences between files are shown using the unified diff format.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
-"    Without the -a option, diff will avoid generating diffs of files\n"
-"    it detects as binary. With -a, diff will generate a diff anyway,\n"
-"    probably with undesirable results.\n"
-"\n"
-"    Use the --git option to generate diffs in the git extended diff\n"
-"    format. For more information, read hg help diffs.\n"
+"    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.\n"
+"\n"
+"    Use the -g/--git option to generate diffs in the git extended diff\n"
+"    format. For more information, read 'hg help diffs'.\n"
 "    "
 msgstr ""
 
 msgid ""
 "dump the header and diffs for one or more changesets\n"
 "\n"
 "    Print the changeset header and diffs for one or more revisions.\n"
 "\n"
 "    The information shown in the changeset header is: author,\n"
 "    changeset hash, parent(s) and commit comment.\n"
 "\n"
-"    NOTE: export may generate unexpected diff output for merge changesets,\n"
-"    as it will compare the merge changeset against its first parent only.\n"
+"    NOTE: export may generate unexpected diff output for merge\n"
+"    changesets, as it will compare the merge changeset against its\n"
+"    first parent only.\n"
 "\n"
 "    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:\n"
-"\n"
-"    %%   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\n"
-"\n"
-"    Without the -a option, export will avoid generating diffs of files\n"
-"    it detects as binary. With -a, export will generate a diff anyway,\n"
-"    probably with undesirable results.\n"
-"\n"
-"    Use the --git option to generate diffs in the git extended diff\n"
-"    format. Read the diffs help topic for more information.\n"
-"\n"
-"    With the --switch-parent option, the diff will be against the second\n"
-"    parent. It can be useful to review a merge.\n"
+"    given using a format string. The formatting rules are as follows::\n"
+"\n"
+"      %%   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\n"
+"\n"
+"    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.\n"
+"\n"
+"    Use the -g/--git option to generate diffs in the git extended diff\n"
+"    format. See 'hg help diffs' for more information.\n"
+"\n"
+"    With the --switch-parent option, the diff will be against the\n"
+"    second parent. It can be useful to review a merge.\n"
 "    "
 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\n"
+"\n"
+"    Mark the specified files so they will no longer be tracked\n"
+"    after the next commit.\n"
+"\n"
+"    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.\n"
+"\n"
+"    To undo a forget before the next commit, see hg add.\n"
+"    "
+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\n"
 "\n"
 "    Search revisions of files for a regular expression.\n"
 "\n"
 "    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\n"
-"    a match appears.\n"
+"    working directory. It always prints the revision number in which a\n"
+"    match appears.\n"
 "\n"
 "    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"
 "    "
 msgstr ""
 
 #, python-format
 msgid "grep: invalid match pattern: %s\n"
 msgstr ""
 
 msgid ""
 "show current repository heads or show branch heads\n"
 "\n"
 "    With no arguments, show all repository head changesets.\n"
 "\n"
-"    If branch or revisions names are given this will show the heads of\n"
-"    the specified branches or the branches those revisions are tagged\n"
-"    with.\n"
-"\n"
-"    Repository \"heads\" are changesets that don't have child\n"
-"    changesets. They are where development generally takes place and\n"
-"    are the usual targets for update and merge operations.\n"
-"\n"
-"    Branch heads are changesets that have a given branch tag, but have\n"
-"    no child changesets with that tag. They are usually where\n"
-"    development on the given branch takes place.\n"
+"    Repository \"heads\" are changesets with no child changesets. They are\n"
+"    where development generally takes place and are the usual targets\n"
+"    for update and merge operations.\n"
+"\n"
+"    If one or more REV is given, the \"branch heads\" will be shown for\n"
+"    the named branch associated with the specified changeset(s).\n"
+"\n"
+"    Branch heads are changesets on a named branch with no descendants on\n"
+"    the same branch. A branch head could be a \"true\" (repository) head,\n"
+"    or it could be the last changeset on that branch before it was\n"
+"    merged into another branch, or it could be the last changeset on the\n"
+"    branch before a new branch was created. If none of the branch heads\n"
+"    are true heads, the branch is considered inactive.\n"
+"\n"
+"    If -c/--closed is specified, also show branch heads marked closed\n"
+"    (see hg commit --close-branch).\n"
+"\n"
+"    If STARTREV is specified, only those heads that are descendants of\n"
+"    STARTREV will be displayed.\n"
 "    "
 msgstr ""
 
+msgid "you must specify a branch to use --closed"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "no open branch heads on branch %s\n"
+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
 msgid ""
 "show help for a given topic or a help overview\n"
 "\n"
-"    With no arguments, print a list of commands and short help.\n"
-"\n"
-"    Given a topic, extension, or command name, print help for that topic."
+"    With no arguments, print a list of commands with short help messages.\n"
+"\n"
+"    Given a topic, extension, or command name, print help for that\n"
+"    topic."
 msgstr ""
 "mostra l'aiuto per un dato argomento o una panoramica d'aiuto\n"
 "\n"
 "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto.\n"
 "\n"
 "    Dato un argomento, estensione o nome di comando, stampa l'aiuto\n"
 "    per tale argomento."
 
 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"
 
 #, 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:\n"
 "\n"
 msgstr ""
 "elenco dei comandi:\n"
 "\n"
 
 #, python-format
 msgid ""
 "\n"
 "aliases: %s\n"
 msgstr ""
 "\n"
 "alias: %s\n"
 
 msgid "(no help text available)"
 msgstr "(nessun testo di aiuto disponibile)"
 
 msgid "options:\n"
 msgstr "opzioni:\n"
 
 msgid "no commands defined\n"
 msgstr "nessun comando definito\n"
 
-msgid ""
-"\n"
-"enabled extensions:\n"
-"\n"
+#, fuzzy
+msgid "enabled extensions:"
 msgstr ""
 "\n"
 "estensioni abilitate:\n"
 "\n"
 
-#, python-format
-msgid " %s   %s\n"
-msgstr " %s   %s\n"
-
 msgid "no help text available"
 msgstr "nessun testo di aiuto disponibile"
 
-#, python-format
-msgid "%s extension - %s\n"
+#, fuzzy, python-format
+msgid ""
+"%s extension - %s\n"
+"\n"
 msgstr "estensione %s - %s\n"
 
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial SCM Distribuito\n"
 
 msgid ""
 "basic commands:\n"
 "\n"
 msgstr ""
 "comandi base:\n"
 "\n"
 
 msgid ""
 "\n"
 "additional help topics:\n"
 "\n"
 msgstr ""
 "\n"
 "argomenti di aiuto aggiuntivi:\n"
 "\n"
 
+#, fuzzy
 msgid ""
 "identify the working copy or specified revision\n"
 "\n"
-"    With no revision, print a summary of the current state of the repo.\n"
-"\n"
-"    With a path, do a lookup in another repository.\n"
-"\n"
-"    This summary identifies the repository state using one or two parent\n"
-"    hash identifiers, followed by a \"+\" if there are uncommitted changes\n"
-"    in the working directory, a list of tags for this revision and a branch\n"
-"    name for non-default branches.\n"
+"    With no revision, print a summary of the current state of the\n"
+"    repository.\n"
+"\n"
+"    Specifying a path to a repository root or Mercurial bundle will\n"
+"    cause lookup to operate on that repository/bundle.\n"
+"\n"
+"    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"
 "    "
 msgstr ""
 "identifica la copia di lavoro o una revisione specifica\n"
 "\n"
 "    Con nessuna revisione, stampa un sommario dello stato corrente del\n"
 "    repository.\n"
 "\n"
 "    Con un percorso, effettua una ricerca in un altro repository.\n"
 "\n"
 "    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\n"
 "\n"
 "    Import a list of patches and commit them individually.\n"
 "\n"
 "    If there are outstanding changes in the working directory, import\n"
-"    will abort unless given the -f flag.\n"
+"    will abort unless given the -f/--force flag.\n"
 "\n"
 "    You can import a patch straight from a mail message. Even patches\n"
-"    as attachments work (body part must be type text/plain or\n"
-"    text/x-patch to be used). From and Subject headers of email\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.\n"
 "\n"
-"    If the imported patch was generated by hg export, user and description\n"
-"    from patch override values from message headers and body. Values\n"
-"    given on command line with -m and -u override these.\n"
-"\n"
-"    If --exact is specified, import will set the working directory\n"
-"    to the parent of each patch before applying it, and will abort\n"
-"    if the resulting changeset has a different ID than the one\n"
-"    recorded in the patch. This may happen due to character set\n"
-"    problems or other deficiencies in the text patch format.\n"
-"\n"
-"    With --similarity, hg will attempt to discover renames and copies\n"
-"    in the patch in the same way as 'addremove'.\n"
-"\n"
-"    To read a patch from standard input, use patch name \"-\".\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.\n"
+"\n"
+"    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.\n"
+"\n"
+"    With -s/--similarity, hg will attempt to discover renames and\n"
+"    copies in the patch in the same way as 'addremove'.\n"
+"\n"
+"    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"
 "    "
 msgstr ""
 "importa un insieme ordinato di patch\n"
 "\n"
 "    Importa un elenco di patch e ne effettua il commit\n"
 "    individualmente.\n"
 "\n"
 "    Se ci sono modifiche pendenti nella directory di lavoro,\n"
 "    l'importazione abortirà a meno che non si usi il flag -f.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    Con --similarity, hg tenterà di scoprire le rinomine e le copie\n"
 "    nella patch allo stesso modo di 'addremove'.\n"
 "\n"
 "    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"
 
-#, python-format
-msgid ""
-"message:\n"
-"%s\n"
-msgstr ""
-"messaggio:\n"
-"%s\n"
-
-msgid "not a mercurial patch"
+#, 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"
 
+#, fuzzy
 msgid ""
 "show new changesets found in source\n"
 "\n"
 "    Show new changesets found in the specified path/URL or the default\n"
-"    pull location. These are the changesets that would be pulled if a pull\n"
-"    was requested.\n"
-"\n"
-"    For remote repository, using --bundle avoids downloading the changesets\n"
-"    twice if the incoming is followed by a pull.\n"
+"    pull location. These are the changesets that would have been pulled\n"
+"    if a pull at the time you issued this command.\n"
+"\n"
+"    For remote repository, using --bundle avoids downloading the\n"
+"    changesets twice if the incoming is followed by a pull.\n"
 "\n"
 "    See pull for valid source format details.\n"
 "    "
 msgstr ""
 "mostra i nuovi changeset trovati nella sorgente\n"
 "\n"
 "    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.\n"
 "\n"
 "    Per repository remoti, usare --bundle evita di scaricare due volte\n"
 "    i changeset se incoming è seguito da un pull.\n"
 "\n"
 "    Vedere pull per dettagli sui formati di sorgenti validi.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "create a new repository in the given directory\n"
 "\n"
 "    Initialize a new repository in the given directory. If the given\n"
-"    directory does not exist, it is created.\n"
+"    directory does not exist, it will be created.\n"
 "\n"
 "    If no directory is given, the current directory is used.\n"
 "\n"
 "    It is possible to specify an ssh:// URL as the destination.\n"
 "    See 'hg help urls' for more information.\n"
 "    "
 msgstr ""
 "crea un nuovo repository nella directory data\n"
 "\n"
 "    Inizializza un nuovo repository nella directory data. Se tale\n"
 "    directory non esiste la crea.\n"
 "\n"
 "    Se nessuna directory è specificata si usa la directory corrente.\n"
 "\n"
 "    E' possibile specificare un URL ssh:// come destinazione.\n"
 "    Vedere 'hg help urls' per maggiorni informazioni.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "locate files matching specific patterns\n"
 "\n"
-"    Print all files under Mercurial control whose names match the\n"
-"    given patterns.\n"
-"\n"
-"    This command searches the entire repository by default. To search\n"
-"    just the current directory and its subdirectories, use\n"
-"    \"--include .\".\n"
-"\n"
-"    If no patterns are given to match, this command prints all file\n"
-"    names.\n"
+"    Print files under Mercurial control in the working directory whose\n"
+"    names match the given patterns.\n"
+"\n"
+"    By default, this command searches all directories in the working\n"
+"    directory. To search just the current directory and its\n"
+"    subdirectories, use \"--include .\".\n"
+"\n"
+"    If no patterns are given to match, this command prints the names\n"
+"    of all files under Mercurial control in the working directory.\n"
 "\n"
 "    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\".\n"
-"    This will avoid the problem of \"xargs\" treating single filenames\n"
-"    that contain white space as multiple filenames.\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"
 "    "
 msgstr ""
 "trova file corrispondenti a pattern specificati\n"
 "\n"
 "    Stampa tutti i file sotto il controllo di Mercurial il cui nome\n"
 "    corrisponde ai dati pattern.\n"
 "\n"
 "    Questo comando cerca nell'intero repository di default. Per\n"
 "    ricercare solo nella directory corrente e le sue sottodirectory,\n"
 "    usare \"--include .\".\n"
 "\n"
 "    Se non sono forniti pattern, questo comando stampa il nome di\n"
 "    tutti i file.\n"
 "\n"
 "    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\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"
+"    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.\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"
 "    See 'hg help dates' for a list of formats valid for -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"
+"    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.\n"
+"\n"
+"    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, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
+"    its first parent. Also, only files different from BOTH parents\n"
+"    will appear in files:.\n"
 "    "
 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 ""
-"looks up all renames for a file (up to endrev) the first\n"
-"        time the file is given. It indexes on the changerev and only\n"
-"        parses the manifest if linkrev != changerev.\n"
-"        Returns rename info for fn at changerev rev."
-msgstr ""
-"cerca tutte le rinomine di un file (fino a endrev) la prima volta che\n"
-"        il file viene fornito. Indicizza su changerev e parsifica solo\n"
-"        il manifesto se linkrev != changerev.\n"
-"        Restituisce le informazioni sulle rinomine per fn alla\n"
-"        revisione changerev."
-
-msgid ""
 "output the current or given revision of the project manifest\n"
 "\n"
 "    Print a list of version controlled files for the given revision.\n"
-"    If no revision is given, the parent of the working directory is used,\n"
-"    or tip if no revision is checked out.\n"
-"\n"
-"    The manifest is the list of files being version controlled. If no "
-"revision\n"
-"    is given then the first parent of the working directory is used.\n"
-"\n"
-"    With -v flag, print file permissions, symlink and executable bits. With\n"
-"    --debug flag, print file revision hashes.\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.\n"
+"\n"
+"    With -v, print file permissions, symlink and executable bits.\n"
+"    With --debug, print file revision hashes.\n"
 "    "
 msgstr ""
 
 msgid ""
 "merge working directory with another revision\n"
 "\n"
-"    Merge the contents of the current working directory and the\n"
-"    requested revision. Files that changed between either parent are\n"
-"    marked as changed for the next commit and a commit must be\n"
-"    performed before any further updates are allowed.\n"
+"    The current working directory is updated with all changes made in\n"
+"    the requested revision since the last common predecessor revision.\n"
+"\n"
+"    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.\n"
 "\n"
 "    If no revision is specified, the working directory's parent is a\n"
-"    head revision, and the current branch contains exactly one other head,\n"
-"    the other head is merged with by default. Otherwise, an explicit\n"
-"    revision to merge with must be provided.\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"
 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"
 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"
 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\n"
 "\n"
-"    Show changesets not found in the specified destination repository or\n"
-"    the default push location. These are the changesets that would be "
-"pushed\n"
-"    if a push was requested.\n"
+"    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.\n"
 "\n"
 "    See pull for valid destination format details.\n"
 "    "
 msgstr ""
 "mostra changeset non trovati nella destinazione\n"
 "\n"
 "    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.\n"
 "\n"
 "    Vedere pull per dettagli sui formati validi di destinazioni.\n"
 "    "
 
-msgid ""
-"show the parents of the working dir or revision\n"
-"\n"
-"    Print the working directory's parent revisions. If a\n"
-"    revision is given via --rev, the parent of that revision\n"
-"    will be printed. If a file argument is given, revision in\n"
-"    which the file was last changed (before the working directory\n"
-"    revision or the argument to --rev if given) is printed.\n"
+#, fuzzy
+msgid ""
+"show the parents of the working directory or revision\n"
+"\n"
+"    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"
 "    "
 msgstr ""
 "mostra i genitori della directory di lavoro o di una revisione\n"
 "\n"
 "    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"
 "    "
 
-msgid "can only specify an explicit file name"
-msgstr ""
+#, 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\n"
 "\n"
-"    Show definition of symbolic path name NAME. If no name is given, show\n"
-"    definition of available names.\n"
+"    Show definition of symbolic path name NAME. If no name is given,\n"
+"    show definition of all available names.\n"
 "\n"
 "    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.\n"
 "\n"
 "    See 'hg help urls' for more information.\n"
 "    "
 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\n"
 "\n"
 "    Pull changes from a remote repository to a local one.\n"
 "\n"
 "    This finds all changes from the repository at the specified path\n"
-"    or URL and adds them to the local repository. By default, this\n"
-"    does not update the copy of the project in the working directory.\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.\n"
+"\n"
+"    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.\n"
 "\n"
 "    If SOURCE is omitted, the 'default' path will be used.\n"
 "    See 'hg help urls' for more information.\n"
 "    "
 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"
 "    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 ""
-"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."
-
+#, fuzzy
 msgid ""
 "push changes to the specified destination\n"
 "\n"
 "    Push changes from the local repository to the given destination.\n"
 "\n"
-"    This is the symmetrical operation for pull. It helps to move\n"
-"    changes from the current repository to a different one. If the\n"
-"    destination is local this is identical to a pull in that directory\n"
-"    from the current one.\n"
+"    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.\n"
 "\n"
 "    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"
-"    the client has forgotten to pull and merge before pushing.\n"
-"\n"
-"    If -r is used, the named changeset and all its ancestors will be pushed\n"
-"    to the remote repository.\n"
-"\n"
-"    Look at the help text for urls for important details about ssh:// URLs.\n"
-"    If DESTINATION is omitted, a default path will be used.\n"
-"    See 'hg help urls' for more information.\n"
+"    user forgot to pull and merge before pushing.\n"
+"\n"
+"    If -r/--rev is used, the named revision and all its ancestors will\n"
+"    be pushed to the remote repository.\n"
+"\n"
+"    Please see 'hg help urls' for important details about ssh://\n"
+"    URLs. If DESTINATION is omitted, a default path will be used.\n"
 "    "
 msgstr ""
 "effettua il push di modifiche verso la destinazione specificata\n"
 "\n"
 "    Effettua il push di modifiche dal repository locale verso la\n"
 "    destinazione data.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    Se si usa -r, si farà il push del changeset dato e tutti i suoi "
 "antenati\n"
 "    verso il repository remoto.\n"
 "\n"
 "    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"
 "    "
 
 #, python-format
 msgid "pushing to %s\n"
 msgstr "sto effettuando il push verso %s\n"
 
-msgid ""
-"raw commit interface (DEPRECATED)\n"
-"\n"
-"    (DEPRECATED)\n"
-"    Lowlevel commit, for use in helper scripts.\n"
-"\n"
-"    This command is not intended to be used by normal users, as it is\n"
-"    primarily useful for importing from other SCMs.\n"
-"\n"
-"    This command is now deprecated and will be removed in a future\n"
-"    release, please use debugsetparents and commit instead.\n"
-"    "
-msgstr ""
-
-msgid "(the rawcommit command is deprecated)\n"
-msgstr "(il comando rawcommit è deprecato)\n"
-
+#, fuzzy
 msgid ""
 "roll back an interrupted transaction\n"
 "\n"
 "    Recover from an interrupted commit or pull.\n"
 "\n"
-"    This command tries to fix the repository status after an interrupted\n"
-"    operation. It should only be necessary when Mercurial suggests it.\n"
+"    This command tries to fix the repository status after an\n"
+"    interrupted operation. It should only be necessary when Mercurial\n"
+"    suggests it.\n"
 "    "
 msgstr ""
 "effettua il rollback di una transazione interrotta\n"
 "\n"
 "    Effettua il ripristino da un commit o pull interrotto.\n"
 "\n"
 "    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 ""
 "remove the specified files on the next commit\n"
 "\n"
 "    Schedule the indicated files for removal from the repository.\n"
 "\n"
-"    This only removes files from the current branch, not from the entire\n"
-"    project history. -A can be used to remove only files that have already\n"
-"    been deleted, -f can be used to force deletion, and -Af can be used\n"
-"    to remove files from the next revision without deleting them.\n"
-"\n"
-"    The following table details the behavior of remove for different file\n"
-"    states (columns) and option combinations (rows). The file states are\n"
-"    Added, Clean, Modified and Missing (as reported by hg status). The\n"
-"    actions are Warn, Remove (from branch) and Delete (from disk).\n"
-"\n"
-"           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\n"
+"    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.\n"
+"\n"
+"    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)::\n"
+"\n"
+"             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\n"
 "\n"
 "    This command schedules the files to be removed at the next commit.\n"
 "    To undo a remove before that, see hg revert.\n"
 "    "
 msgstr ""
 
-msgid "no files specified"
-msgstr "nessun file specificato"
+#, 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\n"
 "\n"
-"    Mark dest as copies of sources; mark sources for deletion. If\n"
-"    dest is a directory, copies are put in that directory. If dest is\n"
-"    a file, there can only be one source.\n"
+"    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.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    exist in the working directory. If invoked with --after, the\n"
+"    exist in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
 "    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\n"
 "\n"
 "    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 switch.\n"
-"\n"
-"    This command will also allow listing resolved files and manually\n"
-"    marking and unmarking files as resolved.\n"
-"\n"
-"    The codes used to show the status of files are:\n"
-"    U = unresolved\n"
-"    R = resolved\n"
+"    resolve all unresolved files, use the -a/--all switch.\n"
+"\n"
+"    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.\n"
+"\n"
+"    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.\n"
+"\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      U = unresolved\n"
+"      R = resolved\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"
 
-msgid ""
-"restore individual files or dirs to an earlier state\n"
-"\n"
-"    (use update -r to check out earlier revisions, revert does not\n"
-"    change the working dir parents)\n"
+#, fuzzy
+msgid ""
+"restore individual files or directories to an earlier state\n"
+"\n"
+"    (Use update -r to check out earlier revisions, revert does not\n"
+"    change the working directory parents.)\n"
 "\n"
 "    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.\n"
 "\n"
-"    Using the -r option, revert the given files or directories to their\n"
-"    contents as of a specific revision. This can be helpful to \"roll\n"
-"    back\" some or all of an earlier change.\n"
-"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
+"    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.\n"
 "\n"
 "    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.\n"
 "\n"
-"    If a file has been deleted, it is restored. If the executable\n"
-"    mode of a file was changed, it is reset.\n"
+"    If a file has been deleted, it is restored. If the executable mode\n"
+"    of a file was changed, it is reset.\n"
 "\n"
 "    If names are given, all files matching the names are reverted.\n"
 "    If no arguments are given, no files are reverted.\n"
 "\n"
 "    Modified files are saved with a .orig suffix before reverting.\n"
 "    To disable these backups, use --no-backup.\n"
 "    "
 msgstr ""
 "ripristina file singoli o directory ad uno stato precedente\n"
 "\n"
 "    (usare update -r per effettuare il checkout di revisioni\n"
 "    precedenti, revert non cambia i genitori della directory di\n"
 "    lavoro)\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    Se un file è stato cancellato viene ripristinato. Se è stato\n"
 "    modificato il flag di esecuzione di file, questo viene resettato.\n"
 "\n"
 "    Se vengono forniti nomi, tutti i file corrispondenti ai nomi\n"
 "    vengono ripristinati. Se non vengono forniti argomenti nessun file\n"
 "    viene ripristinato.\n"
 "\n"
 "    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"
 
 #, 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\n"
 "\n"
 "    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.\n"
+"    any dirstate changes since that time. This command does not alter\n"
+"    the working directory.\n"
 "\n"
 "    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:\n"
+"    and their effects can be rolled back::\n"
 "\n"
 "      commit\n"
 "      import\n"
 "      pull\n"
 "      push (with this repository as destination)\n"
 "      unbundle\n"
 "\n"
 "    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"
 "    "
 msgstr ""
 "effettua il rollback dell'ultima transazione\n"
 "\n"
 "    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.\n"
 "\n"
 "    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:\n"
 "\n"
 "      commit\n"
 "      import\n"
 "      pull\n"
 "      push (con questo repository come destinazione)\n"
 "      unbundle\n"
 "\n"
 "    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 ""
-"print the root (top) of the current working dir\n"
+#, fuzzy
+msgid ""
+"print the root (top) of the current working directory\n"
 "\n"
 "    Print the root directory of the current repository.\n"
 "    "
 msgstr ""
 "stampa la radice (top) della directory di lavoro corrente\n"
 "\n"
 "    Stampa la directory radice del repository corrente.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "export the repository via HTTP\n"
 "\n"
 "    Start a local HTTP repository browser and pull server.\n"
 "\n"
 "    By default, the server logs accesses to stdout and errors to\n"
-"    stderr. Use the \"-A\" and \"-E\" options to log to files.\n"
+"    stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
+"    files.\n"
 "    "
 msgstr ""
 "esporta il repository via HTTP\n"
 "\n"
 "    Avvia un server HTTP locale per il pull e la navigazione.\n"
 "\n"
 "    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"
 "    "
 
 #, 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\n"
 "\n"
 "    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"
-"    source of a copy/move operation, are not listed unless -c (clean),\n"
-"    -i (ignored), -C (copies) or -A is given. Unless options described\n"
-"    with \"show only ...\" are given, the options -mardu are used.\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.\n"
 "\n"
 "    Option -q/--quiet hides untracked (unknown and ignored) files\n"
-"    unless explicitly requested with -u/--unknown or -i/-ignored.\n"
+"    unless explicitly requested with -u/--unknown or -i/--ignored.\n"
 "\n"
 "    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.\n"
 "\n"
 "    If one revision is given, it is used as the base revision.\n"
-"    If two revisions are given, the difference between them is shown.\n"
-"\n"
-"    The codes used to show the status of files are:\n"
-"    M = modified\n"
-"    A = added\n"
-"    R = removed\n"
-"    C = clean\n"
-"    ! = deleted, but still tracked\n"
-"    ? = not tracked\n"
-"    I = ignored\n"
-"      = the previous added file was copied from here\n"
+"    If two revisions are given, the differences between them are\n"
+"    shown.\n"
+"\n"
+"    The codes used to show the status of files are::\n"
+"\n"
+"      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"
+"    "
+msgstr ""
+
+msgid ""
+"summarize working directory state\n"
+"\n"
+"    This generates a brief summary of the working directory state,\n"
+"    including parents, branch, commit status, and available updates.\n"
+"\n"
+"    With the --remote option, this will check the default paths for\n"
+"    incoming and outgoing changes. This can be time-consuming.\n"
 "    "
 msgstr ""
 
+#, 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 removed"
+msgstr "rimossi"
+
+#, python-format
+msgid "%d deleted"
+msgstr ""
+
+#, 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
+msgid " (merge)"
+msgstr "merge"
+
+#, fuzzy
+msgid " (new branch)"
+msgstr "mostra le branch"
+
+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\n"
 "\n"
 "    Name a particular revision using <name>.\n"
 "\n"
 "    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.\n"
 "\n"
-"    If no revision is given, the parent of the working directory is used,\n"
-"    or tip if no revision is checked out.\n"
+"    If no revision is given, the parent of the working directory is\n"
+"    used, or tip if no revision is checked out.\n"
 "\n"
 "    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).\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "aggiunge una o più tag per la revisione corrente o data\n"
 "\n"
 "    Nomina una revisione particolare usando <nome>.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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).\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco di formati validi per\n"
 "    -d/--date.\n"
 "    "
 
 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"
 
 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"
 
-#, python-format
-msgid "tag '%s' is not a %s tag"
+#, fuzzy, python-format
+msgid "tag '%s' is not a global tag"
 msgstr "la tag '%s' non è una tag %s"
 
-#, python-format
-msgid "Removed tag %s"
-msgstr "Rimossa 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)"
 
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "Aggiunta tag %s per il changeset %s"
-
+#, fuzzy
 msgid ""
 "list repository tags\n"
 "\n"
-"    This lists both regular and local tags. When the -v/--verbose switch\n"
-"    is used, a third column \"local\" is printed for local tags.\n"
+"    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 ""
 "elenca le tag del repository\n"
 "\n"
 "    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\n"
 "\n"
-"    The tip revision (usually just called the tip) is the most\n"
-"    recently added changeset in the repository, the most recently\n"
-"    changed head.\n"
+"    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).\n"
 "\n"
 "    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"
 "    "
 msgstr ""
 "mostra la revisione tip\n"
 "\n"
 "    La revisione tip (di solito chiamata solo tip) è il più recente\n"
 "    changeset aggiunto al repository, l'head modificata più\n"
 "    recentemente.\n"
 "\n"
 "    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\n"
 "\n"
 "    Apply one or more compressed changegroup files generated by the\n"
 "    bundle command.\n"
 "    "
 msgstr ""
 "applica uno o più file changegroup\n"
 "\n"
 "    Applica uno o più file changegroup compressi generati dal\n"
 "    comando bundle.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "update working directory\n"
 "\n"
-"    Update the repository's working directory to the specified revision,\n"
-"    or the tip of the current branch if none is specified. Use null as\n"
-"    the revision to remove the working copy (like 'hg clone -U').\n"
-"\n"
-"    When the working dir contains no uncommitted changes, it will be\n"
-"    replaced by the state of the requested revision from the repo.  When\n"
-"    the requested revision is on a different branch, the working dir\n"
-"    will additionally be switched to that branch.\n"
-"\n"
-"    When there are uncommitted changes, use option -C to discard them,\n"
-"    forcibly replacing the state of the working dir with the requested\n"
-"    revision.\n"
-"\n"
-"    When there are uncommitted changes and option -C is not used, and\n"
-"    the parent revision and requested revision are on the same branch,\n"
-"    and one of them is an ancestor of the other, then the new working\n"
-"    directory will contain the requested revision merged with the\n"
-"    uncommitted changes.  Otherwise, the update will fail with a\n"
-"    suggestion to use 'merge' or 'update -C' instead.\n"
-"\n"
-"    If you want to update just one file to an older revision, use revert.\n"
-"\n"
-"    See 'hg help dates' for a list of formats valid for --date.\n"
+"    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').\n"
+"\n"
+"    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.\n"
+"\n"
+"    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.\n"
+"\n"
+"    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.\n"
+"\n"
+"    If you want to update just one file to an older revision, use\n"
+"    revert.\n"
+"\n"
+"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "aggiorna la directory di lavoro\n"
 "\n"
 "    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').\n"
 "\n"
 "    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.\n"
 "\n"
 "    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.\n"
 "\n"
 "    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'.\n"
 "\n"
 "    Se si desidera aggiornare solo un file ad una revisione più\n"
 "    vecchia, usare revert.\n"
 "\n"
 "    Vedere 'hg help dates' per un elenco di formati validi per --date.\n"
 "    "
 
+#, 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\n"
 "\n"
 "    Verify the integrity of the current repository.\n"
 "\n"
 "    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"
 "    "
 msgstr ""
 "verifica l'integrità del repository\n"
 "\n"
 "    Verifica l'integrità del repository corrente.\n"
 "\n"
 "    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-2009 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-2009 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"
 
-msgid "repository root directory or symbolic path name"
+#, fuzzy
+msgid "repository root directory or name of overlay bundle file"
 msgstr "directory radice del repository o nome del percorso simbolico"
 
 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"
 msgstr "imposta/sovrascrive l'opzione di configurazione"
 
 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 "set the charset encoding mode"
 msgstr "imposta la modalità di codifica dei caratteri"
 
-msgid "print improved command execution profile"
-msgstr "stampa il profilo di esecuzione dei comandi migliorato"
-
 msgid "print 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 "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"
 msgstr "usa <text> come messaggio di commit"
 
 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"
 
-msgid "record user as committer"
+#, fuzzy
+msgid "record the specified user as committer"
 msgstr "registra l'utente come committente"
 
 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 "treat all files as text"
 msgstr "tratta tutti i file come testo"
 
 msgid "don't include dates in 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 "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 "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"
 msgstr "segue le copie e le rinomine dei file"
 
 msgid "list the author (long with -v)"
 msgstr "elenca l'autore (verboso con -v)"
 
 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 "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]"
 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"
 
+msgid "show normal and closed branches"
+msgstr ""
+
 msgid "[-a]"
 msgstr "[-a]"
 
 msgid "run even when remote repository 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"
 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]"
 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)"
 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"
 
 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"
 
 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"
 
 msgid "[COMMAND]"
 msgstr "[COMANDO]"
 
 msgid "show the command options"
 msgstr "mostra le opzioni dei comandi"
 
 msgid "[-o] CMD"
 msgstr "[-o] CMD"
 
 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 "parent"
-msgstr "genitore"
-
-msgid "file list"
-msgstr "elenco dei file"
-
 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]..."
 msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..."
 
 msgid "diff against the second parent"
 msgstr "effettua il diff con il secondo genitore"
 
 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"
 
 msgid "ignore case when matching"
 msgstr "ignora il case quando si cercano corrispondenze"
 
-msgid "print only filenames and revs that match"
+#, 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"
 msgstr "cerca nell'intervallo di revisioni fornito"
 
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr "[OPZIONI]... PATTERN [FILE]..."
 
-msgid "show only heads which are descendants of rev"
+#, fuzzy
+msgid "show only heads which are descendants of REV"
 msgstr "mostra solo le head che sono discendenti della revisione"
 
-msgid "show only the active heads from open branches"
+#, fuzzy
+msgid "show only the active branch heads from open branches"
 msgstr "mostra solo le head attive dalle branch aperte"
 
-msgid "[-r REV] [REV]..."
+msgid "show normal and closed branch heads"
+msgstr ""
+
+#, fuzzy
+msgid "[-r STARTREV] [REV]..."
 msgstr "[-r REV] [REV]..."
 
 msgid "[TOPIC]"
 msgstr "[ARGOMENTO]"
 
-msgid "identify the specified rev"
+#, 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]"
 
-msgid ""
-"directory strip option for patch. This has the same\n"
-"meaning as the corresponding patch option"
+#, fuzzy
+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"
 
 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"
 
 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"
 
-msgid "Use any branch information in patch (implied by --exact)"
+#, fuzzy
+msgid "use any branch information in patch (implied by --exact)"
 msgstr ""
 "Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
 
 msgid "[OPTION]... PATCH..."
 msgstr "[OPZIONI]... PATCH..."
 
 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"
 
 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]"
 
-msgid "search the repository as it stood at rev"
+#, fuzzy
+msgid "search the repository as it stood at 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"
 
-msgid "show revs matching date spec"
+#, 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"
 msgstr "effettua una ricerca case-insensitive di una parola chiave"
 
-msgid "include revs where files were removed"
+#, 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"
 
-msgid "revs committed by user"
+#, fuzzy
+msgid "revisions committed by user"
 msgstr "commit delle revisioni effettuato dall'utente"
 
 msgid "show only 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]"
 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"
 
 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 
-msgid "show parents from the specified rev"
+#, fuzzy
+msgid "show parents from the specified revision"
 msgstr "mostra i genitori della revisione specificata"
 
-msgid "hg parents [-r REV] [FILE]"
-msgstr "hg parents [-r REV] [FILE]"
+#, fuzzy
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] FILE"
 
 msgid "[NAME]"
 msgstr "[NOME]"
 
 msgid "update to new tip if changesets were pulled"
 msgstr "aggiorna alla nuova tip se si è effettuato il pull di changeset"
 
 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 "[-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"
 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 "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"
 
 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 to listen on (default: 8000)"
 msgstr "porta su cui stare in ascolto (default: 8000)"
 
 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)"
 
-msgid "name to show in web pages (default: working dir)"
+#, fuzzy
+msgid "name to show in web pages (default: working directory)"
 msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)"
 
-msgid "name of the webdir config file (serve more than one repo)"
+#, fuzzy
+msgid "name of the webdir config file (serve more than one repository)"
 msgstr "nome del file di configurazione webdir (serve più di un repository)"
 
 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 lo stato del prefisso"
 
 msgid "show source of copied files"
 msgstr "mostra la sorgente dei file copiati"
 
 msgid "show difference from revision"
 msgstr "mostra le differenze dalla revisione"
 
 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..."
 msgstr "[-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..."
 
 msgid "[-p]"
 msgstr "[-p]"
 
 msgid "update to new tip 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 "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 "[-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 "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 "  searching for copies back to rev %d\n"
-msgstr "  sto cercando copie fino alla revisione %d\n"
-
-#, python-format
-msgid ""
-"  unmatched files in local:\n"
-"   %s\n"
-msgstr ""
-"  file non corrispondenti in locale:\n"
-"   %s\n"
-
-#, python-format
-msgid ""
-"  unmatched files in other:\n"
-"   %s\n"
-msgstr ""
-"  file non corrispondenti in altro:\n"
-"   %s\n"
-
-msgid "  all copies found (* = to merge, ! = divergent):\n"
-msgstr "  trovate tutte le copie (* = per merge, ! = divergenti):\n"
-
-#, python-format
-msgid "   %s -> %s %s\n"
-msgstr "   %s -> %s %s\n"
-
-msgid "  checking for directory renames\n"
-msgstr "  sto controllando directory rinominate\n"
-
-#, python-format
-msgid "  dir %s -> %s\n"
-msgstr "  dir %s -> %s\n"
-
-#, python-format
-msgid "  file %s -> %s\n"
-msgstr "  file %s -> %s\n"
+#, fuzzy
+msgid "working directory state appears damaged!"
+msgstr "(directory di lavoro non  tip)\n"
 
 #, 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 "not in dirstate: %s\n"
 msgstr "non nel dirstate: %s\n"
 
+#, fuzzy
+msgid "unknown"
+msgstr "base sconosciuta"
+
 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 "%s: unsupported file type (type is %s)\n"
+#, fuzzy, python-format
+msgid "unsupported file type (type is %s)"
 msgstr "%s: tipo di file non supportato (il tipo è %s)\n"
 
 #, python-format
 msgid "abort: %s\n"
 msgstr "abortito: %s\n"
 
 #, python-format
+msgid "hg: %s\n"
+msgstr "hg: %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://www.selenic.com/mercurial/bts\n"
+#, fuzzy
+msgid "** report bug details to http://mercurial.selenic.com/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 "** 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 ""
+
+#, fuzzy, python-format
+msgid "alias '%s' resolves to unknown command '%s'\n"
+msgstr "la tag '%s' si riferisce ad un nodo sconosciuto"
+
+#, python-format
+msgid "alias '%s' resolves to ambiguous command '%s'\n"
+msgstr ""
+
+#, python-format
 msgid "malformed --config option: %s"
 msgstr "opzione --config malformata: %s"
 
 #, 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 (i.e. not -qR) and --"
+"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"
 
 msgid "invalid arguments"
 msgstr "argomenti non validi"
 
-msgid "exception raised - generating profile anyway\n"
-msgstr "eccezione sollevata - genero comunque il profilo\n"
+#, python-format
+msgid "unrecognized profiling format '%s' - Ignored\n"
+msgstr ""
 
 msgid ""
 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
 "misc/lsprof/"
 msgstr ""
 
 #, 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 "picked tool '%s' for %s (binary %s symlink %s)\n"
-msgstr ""
-
-#, python-format
 msgid ""
 " no tool found to merge %s\n"
 "keep (l)ocal or take (o)ther?"
 msgstr ""
 
-msgid "[lo]"
-msgstr "[lo]"
-
-msgid "l"
-msgstr "l"
+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 "my %s other %s ancestor %s\n"
-msgstr "mio %s altro %s antenato %s\n"
-
-msgid " premerge successful\n"
-msgstr " premerge eseguito con successo\n"
-
-#, python-format
 msgid ""
 " output file %s appears unchanged\n"
 "was merge successful (yn)?"
 msgstr ""
 
-msgid "[yn]"
-msgstr "[yn]"
-
-msgid "n"
-msgstr "n"
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+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 ""
 
+#, fuzzy
+msgid "disabled extensions:"
+msgstr ""
+"\n"
+"estensioni abilitate:\n"
+"\n"
+
 msgid "Date Formats"
 msgstr "Formati della data"
 
-msgid ""
-"\n"
-"    Some commands allow the user to specify a date, e.g.:\n"
-"    * backout, commit, import, tag: Specify the commit date.\n"
-"    * log, revert, update: Select revision(s) by date.\n"
-"\n"
-"    Many date formats are valid. Here are some examples:\n"
-"\n"
-"    \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"    \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"    \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"    \"Dec 6\" (midnight)\n"
-"    \"13:18\" (today assumed)\n"
-"    \"3:39\" (3:39AM assumed)\n"
-"    \"3:39pm\" (15:39)\n"
-"    \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"    \"2006-12-6 13:18\"\n"
-"    \"2006-12-6\"\n"
-"    \"12-6\"\n"
-"    \"12/6\"\n"
-"    \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-"    Lastly, there is Mercurial's internal format:\n"
-"\n"
-"    \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
-"\n"
-"    This is the internal representation format for dates. unixtime is\n"
-"    the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n"
-"    is the offset of the local timezone, in seconds west of UTC (negative\n"
-"    if the timezone is east of UTC).\n"
-"\n"
-"    The log command also accepts date ranges:\n"
-"\n"
-"    \"<{datetime}\" - at or before a given date/time\n"
-"    \">{datetime}\" - on or after a given date/time\n"
-"    \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"    \"-{days}\" - within a given number of days of today\n"
-"    "
-msgstr ""
-
 msgid "File Name Patterns"
 msgstr "Pattern dei Nomi dei File"
 
-msgid ""
-"\n"
-"    Mercurial accepts several notations for identifying one or more\n"
-"    files at a time.\n"
-"\n"
-"    By default, Mercurial treats filenames as shell-style extended\n"
-"    glob patterns.\n"
-"\n"
-"    Alternate pattern notations must be specified explicitly.\n"
-"\n"
-"    To use a plain path name without any pattern matching, start it\n"
-"    with \"path:\". These path names must completely match starting at\n"
-"    the current repository root.\n"
-"\n"
-"    To use an extended glob, start a name with \"glob:\". Globs are\n"
-"    rooted at the current directory; a glob such as \"*.c\" will only\n"
-"    match files in the current directory ending with \".c\".\n"
-"\n"
-"    The supported glob syntax extensions are \"**\" to match any string\n"
-"    across path separators and \"{a,b}\" to mean \"a or b\".\n"
-"\n"
-"    To use a Perl/Python regular expression, start a name with \"re:\".\n"
-"    Regexp pattern matching is anchored at the root of the repository.\n"
-"\n"
-"    Plain examples:\n"
-"\n"
-"    path:foo/bar   a name bar in a directory named foo in the root of\n"
-"                   the repository\n"
-"    path:path:name a file or directory named \"path:name\"\n"
-"\n"
-"    Glob examples:\n"
-"\n"
-"    glob:*.c       any name ending in \".c\" in the current directory\n"
-"    *.c            any name ending in \".c\" in the current directory\n"
-"    **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                   current directory including itself.\n"
-"    foo/*.c        any name ending in \".c\" in the directory foo\n"
-"    foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                   including itself.\n"
-"\n"
-"    Regexp examples:\n"
-"\n"
-"    re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
-"\n"
-"    "
-msgstr ""
-
 msgid "Environment Variables"
 msgstr "Variabili d'ambiente"
 
-msgid ""
-"\n"
-"HG::\n"
-"    Path to the 'hg' executable, automatically passed when running hooks,\n"
-"    extensions or external tools. If unset or empty, this is the hg\n"
-"    executable's name if it's frozen, or an executable named 'hg'\n"
-"    (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
-"    Windows) is searched.\n"
-"\n"
-"HGEDITOR::\n"
-"    This is the name of the editor to run when committing. See EDITOR.\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"HGENCODING::\n"
-"    This overrides the default locale setting detected by Mercurial.\n"
-"    This setting is used to convert data including usernames,\n"
-"    changeset descriptions, tag names, and branches. This setting can\n"
-"    be overridden with the --encoding command-line option.\n"
-"\n"
-"HGENCODINGMODE::\n"
-"    This sets Mercurial's behavior for handling unknown characters\n"
-"    while transcoding user input. The default is \"strict\", which\n"
-"    causes Mercurial to abort if it can't map a character. Other\n"
-"    settings include \"replace\", which replaces unknown characters, and\n"
-"    \"ignore\", which drops them. This setting can be overridden with\n"
-"    the --encodingmode command-line option.\n"
-"\n"
-"HGMERGE::\n"
-"    An executable to use for resolving merge conflicts. The program\n"
-"    will be executed with three arguments: local file, remote file,\n"
-"    ancestor file.\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"HGRCPATH::\n"
-"    A list of files or directories to search for hgrc files. Item\n"
-"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-"    platform default search path is used. If empty, only the .hg/hgrc\n"
-"    from the current repository is read.\n"
-"\n"
-"    For each element in HGRCPATH:\n"
-"    * if it's a directory, all directories ending with .rc are added\n"
-"    * otherwise, the directory itself will be added\n"
-"\n"
-"HGUSER::\n"
-"    This is the string used as the author of a commit. If not set,\n"
-"    available values will be considered in this order:\n"
-"\n"
-"    * HGUSER (deprecated)\n"
-"    * hgrc files from the HGRCPATH\n"
-"    * EMAIL\n"
-"    * interactive prompt\n"
-"    * LOGNAME (with '@hostname' appended)\n"
-"\n"
-"    (deprecated, use .hgrc)\n"
-"\n"
-"EMAIL::\n"
-"    May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"LOGNAME::\n"
-"    May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"VISUAL::\n"
-"    This is the name of the editor to use when committing. See EDITOR.\n"
-"\n"
-"EDITOR::\n"
-"    Sometimes Mercurial needs to open a text file in an editor\n"
-"    for a user to modify, for example when writing commit messages.\n"
-"    The editor it uses is determined by looking at the environment\n"
-"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-"    non-empty one is chosen. If all of them are empty, the editor\n"
-"    defaults to 'vi'.\n"
-"\n"
-"PYTHONPATH::\n"
-"    This is used by Python to find imported modules and may need to be set\n"
-"    appropriately if this Mercurial is not installed system-wide.\n"
-"    "
-msgstr ""
-
 msgid "Specifying Single Revisions"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial supports several ways to specify individual\n"
-"    revisions.\n"
-"\n"
-"    A plain integer is treated as a revision number. Negative\n"
-"    integers are treated as topological offsets from the tip, with\n"
-"    -1 denoting the tip. As such, negative numbers are only useful\n"
-"    if you've memorized your local tree numbers and want to save\n"
-"    typing a single digit. This editor suggests copy and paste.\n"
-"\n"
-"    A 40-digit hexadecimal string is treated as a unique revision\n"
-"    identifier.\n"
-"\n"
-"    A hexadecimal string less than 40 characters long is treated as a\n"
-"    unique revision identifier, and referred to as a short-form\n"
-"    identifier. A short-form identifier is only valid if it is the\n"
-"    prefix of exactly one full-length identifier.\n"
-"\n"
-"    Any other string is treated as a tag name, which is a symbolic\n"
-"    name associated with a revision identifier. Tag names may not\n"
-"    contain the \":\" character.\n"
-"\n"
-"    The reserved name \"tip\" is a special tag that always identifies\n"
-"    the most recent revision.\n"
-"\n"
-"    The reserved name \"null\" indicates the null revision. This is the\n"
-"    revision of an empty repository, and the parent of revision 0.\n"
-"\n"
-"    The reserved name \".\" indicates the working directory parent. If\n"
-"    no working directory is checked out, it is equivalent to null.\n"
-"    If an uncommitted merge is in progress, \".\" is the revision of\n"
-"    the first parent.\n"
-"    "
-msgstr ""
-
 msgid "Specifying Multiple Revisions"
 msgstr "Specificare Revisioni Multiple"
 
-msgid ""
-"\n"
-"    When Mercurial accepts more than one revision, they may be\n"
-"    specified individually, or provided as a topologically continuous\n"
-"    range, separated by the \":\" character.\n"
-"\n"
-"    The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
-"    are revision identifiers. Both BEGIN and END are optional. If\n"
-"    BEGIN is not specified, it defaults to revision number 0. If END\n"
-"    is not specified, it defaults to the tip. The range \":\" thus\n"
-"    means \"all revisions\".\n"
-"\n"
-"    If BEGIN is greater than END, revisions are treated in reverse\n"
-"    order.\n"
-"\n"
-"    A range acts as a closed interval. This means that a range of 3:5\n"
-"    gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
-"    "
-msgstr ""
-
 msgid "Diff Formats"
 msgstr "Formati di diff"
 
-msgid ""
-"\n"
-"    Mercurial's default format for showing changes between two versions\n"
-"    of a file is compatible with the unified format of GNU diff, which\n"
-"    can be used by GNU patch and many other standard tools.\n"
-"\n"
-"    While this standard format is often enough, it does not encode the\n"
-"    following information:\n"
-"\n"
-"     - executable status and other permission bits\n"
-"     - copy or rename information\n"
-"     - changes in binary files\n"
-"     - creation or deletion of empty files\n"
-"\n"
-"    Mercurial also supports the extended diff format from the git VCS\n"
-"    which addresses these limitations. The git diff format is not\n"
-"    produced by default because a few widespread tools still do not\n"
-"    understand this format.\n"
-"\n"
-"    This means that when generating diffs from a Mercurial repository\n"
-"    (e.g. with \"hg export\"), you should be careful about things like\n"
-"    file copies and renames or other things mentioned above, because\n"
-"    when applying a standard diff to a different repository, this extra\n"
-"    information is lost. Mercurial's internal operations (like push and\n"
-"    pull) are not affected by this, because they use an internal binary\n"
-"    format for communicating changes.\n"
-"\n"
-"    To make Mercurial produce the git extended diff format, use the\n"
-"    --git option available for many commands, or set 'git = True' in the\n"
-"    [diff] 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 "Template Usage"
 msgstr ""
 
-msgid ""
-"\n"
-"    Mercurial allows you to customize output of commands through\n"
-"    templates. You can either pass in a template from the command line,\n"
-"    via the --template option, or select an existing template-style (--"
-"style).\n"
-"\n"
-"    You can customize output for any \"log-like\" command: log, outgoing,\n"
-"    incoming, tip, parents, heads and glog.\n"
-"\n"
-"    Three styles are packaged with Mercurial: default (the style used\n"
-"    when no explicit preference is passed), compact and changelog. Usage:\n"
-"\n"
-"        $ hg log -r1 --style changelog\n"
-"\n"
-"    A template is a piece of text, with markup to invoke variable "
-"expansion:\n"
-"\n"
-"        $ hg log -r1 --template \"{node}\\n\"\n"
-"        b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
-"\n"
-"    Strings in curly braces are called keywords. The availability of\n"
-"    keywords depends on the exact context of the templater. These keywords\n"
-"    are usually available for templating a log-like command:\n"
-"\n"
-"    - author: String. The unmodified author of the changeset.\n"
-"    - branches: String. The name of the branch on which the changeset\n"
-"          was committed. Will be empty if the branch name was default.\n"
-"    - date: Date information. The date when the changeset was committed.\n"
-"    - desc: String. The text of the changeset description.\n"
-"    - diffstat: String. Statistics of changes with the following format:\n"
-"          \"modified files: +added/-removed lines\"\n"
-"    - files: List of strings. All files modified, added, or removed by\n"
-"          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 40-character\n"
-"          hexadecimal string.\n"
-"    - parents: List of strings. The parents of the changeset.\n"
-"    - rev: Integer. The repository-local changeset revision number.\n"
-"    - tags: List of strings. Any tags associated with the changeset.\n"
-"\n"
-"    The \"date\" keyword does not produce human-readable output. If you\n"
-"    want to use a date in your output, you can use a filter to process it.\n"
-"    Filters are functions which return a string based on the input "
-"variable.\n"
-"    You can also use a chain of filters to get the desired output:\n"
-"\n"
-"       $ hg tip --template \"{date|isodate}\\n\"\n"
-"       2008-08-21 18:22 +0000\n"
-"\n"
-"    List of filters:\n"
-"\n"
-"    - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-"          every line except the last.\n"
-"    - age: Date. Returns a human-readable date/time difference between\n"
-"          the given date/time and the current 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 path\n"
-"          separator (ignoring trailing seprators). For example,\n"
-"          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
-"\".\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 email\n"
-"          address, and extracts just the domain component.\n"
-"          Example: 'User <[e-mail]>' becomes 'example.com'.\n"
-"    - email: Any text. Extracts the first string that looks like an email\n"
-"          address. Example: 'User <[e-mail]>' becomes\n"
-"          '[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"
-"    - 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"
-"    - obfuscate: Any text. Returns the input text rendered as a sequence\n"
-"          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\n"
-"          in email headers.\n"
-"    - short: Changeset hash. Returns the short form of a changeset hash,\n"
-"          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 the\n"
-"          first starting with a tab character.\n"
-"    - urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-"          \"foo bar\" becomes \"foo%20bar\".\n"
-"    - user: Any text. Returns the user portion of an email address.\n"
-"    "
-msgstr ""
-
-msgid "Url Paths"
+#, fuzzy
+msgid "URL Paths"
 msgstr "Percorsi url"
 
-msgid ""
-"\n"
-"    Valid URLs are of the form:\n"
-"\n"
-"      local/filesystem/path (or file://local/filesystem/path)\n"
-"      http://[user[:pass]@]host[:port]/[path]\n"
-"      https://[user[:pass]@]host[:port]/[path]\n"
-"      ssh://[user[:pass]@]host[:port]/[path]\n"
-"\n"
-"    Paths in the local filesystem can either point to Mercurial\n"
-"    repositories or to bundle files (as created by 'hg bundle' or\n"
-"    'hg incoming --bundle').\n"
-"\n"
-"    An optional identifier after # indicates a particular branch, tag,\n"
-"    or changeset to use from the remote repository.\n"
-"\n"
-"    Some features, such as pushing to http:// and https:// URLs are\n"
-"    only possible if the feature is explicitly enabled on the\n"
-"    remote Mercurial server.\n"
-"\n"
-"    Some notes about using SSH with Mercurial:\n"
-"    - SSH requires an accessible shell account on the destination machine\n"
-"      and a copy of hg in the remote path or specified with as remotecmd.\n"
-"    - path is relative to the remote user's home directory by default.\n"
-"      Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
-"        ssh://example.com//tmp/repository\n"
-"    - Mercurial doesn't use its own compression via SSH; the right thing\n"
-"      to do is to configure it in your ~/.ssh/config, e.g.:\n"
-"        Host *.mylocalnetwork.example.com\n"
-"          Compression no\n"
-"        Host *\n"
-"          Compression yes\n"
-"      Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"      with the --ssh command line option.\n"
-"\n"
-"    These urls can all be stored in your hgrc with path aliases under the\n"
-"    [paths] section like so:\n"
-"    [paths]\n"
-"    alias1 = URL1\n"
-"    alias2 = URL2\n"
-"    ...\n"
-"\n"
-"    You can then use the alias for any command that uses a url (for example\n"
-"    'hg pull alias1' would pull from the 'alias1' path).\n"
-"\n"
-"    Two path aliases are special because they are used as defaults\n"
-"    when you do not provide the url to a command:\n"
-"\n"
-"    default:\n"
-"      When you create a repository with hg clone, the clone command 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-\n"
-"      and pull-like commands (including in and out).\n"
-"\n"
-"    default-push:\n"
-"      The push command will look for a path named 'default-push', and\n"
-"      prefer it over 'default' if both are defined.\n"
-"    "
-msgstr ""
+#, fuzzy
+msgid "Using additional features"
+msgstr "abilita output aggiuntivo"
+
+msgid "can only share local repositories"
+msgstr ""
+
+#, fuzzy
+msgid "destination already exists"
+msgstr "la destinazione '%s' 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à"
 
+#, fuzzy, python-format
+msgid "destination '%s' is not empty"
+msgstr "la destinazione %s non è una directory"
+
 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"
 
-msgid "updating working directory\n"
-msgstr "sto aggiornando la directory di lavoro\n"
-
-msgid "updated"
-msgstr "aggiornati"
-
-msgid "merged"
-msgstr "merge"
-
-msgid "removed"
-msgstr "rimossi"
-
-msgid "unresolved"
-msgstr "non risolti"
-
-#, python-format
-msgid "%d files %s"
-msgstr "%d file %s"
+#, fuzzy, python-format
+msgid "updating to branch %s\n"
+msgstr "sto aggiornando la cache delle branch\n"
+
+#, python-format
+msgid ""
+"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
+msgstr ""
 
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr "usa 'hg resolve' per riprovare i merge sui file non risolti\n"
 
-msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
+#, fuzzy
+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 up --clean' 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 not available on this system"
+#, fuzzy
+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)"
 
 #, 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\""
 
-#, python-format
-msgid "using %s\n"
-msgstr "sto usando %s\n"
-
-#, python-format
-msgid "capabilities: %s\n"
-msgstr "funzionalità: %s\n"
-
 msgid "operation not supported over http"
 msgstr "operazione non supportata su http"
 
-#, python-format
-msgid "sending %s command\n"
-msgstr "sto inviando il comando %s\n"
-
-#, python-format
-msgid "sending %s bytes\n"
-msgstr "sto inviando %s byte\n"
-
 msgid "authorization failed"
 msgstr "autorizzazione fallita"
 
-#, python-format
-msgid "http error while sending %s command\n"
-msgstr "errore http durante l'invio del comando %s\n"
-
 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 "Requested URL: '%s'\n"
-msgstr "URL richiesto: '%s'\n"
-
-#, python-format
 msgid "'%s' does not appear to be an hg repository"
 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):"
 
 #, 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 "%s: ignoring invalid syntax '%s'\n"
+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 ""
 
 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)"
 
-#, 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"
-
-#, python-format
-msgid "tag '%s' refers to unknown node"
-msgstr "la tag '%s' si riferisce ad un nodo sconosciuto"
+#, fuzzy, python-format
+msgid "working directory has unknown parent '%s'!"
+msgstr "directory di lavoro di %s"
 
 #, python-format
 msgid "unknown revision '%s'"
 msgstr "revisione sconosciuta '%s'"
 
-#, python-format
-msgid "filtering %s through %s\n"
-msgstr "sto filtrando %s attraverso %s\n"
-
 msgid "journal already exists - run hg recover"
 msgstr "il journal esiste già - eseguire hg recover"
 
 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"
 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"
 
-#, python-format
-msgid " %s: searching for copy revision for %s\n"
-msgstr ""
-
-#, python-format
-msgid " %s: copy %s:%s\n"
-msgstr ""
-
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr ""
 
-#, python-format
-msgid "%s not tracked!\n"
-msgstr "%s non è tracciato!\n"
+#, fuzzy
+msgid "file not found!"
+msgstr "file %s non trovato!"
+
+#, fuzzy
+msgid "no match under directory!"
+msgstr "nessuna corrispondenza sotto la directory %s!"
+
+#, fuzzy
+msgid "file not tracked!"
+msgstr "il file %s non è tracciato!"
 
 msgid "unresolved merge conflicts (see hg resolve)"
 msgstr ""
 
-msgid "nothing changed\n"
-msgstr "nulla è cambiato\n"
+#, fuzzy, python-format
+msgid "committing subrepository %s\n"
+msgstr "repository·%s"
 
 #, python-format
 msgid "trouble committing %s!\n"
 msgstr ""
 
-msgid "HG: Enter commit message.  Lines beginning with 'HG:' are removed."
-msgstr ""
-
-msgid "empty commit message"
-msgstr "messaggio di commit vuoto"
-
 #, 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"
 
-#, python-format
-msgid "examining %s:%s\n"
-msgstr ""
-
-msgid "branch already found\n"
-msgstr "branch già trovata\n"
-
-#, python-format
-msgid "found incomplete branch %s:%s\n"
-msgstr "trovata branch incompleta %s:%s\n"
-
-#, python-format
-msgid "found new changeset %s\n"
-msgstr "trovato nuovo changeset %s\n"
-
-#, python-format
-msgid "request %d: %s\n"
-msgstr ""
-
-#, python-format
-msgid "received %s:%s\n"
-msgstr ""
-
-#, python-format
-msgid "narrowing %d:%d %s\n"
-msgstr ""
-
-#, python-format
-msgid "found new branch changeset %s\n"
-msgstr ""
-
-#, python-format
-msgid "narrowed branch search to %s:%s\n"
-msgstr ""
-
 msgid "already have changeset "
 msgstr ""
 
 msgid "warning: repository is unrelated\n"
 msgstr ""
 
 msgid "repository is unrelated"
 msgstr "il repository non è imparentato"
 
-msgid "found new changesets starting at "
-msgstr "trovati nuovi changeset a partire da "
-
-#, python-format
-msgid "%d total queries\n"
-msgstr "%d query totali\n"
-
-msgid "common changesets up to "
-msgstr "changeset comuni fino a "
-
 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 ""
 
+#, fuzzy, python-format
+msgid "abort: push creates new remote branch '%s'!\n"
+msgstr "abortito: push crea nuove head remote!\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"
 
 #, python-format
 msgid "%d changesets found\n"
 msgstr "%d changeset trovati\n"
 
-msgid "list of changesets:\n"
-msgstr "elenco dei changeset:\n"
-
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "revlog vuoto o mancante per %s"
 
-#, python-format
-msgid "add changeset %s\n"
-msgstr "aggiungo changeset %s\n"
-
 msgid "adding changesets\n"
 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"
 
 msgid "adding file changes\n"
 msgstr "sto aggiungendo le modifiche ai file\n"
 
-#, python-format
-msgid "adding %s revisions\n"
-msgstr "sto aggiungendo %s revisioni\n"
-
 msgid "received file revlog group is empty"
 msgstr "il gruppo di file revlog ricevuto è vuoto"
 
 #, 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 "updating the branch cache\n"
-msgstr "sto aggiornando la cache delle branch\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 "adding %s (%s)\n"
-msgstr "sto aggiungendo %s (%s)\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 ""
 
-msgid "'\\n' and '\\r' disallowed in filenames"
-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'"
 msgstr ""
 
 #, python-format
 msgid "case-folding collision between %s and %s"
 msgstr ""
 
-msgid "resolving manifests\n"
-msgstr "sto risolvendo i manifesti\n"
-
-#, python-format
-msgid " overwrite %s partial %s\n"
-msgstr "sovrascrivi %s parziale %s\n"
-
-#, python-format
-msgid " ancestor %s local %s remote %s\n"
-msgstr "antenato %s locale %s remoto %s\n"
-
 #, python-format
 msgid ""
 " conflicting flags for %s\n"
 "(n)one, e(x)ec or sym(l)ink?"
 msgstr ""
 
+#, fuzzy
+msgid "&None"
+msgstr "fatto\n"
+
+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 "[cd]"
-msgstr ""
-
-msgid "c"
+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 ""
 
-#, python-format
-msgid "preserving %s for resolve of %s\n"
+msgid "&Deleted"
 msgstr ""
 
 #, 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 "nothing to merge (use 'hg update' or check 'hg heads')"
 msgstr ""
 "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
 
+#, fuzzy
+msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
+msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit"
+
 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 ""
 
 #, 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 "found patch at byte %d\n"
-msgstr ""
-
-msgid "patch generated by hg export\n"
-msgstr "patch generata da hg export\n"
-
-#, 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 %s).\n"
+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"
 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"
 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 "no valid hunks found; trying with %r instead\n"
-msgstr ""
+#, fuzzy, python-format
+msgid "Unsupported line endings type: %s"
+msgstr "%s: tipo di file non supportato (il tipo è %s)\n"
+
+#, fuzzy, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d file, %d changeset, %d revisioni totali\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 "stopped by signal %d"
-msgstr "terminato dal segnale %d"
-
-msgid "invalid exit code"
-msgstr "codice d'uscita non valido"
-
-#, python-format
 msgid "saving bundle to %s\n"
 msgstr "sto salvando il bundle in %s\n"
 
 msgid "adding branch\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 ""
 
 #, 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 ""
 
+#, fuzzy, python-format
+msgid "index %s is corrupted"
+msgstr "interrotto"
+
 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 ""
 
 #, 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: "
 
-msgid "no suitable response from remote hg"
-msgstr "nessuna risposta accettabile dall'hg remoto"
-
 #, python-format
 msgid "push refused: %s"
 msgstr "push rifiutato: %s"
 
 msgid "unsynced changes"
 msgstr "modifiche non sincronizzate"
 
 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"
 
-msgid "scanning\n"
-msgstr "sto effettuando la scansione\n"
-
-#, python-format
-msgid "%d files, %d bytes to transfer\n"
-msgstr ""
-
-#, python-format
-msgid "sending %s (%d bytes)\n"
-msgstr "sto inviando %s (%d byte)\n"
+#, python-format
+msgid ""
+" subrepository sources for %s differ\n"
+"use (l)ocal source (%s) or (r)emote source (%s)?"
+msgstr ""
+
+#, fuzzy
+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 "removing subrepo %s\n"
+msgstr "sto rimuovendo %s\n"
+
+#, fuzzy, python-format
+msgid "pulling subrepo %s\n"
+msgstr "sto facendo pull da %s\n"
+
+#, fuzzy, python-format
+msgid "pushing subrepo %s\n"
+msgstr "sto effettuando il push verso %s\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 ""
 
+#, fuzzy, python-format
+msgid "error expanding '%s%%%s'"
+msgstr "errore di lettura di %s/.hg/hgrc: %s\n"
+
+#, fuzzy, python-format
+msgid "unknown filter '%s'"
+msgstr "revisione sconosciuta '%s'"
+
 #, python-format
 msgid "style not found: %s"
 msgstr "stile non trovato: %s"
 
 #, python-format
-msgid "%s:%s: parse error"
-msgstr ""
-
-#, python-format
 msgid "template file %s: %s"
 msgstr ""
 
-#, python-format
-msgid "Error expanding '%s%%%s'"
+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"
 
-#, python-format
-msgid "failed to truncate %s\n"
-msgstr ""
-
 msgid "rollback completed\n"
 msgstr "rollback completato\n"
 
+#, fuzzy
+msgid "rollback failed - please run hg recover\n"
+msgstr "il journal esiste già - eseguire hg recover"
+
 #, python-format
 msgid "Not trusting file %s from untrusted user %s, group %s\n"
 msgstr ""
 
 #, python-format
-msgid ""
-"Failed to parse %s\n"
-"%s"
-msgstr ""
-"Fallita la parsificazione di %s\n"
-"%s"
-
-#, python-format
 msgid "Ignored: %s\n"
 msgstr "Ignorato: %s\n"
 
-#, python-format
-msgid "unable to open %s: %s"
-msgstr "impossibile aprire %s: %s"
-
-#, python-format
-msgid ""
-"failed to parse %s\n"
-"%s"
-msgstr ""
-"fallita la parsificazione di %s\n"
-"%s"
-
-#, python-format
-msgid ""
-"Error in configuration section [%s] parameter '%s':\n"
-"%s"
-msgstr ""
-"Errore nella sezione di configurazione [%s] parametro '%s':\n"
-"%s"
-
-#, python-format
-msgid "Ignoring untrusted configuration option %s.%s = %s\n"
+#, fuzzy, 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 ""
-"Error in configuration section [%s]:\n"
-"%s"
-msgstr ""
-"Errore nella sezione di configurazione [%s]:\n"
-"%s"
+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."
 
 #, python-format
 msgid "username %s contains a newline\n"
 msgstr "lo username %s contiene un carattere di fine riga\n"
 
+msgid "response expected"
+msgstr "risposta attesa"
+
 msgid "unrecognized response\n"
 msgstr "risposta non riconosciuta\n"
 
-msgid "response expected"
-msgstr "risposta attesa"
-
 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 "proxying through http://%s:%s\n"
-msgstr "usando proxy attraverso http://%s:%s\n"
-
-#, python-format
 msgid "http auth: user %s, password %s\n"
 msgstr "autenticazione http: utente %s, password %s\n"
 
 #, python-format
-msgid "%s, please check your locale settings"
-msgstr "%s, si prega di controllare le impostazioni di localizzazione"
-
-#, 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 point to %s changeset %d"
+#, fuzzy, python-format
+msgid "rev %d points to nonexistent changeset %d"
+msgstr "rev %d punta a %s changeset %d"
+
+#, fuzzy, python-format
+msgid "rev %d points to unexpected changeset %d"
 msgstr "rev %d punta a %s changeset %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)"
 
 #, 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"
 
+#, fuzzy, python-format
+msgid "%s not in changesets"
+msgstr "%s non è nei manifesti"
+
 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"
 
 #, 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'"
 
 #, 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"
+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"
-
-#~ msgid "%s %s to %s\n"
-#~ msgstr "%s %s in %s\n"