i18n-it: synchronized with adf3c4401c5d stable
authorStefano Tortarolo <stefano.tortarolo@gmail.com>
Mon, 14 Mar 2011 23:48:17 +0100
branchstable
changeset 13737 8c3e0542e1535c6c0bdf93d886df576560b23588
parent 13695 a083c6e62acbf9a9389df26fe3af47352161cec3
child 13738 83bf80c50e762dcbd5e425ec2233b94552ab3a87
push id1
push usergszorc@mozilla.com
push dateWed, 18 Mar 2015 16:34:57 +0000
i18n-it: synchronized with adf3c4401c5d
i18n/it.po
--- a/i18n/it.po
+++ b/i18n/it.po
@@ -1,141 +1,174 @@
 # 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: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-08-12 18:06+0200\n"
-"PO-Revision-Date: 2009-10-25 12:45+0100\n"
+"POT-Creation-Date: 2011-03-22 22:04+0100\n"
+"PO-Revision-Date: 2011-03-15 17:05+0100\n"
 "Last-Translator: Stefano Tortarolo <stefano.tortarolo@gmail.com>\n"
 "Language-Team: Italian <Italian>\n"
+"Language: it\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:"
-msgstr "    opzioni:"
+msgid "Extensions"
+msgstr "Estensioni"
+
+msgid ""
+"This section contains help for extensions that are distributed together with "
+"Mercurial. Help for other extensions is available in the help system."
+msgstr ""
+"Questa sezione contiene la guida per le estensioni che sono distribuite con "
+"Mercurial. Guide per altre estensioni sono disponibili nel sistema d'aiuto."
+
+msgid "Options:"
+msgstr "Opzioni:"
 
 #, python-format
 msgid "    aliases: %s"
 msgstr "    alias: %s"
 
 msgid "hooks for controlling repository access"
-msgstr ""
+msgstr "hook per controllare l'accesso al repository"
 
 msgid ""
 "This hook makes it possible to allow or deny write access to given\n"
 "branches and paths of a repository when receiving incoming changesets\n"
 "via pretxnchangegroup and pretxncommit."
 msgstr ""
+"Questo hook rende possibile consentire o negare l'accesso in scrittura\n"
+"a specifiche branch o percorsi di un repository durante la ricezione di\n"
+"changeset in ingresso tramite pretxnchangegroup and pretxncommit."
 
 msgid ""
 "The authorization is matched based on the local user name on the\n"
 "system where the hook runs, and not the committer of the original\n"
 "changeset (since the latter is merely informative)."
 msgstr ""
+"L'autorizzazione è verificata sulla base del nome dell'utente locale\n"
+"del sistema dove l'hook viene eseguito, e non l'autore del commit\n"
+"originario (dal momento che quest'ultimo ha mero scopo informativo)."
 
 msgid ""
 "The acl hook is best used along with a restricted shell like hgsh,\n"
 "preventing authenticating users from doing anything other than pushing\n"
 "or pulling. The hook is not safe to use if users have interactive\n"
 "shell access, as they can then disable the hook. Nor is it safe if\n"
 "remote users share an account, because then there is no way to\n"
 "distinguish them."
 msgstr ""
+"L'hook acl è usato meglio con una shell ristretta come hgsh,\n"
+"prevenendo utenti autenticati dal fare altro di push o pull.\n"
+"L'hook non è sicuro da usare se gli utenti hanno accesso a\n"
+"shell interattive, dal momento che possono disattivare l'hook.\n"
+"Allo stesso modo non è sicuro se utenti remoti condividono\n"
+"l'account, poichè allora non c'è modo di distinguerli."
 
 msgid "The order in which access checks are performed is:"
-msgstr ""
+msgstr "L'ordine in cui le verifiche di accesso vengono eseguite è:"
 
 msgid ""
 "1) Deny  list for branches (section ``acl.deny.branches``)\n"
 "2) Allow list for branches (section ``acl.allow.branches``)\n"
 "3) Deny  list for paths    (section ``acl.deny``)\n"
 "4) Allow list for paths    (section ``acl.allow``)"
 msgstr ""
 
 msgid "The allow and deny sections take key-value pairs."
 msgstr ""
 
 msgid ""
 "Branch-based Access Control\n"
-"---------------------------"
-msgstr ""
+"..........................."
+msgstr ""
+"Controllo degli accessi basato su branch\n"
+"..........................."
 
 msgid ""
 "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
 "have branch-based access control. Keys in these sections can be\n"
 "either:"
 msgstr ""
 
 msgid ""
 "- a branch name, or\n"
 "- an asterisk, to match any branch;"
 msgstr ""
+"- il nome di un branch, oppure\n"
+"- un asterisco, per comprendere ogni branch;"
 
 msgid "The corresponding values can be either:"
-msgstr ""
+msgstr "I valori corrispondenti possono essere:"
 
 msgid ""
 "- a comma-separated list containing users and groups, or\n"
 "- an asterisk, to match anyone;"
 msgstr ""
 
 msgid ""
 "Path-based Access Control\n"
-"-------------------------"
-msgstr ""
+"........................."
+msgstr ""
+"Controllo degli accessi basato su percorso\n"
+"........................."
 
 msgid ""
 "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
 "access control. Keys in these sections accept a subtree pattern (with\n"
 "a glob syntax by default). The corresponding values follow the same\n"
 "syntax as the other sections above."
 msgstr ""
 
 msgid ""
 "Groups\n"
-"------"
-msgstr ""
+"......"
+msgstr ""
+"Gruppi\n"
+"......"
 
 msgid ""
 "Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
 "name has the same effect as specifying all the users in that group."
 msgstr ""
 
 msgid ""
 "You can define group members in the ``acl.groups`` section.\n"
 "If a group name is not defined there, and Mercurial is running under\n"
 "a Unix-like system, the list of users will be taken from the OS.\n"
 "Otherwise, an exception will be raised."
 msgstr ""
 
 msgid ""
 "Example Configuration\n"
-"---------------------"
-msgstr ""
+"....................."
+msgstr ""
+"Configurazione d'esempio\n"
+"....................."
 
 msgid "::"
-msgstr ""
+msgstr "::"
 
 msgid "  [hooks]"
-msgstr ""
+msgstr "  [hooks]"
 
 msgid ""
 "  # Use this if you want to check access restrictions at commit time\n"
 "  pretxncommit.acl = python:hgext.acl.hook"
 msgstr ""
 
 msgid ""
 "  # Use this if you want to check access restrictions for pull, push,\n"
@@ -149,30 +182,32 @@ msgid ""
 "  # listed here, let them pass otherwise. Source is \"serve\" for all\n"
 "  # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n"
 "  # related commands are run locally.\n"
 "  # Default: serve\n"
 "  sources = serve"
 msgstr ""
 
 msgid "  [acl.deny.branches]"
-msgstr ""
+msgstr "  [acl.deny.branches]"
 
 msgid ""
 "  # Everyone is denied to the frozen branch:\n"
 "  frozen-branch = *"
 msgstr ""
+"  # Ad ognuno è vietato l'accesso alla branch congelata:\n"
+"  frozen-branch = *"
 
 msgid ""
 "  # A bad user is denied on all branches:\n"
 "  * = bad-user"
 msgstr ""
 
 msgid "  [acl.allow.branches]"
-msgstr ""
+msgstr "  [acl.allow.branches]"
 
 msgid ""
 "  # A few users are allowed on branch-a:\n"
 "  branch-a = user-1, user-2, user-3"
 msgstr ""
 
 msgid ""
 "  # Only one user is allowed on branch-b:\n"
@@ -238,21 +273,21 @@ msgstr ""
 msgid ""
 "  # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
 "  # access to any file under the \"resources\" folder (except for 1\n"
 "  # file. See acl.deny):\n"
 "  src/main/resources/** = *"
 msgstr ""
 
 msgid "  .hgtags = release_engineer"
-msgstr ""
+msgstr "  .hgtags = release_engineer"
 
 #, python-format
 msgid "group '%s' is undefined"
-msgstr ""
+msgstr "il gruppo '%s' non è definito"
 
 #, python-format
 msgid ""
 "config error - hook type \"%s\" cannot stop incoming changesets nor commits"
 msgstr ""
 "errore di configurazione - l'hook di tipo \"%s\" non può fermare né i "
 "changesetné i commit in entrata"
 
@@ -267,183 +302,34 @@ msgid "acl: user \"%s\" not allowed on b
 msgstr ""
 "acl: accesso non permesso per l'utente \"%s\" per il branch \"%s"
 "\" (changeset \"%s\")"
 
 #, python-format
 msgid "acl: access denied for changeset %s"
 msgstr "acl: accesso negato per il changeset %s"
 
-msgid "track a line of development with movable markers"
-msgstr "segui una linea di sviluppo con puntatori mobili"
-
-msgid ""
-"Bookmarks are local movable markers to changesets. Every bookmark\n"
-"points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it, the\n"
-"bookmark shifts to the new changeset."
-msgstr ""
-"I segnalibri di Mercurial sono puntatori locali e mobili a changeset. Ogni\n"
-"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il "
-"commit di un\n"
-"changeset basato su un changeset che ha un segnalibro,\n"
-"il segnalibro è spostato sul nuovo changeset"
-
-msgid ""
-"It is possible to use bookmark names in every revision lookup (e.g.\n"
-":hg:`merge`, :hg:`update`)."
-msgstr ""
-"E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es.\n"
-":hg:`merge`, :hg:`update`)."
-
-msgid ""
-"By default, when several bookmarks point to the same changeset, they\n"
-"will all move forward together. It is possible to obtain a more\n"
-"git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
-msgstr ""
-"Di default, quando più segnalibri puntano allo stesso changeset, essi\n"
-"avanzeranno tutti assieme. È possibile avere un comportamento più simile\n"
-"a git aggiungendo la seguente opzione di configurazione al tuo .hgrc::"
-
-msgid ""
-"  [bookmarks]\n"
-"  track.current = True"
-msgstr ""
-
-msgid ""
-"This will cause Mercurial to track the bookmark that you are currently\n"
-"using, and only update it. This is similar to git's approach to\n"
-"branching.\n"
-msgstr ""
-"Questo porterà Mercurial a tener traccia del segnalibro su cui sei "
-"attualmente, e\n"
-"a limitarsi ad aggiornarlo. Questo è simile all'approccio di branching di "
-"git.\n"
-
-msgid ""
-"    Bookmarks are pointers to certain commits that move when\n"
-"    committing. Bookmarks are local. They can be renamed, copied and\n"
-"    deleted. It is possible to use bookmark names in :hg:`merge` and\n"
-"    :hg:`update` to merge and update respectively to a given bookmark."
-msgstr ""
-
-msgid ""
-"    You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
-"    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 "bookmark names cannot consist entirely of whitespace"
-msgstr "il nome di un segnalibro non può consistere interamente di whitespace"
-
-msgid "a bookmark cannot have the name of an existing branch"
-msgstr "un segnalibro non può avere lo stesso nome di una branch esistente"
-
-msgid "no bookmarks set\n"
-msgstr ""
-
-#, python-format
-msgid "updating bookmark %s\n"
-msgstr "sto aggiornando il segnalibro %s\n"
-
-#, python-format
-msgid "not updating divergent bookmark %s\n"
-msgstr ""
-
-#, python-format
-msgid "updating bookmark %s failed!\n"
-msgstr "aggiornamento del segnalibro %s fallito!\n"
-
-#, python-format
-msgid "remote bookmark %s not found!"
-msgstr "repository remoto %s non trovato!"
-
-#, python-format
-msgid "importing bookmark %s\n"
-msgstr "importazione segnalibro %s\n"
-
-#, python-format
-msgid "exporting bookmark %s\n"
-msgstr "esportazione segnalibro %s\n"
-
-#, python-format
-msgid "deleting remote bookmark %s\n"
-msgstr "eliminazione segnalibro remoto %s\n"
-
-msgid "searching for changes\n"
-msgstr "sto cercando modifiche\n"
-
-msgid "no changes found\n"
-msgstr "nessuna modifica trovata\n"
-
-#, python-format
-msgid "comparing with %s\n"
-msgstr "sto confrontando con %s\n"
-
-msgid "bookmark to import"
-msgstr "segnalibro da importare"
-
-msgid "bookmark to export"
-msgstr "segnalibro da esportare"
-
-msgid "compare bookmark"
-msgstr "confronta segnalibro"
-
-msgid "force"
-msgstr "forza"
-
-msgid "REV"
-msgstr ""
-
-msgid "revision"
-msgstr "revisione"
-
-msgid "delete a given bookmark"
-msgstr "elimina un dato segnalibro"
-
-msgid "NAME"
-msgstr "NOME"
-
-msgid "rename a given bookmark"
-msgstr "rinomina un dato segnalibro"
-
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]"
-
 msgid "hooks for integrating with the Bugzilla bug tracker"
-msgstr ""
+msgstr "hook per l'integrazione con il bug tracker Bugzilla"
 
 msgid ""
 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
 "bug status."
 msgstr ""
+"Questa estensione hook aggiunge commenti a bug in Bugzilla quando vengono\n"
+"rilevati changeset che fanno riferimento a bug per ID Bugzilla. L'hook non\n"
+"cambia lo status del bug."
 
 msgid ""
 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
 "installations using MySQL are supported."
 msgstr ""
+"L'hook aggiorna direttamente il database Bugzilla. Sono supportate\n"
+"solo installazioni di Bugzilla che usano MySQL."
 
 msgid ""
 "The hook relies on a Bugzilla script to send bug change notification\n"
 "emails. That script changes between Bugzilla versions; the\n"
 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
 "be run by Mercurial as the user pushing the change; you will need to\n"
 "ensure the Bugzilla install file permissions are set appropriately."
@@ -563,31 +449,36 @@ msgstr ""
 
 msgid ""
 "baseurl\n"
 "  Base URL for browsing Mercurial repositories. Reference from\n"
 "  templates as {hgweb}."
 msgstr ""
 
 msgid "Activating the extension::"
-msgstr ""
+msgstr "Attivazione dell'estensione::"
 
 msgid ""
 "    [extensions]\n"
 "    bugzilla ="
 msgstr ""
+"    [extensions]\n"
+"    bugzilla ="
 
 msgid ""
 "    [hooks]\n"
 "    # run bugzilla hook on every change pulled or pushed in here\n"
 "    incoming.bugzilla = python:hgext.bugzilla.hook"
 msgstr ""
+"    [hooks]\n"
+"    # esegue l'hook bugzilla ad ogni modifica a seguito di pull o push qui\n"
+"    incoming.bugzilla = python:hgext.bugzilla.hook"
 
 msgid "Example configuration:"
-msgstr ""
+msgstr "Configurazione di esempio:"
 
 msgid ""
 "This example configuration is for a collection of Mercurial\n"
 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
 "installation in /opt/bugzilla-3.2. ::"
 msgstr ""
 
 msgid ""
@@ -597,26 +488,40 @@ msgid ""
 "    version=3.0\n"
 "    bzuser=unknown@domain.com\n"
 "    bzdir=/opt/bugzilla-3.2\n"
 "    template=Changeset {node|short} in {root|basename}.\n"
 "             {hgweb}/{webroot}/rev/{node|short}\\n\n"
 "             {desc}\\n\n"
 "    strip=5"
 msgstr ""
+"    [bugzilla]\n"
+"    host=localhost\n"
+"    password=XYZZY\n"
+"    version=3.0\n"
+"    bzuser=unknown@domain.com\n"
+"    bzdir=/opt/bugzilla-3.2\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
+"    strip=5"
 
 msgid ""
 "    [web]\n"
 "    baseurl=http://dev.domain.com/hg"
 msgstr ""
+"    [web]\n"
+"    baseurl=http://dev.domain.com/hg"
 
 msgid ""
 "    [usermap]\n"
 "    user@emaildomain.com=user.name@bugzilladomain.com"
 msgstr ""
+"    [usermap]\n"
+"    user@emaildomain.com=user.name@bugzilladomain.com"
 
 msgid "Commits add a comment to the Bugzilla bug record of the form::"
 msgstr ""
 
 msgid ""
 "    Changeset 3b16791d6642 in repository-name.\n"
 "    http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
 msgstr ""
@@ -716,31 +621,34 @@ msgstr ""
 "    Stampa le revisioni figlie della directory di lavoro. Se una\n"
 "    revisione è data tramite --rev, verranno stampati i figli di\n"
 "    quella revisione. Se viene fornito un file come argomento,\n"
 "    verrà stampata l'ultima revisione in cui il file è stato\n"
 "    modificato (dopo la revisione della directory di lavoro\n"
 "    o dell'argomento di --rev se fornito).\n"
 "    "
 
+msgid "REV"
+msgstr "REV"
+
 msgid "show children of the specified revision"
 msgstr "mostra i figli della revisione specificata"
 
 msgid "hg children [-r REV] [FILE]"
 msgstr "hg·children·[-r·REV]·[FILE]"
 
 msgid "command to display statistics about repository history"
 msgstr "comando per mostrare statistiche sulla storia del repository"
 
 #, python-format
 msgid "Revision %d is a merge, ignoring...\n"
 msgstr "La revisione %d è un merge, ignoro...\n"
 
 msgid "analyzing"
-msgstr ""
+msgstr "sto effettuando l'analisi"
 
 msgid "histogram of changes to the repository"
 msgstr "istogramma delle modifiche al repository"
 
 msgid ""
 "    This command will display a histogram representing the number\n"
 "    of changed lines or revisions, grouped according to the given\n"
 "    template. The default template will group changes by author.\n"
@@ -750,17 +658,17 @@ msgstr ""
 
 msgid ""
 "    Statistics are based on the number of changed lines, or\n"
 "    alternatively the number of matching revisions if the\n"
 "    --changesets option is specified."
 msgstr ""
 
 msgid "    Examples::"
-msgstr ""
+msgstr "    Esempi::"
 
 msgid ""
 "      # display count of changed lines for every committer\n"
 "      hg churn -t '{author|email}'"
 msgstr ""
 
 msgid ""
 "      # display daily activity graph\n"
@@ -786,33 +694,37 @@ msgid "      <alias email> = <actual ema
 msgstr ""
 
 msgid ""
 "    Such a file may be specified with the --aliases option, otherwise\n"
 "    a .hgchurn file will be looked for in the working directory root.\n"
 "    "
 msgstr ""
 
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr "sto saltando un alias malformato: %s\n"
+
 msgid "count rate for the specified revision or range"
 msgstr "misura velocità per le revisioni o il range specificati"
 
 msgid "DATE"
-msgstr ""
+msgstr "DATA"
 
 msgid "count rate for revisions matching date spec"
 msgstr "misura velocità per le revisioni che corrispondono ad una data fornita"
 
 msgid "TEMPLATE"
-msgstr ""
+msgstr "TEMPLATE"
 
 msgid "template to group changesets"
 msgstr ""
 
 msgid "FORMAT"
-msgstr ""
+msgstr "FORMATO"
 
 msgid "strftime-compatible format for grouping by date"
 msgstr ""
 
 msgid "count rate by number of changesets"
 msgstr "misura velocità dal numero di changeset"
 
 msgid "sort by key (default: sort by count)"
@@ -840,21 +752,20 @@ msgid ""
 "patch status (applied, unapplied, missing), and to diff-related\n"
 "commands to highlight additions, removals, diff headers, and trailing\n"
 "whitespace."
 msgstr ""
 
 msgid ""
 "Other effects in addition to color, like bold and underlined text, are\n"
 "also available. Effects are rendered with the ECMA-48 SGR control\n"
-"function (aka ANSI escape codes). This module also provides the\n"
-"render_text function, which can be used to add effects to any text."
-msgstr ""
-
-msgid "Default effects may be overridden from the .hgrc file::"
+"function (aka ANSI escape codes)."
+msgstr ""
+
+msgid "Default effects may be overridden from your configuration file::"
 msgstr ""
 
 msgid ""
 "  [color]\n"
 "  status.modified = blue bold underline red_background\n"
 "  status.added = green bold\n"
 "  status.removed = red bold blue_background\n"
 "  status.deleted = cyan bold underline\n"
@@ -887,16 +798,23 @@ msgid ""
 msgstr ""
 
 msgid ""
 "  resolve.unresolved = red bold\n"
 "  resolve.resolved = green bold"
 msgstr ""
 
 msgid "  bookmarks.current = green"
+msgstr "  bookmarks.current = green"
+
+msgid ""
+"  branches.active = none\n"
+"  branches.closed = black bold\n"
+"  branches.current = green\n"
+"  branches.inactive = none"
 msgstr ""
 
 msgid ""
 "The color extension will try to detect whether to use ANSI codes or\n"
 "Win32 console APIs, unless it is made explicit::"
 msgstr ""
 
 msgid ""
@@ -906,24 +824,27 @@ msgstr ""
 
 msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
 msgstr ""
 
 #, python-format
 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
 msgstr ""
 
-msgid "win32console not found, please install pywin32\n"
-msgstr ""
-
-msgid "when to colorize (always, auto, or never)"
-msgstr "quando colorare (sempre, auto o mai)"
+#, python-format
+msgid "warning: failed to set color mode to %s\n"
+msgstr ""
+
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr "quando colorare (booleano, sempre, auto o mai)"
 
 msgid "TYPE"
-msgstr ""
+msgstr "TIPO"
 
 msgid "import revisions from foreign VCS repositories into Mercurial"
 msgstr "importa revisioni da repository di altri VCS in Mercurial"
 
 msgid "convert a foreign SCM repository to a Mercurial one."
 msgstr ""
 
 msgid "    Accepted source formats [identifiers]:"
@@ -952,17 +873,17 @@ msgstr ""
 msgid ""
 "    If no revision is given, all revisions will be converted.\n"
 "    Otherwise, convert will only import up to the named revision\n"
 "    (given in a format understood by the source)."
 msgstr ""
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
-"    basename of the source with '-hg' appended. If the destination\n"
+"    basename of the source with ``-hg`` appended. If the destination\n"
 "    repository doesn't exist, it will be created."
 msgstr ""
 
 msgid ""
 "    By default, all sources except Mercurial will use --branchsort.\n"
 "    Mercurial uses --sourcesort to preserve original revision numbers\n"
 "    order. Sort modes have the following effects:"
 msgstr ""
@@ -981,251 +902,316 @@ msgid ""
 msgstr ""
 
 msgid ""
 "    --sourcesort  try to preserve source revisions order, only\n"
 "                  supported by Mercurial sources."
 msgstr ""
 
 msgid ""
-"    If <REVMAP> isn't given, it will be put in a default location\n"
-"    (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
-"    that maps each source commit ID to the destination ID for that\n"
-"    revision, like so::"
+"    If ``REVMAP`` isn't given, it will be put in a default location\n"
+"    (``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple\n"
+"    text file that maps each source commit ID to the destination ID\n"
+"    for that revision, like so::"
 msgstr ""
 
 msgid "      <source ID> <destination ID>"
 msgstr ""
 
 msgid ""
 "    If the file doesn't exist, it's automatically created. It's\n"
-"    updated on each commit copied, so convert-repo can be interrupted\n"
+"    updated on each commit copied, so :hg:`convert` can be interrupted\n"
 "    and can be run repeatedly to copy new commits."
 msgstr ""
 
 msgid ""
-"    The [username mapping] file is a simple text file that maps each\n"
-"    source commit author to a destination commit author. It is handy\n"
-"    for source SCMs that use unix logins to identify authors (eg:\n"
-"    CVS). One line per author mapping and the line format is:\n"
-"    srcauthor=whatever string you want"
-msgstr ""
+"    The authormap is a simple text file that maps each source commit\n"
+"    author to a destination commit author. It is handy for source SCMs\n"
+"    that use unix logins to identify authors (eg: CVS). One line per\n"
+"    author mapping and the line format is::"
+msgstr ""
+
+msgid "      source author = destination author"
+msgstr "      autore sorgente = autore destinatario"
+
+msgid "    Empty lines and lines starting with a ``#`` are ignored."
+msgstr "     Linee vuote e linee che iniziano con un ``#`` vengono ignorate."
 
 msgid ""
 "    The filemap is a file that allows filtering and remapping of files\n"
 "    and directories. Each line can contain one of the following\n"
 "    directives::"
 msgstr ""
 
 msgid "      include path/to/file-or-dir"
-msgstr ""
+msgstr "      include percorso/al/file-o-dir"
 
 msgid "      exclude path/to/file-or-dir"
-msgstr ""
+msgstr "      esclude percorso/al/file-o-dir"
 
 msgid "      rename path/to/source path/to/destination"
-msgstr ""
-
-msgid ""
-"    Comment lines start with '#'. A specificed path matches if it\n"
+msgstr "      rinomina percorso/sorgente percorso/destinazione"
+
+msgid ""
+"    Comment lines start with ``#``. A specified path matches if it\n"
 "    equals the full relative name of a file or one of its parent\n"
-"    directories. The 'include' or 'exclude' directive with the longest\n"
-"    matching path applies, so line order does not matter."
-msgstr ""
-
-msgid ""
-"    The 'include' directive causes a file, or all files under a\n"
+"    directories. The ``include`` or ``exclude`` directive with the\n"
+"    longest matching path applies, so line order does not matter."
+msgstr ""
+
+msgid ""
+"    The ``include`` directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
 "    exclusion of all other files and directories not explicitly\n"
-"    included. The 'exclude' directive causes files or directories to\n"
-"    be omitted. The 'rename' directive renames a file or directory if\n"
-"    is converted. To rename from a subdirectory into the root of the\n"
-"    repository, use '.' as the path to rename to."
+"    included. The ``exclude`` directive causes files or directories to\n"
+"    be omitted. The ``rename`` directive renames a file or directory if\n"
+"    it is converted. To rename from a subdirectory into the root of\n"
+"    the repository, use ``.`` as the path to rename to."
 msgstr ""
 
 msgid ""
 "    The splicemap is a file that allows insertion of synthetic\n"
 "    history, letting you specify the parents of a revision. This is\n"
 "    useful if you want to e.g. give a Subversion merge two parents, or\n"
 "    graft two disconnected series of history together. Each entry\n"
 "    contains a key, followed by a space, followed by one or two\n"
-"    comma-separated values. The key is the revision ID in the source\n"
+"    comma-separated values::"
+msgstr ""
+
+msgid "      key parent1, parent2"
+msgstr ""
+
+msgid ""
+"    The key is the revision ID in the source\n"
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
 "    should be used as the new parents for that node. For example, if\n"
 "    you have merged \"release-1.0\" into \"trunk\", then you should\n"
 "    specify the revision on \"trunk\" as the first parent and the one on\n"
 "    the \"release-1.0\" branch as the second."
 msgstr ""
 
 msgid ""
 "    The branchmap is a file that allows you to rename a branch when it is\n"
 "    being brought in from whatever external repository. When used in\n"
 "    conjunction with a splicemap, it allows for a powerful combination\n"
 "    to help fix even the most badly mismanaged repositories and turn them\n"
 "    into nicely structured Mercurial repositories. The branchmap contains\n"
-"    lines of the form \"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."
+"    lines of the form::"
+msgstr ""
+
+msgid "      original_branch_name new_branch_name"
+msgstr ""
+
+msgid ""
+"    where \"original_branch_name\" is the name of the branch in the\n"
+"    source repository, and \"new_branch_name\" is the name of the branch\n"
+"    is the destination repository. No whitespace is allowed in the\n"
+"    branch names. This can be used to (for instance) move code in one\n"
+"    repository from \"default\" to a named branch."
 msgstr ""
 
 msgid ""
 "    Mercurial Source\n"
-"    ----------------"
-msgstr ""
-
-msgid ""
-"    --config convert.hg.ignoreerrors=False    (boolean)\n"
-"        ignore integrity errors when reading. Use it to fix Mercurial\n"
-"        repositories with missing revlogs, by converting from and to\n"
-"        Mercurial.\n"
-"    --config convert.hg.saverev=False         (boolean)\n"
-"        store original revision ID in changeset (forces target IDs to\n"
-"        change)\n"
-"    --config convert.hg.startrev=0            (hg revision identifier)\n"
-"        convert start revision and its descendants"
+"    ''''''''''''''''"
+msgstr ""
+
+msgid ""
+"    The Mercurial source recognizes the following configuration\n"
+"    options, which you can set on the command line with ``--config``:"
+msgstr ""
+
+msgid ""
+"    :convert.hg.ignoreerrors: ignore integrity errors when reading.\n"
+"        Use it to fix Mercurial repositories with missing revlogs, by\n"
+"        converting from and to Mercurial. Default is False."
+msgstr ""
+
+msgid ""
+"    :convert.hg.saverev: store original revision ID in changeset\n"
+"        (forces target IDs to change). It takes and boolean argument\n"
+"        and defaults to False."
+msgstr ""
+
+msgid ""
+"    :convert.hg.startrev: convert start revision and its descendants.\n"
+"        It takes a hg revision identifier and defaults to 0."
 msgstr ""
 
 msgid ""
 "    CVS Source\n"
-"    ----------"
-msgstr ""
+"    ''''''''''"
+msgstr ""
+"    Sorgente CVS\n"
+"    ''''''''''"
 
 msgid ""
 "    CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
 "    to indicate the starting point of what will be converted. Direct\n"
 "    access to the repository files is not needed, unless of course the\n"
-"    repository is :local:. The conversion uses the top level 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"
+"    repository is ``:local:``. The conversion uses the top level\n"
+"    directory in the sandbox to find the CVS repository, and then uses\n"
+"    CVS rlog commands to find files to convert. This means that unless\n"
+"    a filemap is given, all files under the starting directory will be\n"
 "    converted, and that any directory reorganization in the CVS\n"
 "    sandbox is ignored."
 msgstr ""
 
-msgid "    The options shown are the defaults."
-msgstr ""
-
-msgid ""
-"    --config convert.cvsps.cache=True         (boolean)\n"
-"        Set to False to disable remote log caching, for testing and\n"
-"        debugging purposes.\n"
-"    --config convert.cvsps.fuzz=60            (integer)\n"
-"        Specify the maximum time (in seconds) that is allowed between\n"
-"        commits with identical user and log message in a single\n"
-"        changeset. When very large files were checked in as part of a\n"
-"        changeset then the default may not be long enough.\n"
-"    --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-"        Specify a regular expression to which commit log messages are\n"
-"        matched. If a match occurs, then the conversion process will\n"
-"        insert a dummy revision merging the branch on which this log\n"
-"        message occurs to the branch indicated in the regex.\n"
-"    --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-"        Specify a regular expression to which commit log messages are\n"
-"        matched. If a match occurs, then the conversion process will\n"
-"        add the most recent revision on the branch indicated in the\n"
-"        regex as the second parent of the changeset.\n"
-"    --config hook.cvslog\n"
-"        Specify a Python function to be called at the end of gathering\n"
-"        the CVS log. The function is passed a list with the log entries,\n"
-"        and can modify the entries in-place, or add or delete them.\n"
-"    --config hook.cvschangesets\n"
-"        Specify a Python function to be called after the changesets\n"
-"        are calculated from the the CVS log. The function is passed\n"
-"        a list with the changeset entries, and can modify the changesets\n"
-"        in-place, or add or delete them."
+msgid "    The following options can be used with ``--config``:"
+msgstr ""
+
+msgid ""
+"    :convert.cvsps.cache: Set to False to disable remote log caching,\n"
+"        for testing and debugging purposes. Default is True."
+msgstr ""
+
+msgid ""
+"    :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n"
+"        allowed between commits with identical user and log message in\n"
+"        a single changeset. When very large files were checked in as\n"
+"        part of a changeset then the default may not be long enough.\n"
+"        The default is 60."
+msgstr ""
+
+msgid ""
+"    :convert.cvsps.mergeto: Specify a regular expression to which\n"
+"        commit log messages are matched. If a match occurs, then the\n"
+"        conversion process will insert a dummy revision merging the\n"
+"        branch on which this log message occurs to the branch\n"
+"        indicated in the regex. Default is ``{{mergetobranch\n"
+"        ([-\\w]+)}}``"
+msgstr ""
+
+msgid ""
+"    :convert.cvsps.mergefrom: Specify a regular expression to which\n"
+"        commit log messages are matched. If a match occurs, then the\n"
+"        conversion process will add the most recent revision on the\n"
+"        branch indicated in the regex as the second parent of the\n"
+"        changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``"
+msgstr ""
+
+msgid ""
+"    :hook.cvslog: Specify a Python function to be called at the end of\n"
+"        gathering the CVS log. The function is passed a list with the\n"
+"        log entries, and can modify the entries in-place, or add or\n"
+"        delete them."
+msgstr ""
+
+msgid ""
+"    :hook.cvschangesets: Specify a Python function to be called after\n"
+"        the changesets are calculated from the the CVS log. The\n"
+"        function is passed a list with the changeset entries, and can\n"
+"        modify the changesets in-place, or add or delete them."
 msgstr ""
 
 msgid ""
 "    An additional \"debugcvsps\" Mercurial command allows the builtin\n"
 "    changeset merging code to be run without doing a conversion. Its\n"
 "    parameters and output are similar to that of cvsps 2.1. Please see\n"
 "    the command help for more details."
 msgstr ""
 
 msgid ""
 "    Subversion Source\n"
-"    -----------------"
-msgstr ""
+"    '''''''''''''''''"
+msgstr ""
+"    Subversion Sorgente\n"
+"    '''''''''''''''''"
 
 msgid ""
 "    Subversion source detects classical trunk/branches/tags layouts.\n"
-"    By default, the supplied \"svn://repo/path/\" source URL is\n"
-"    converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
-"    replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
-"    its subdirectories are listed as possible branches. If\n"
-"    \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
-"    converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
-"    can be overridden with following options. Set them to paths\n"
+"    By default, the supplied ``svn://repo/path/`` source URL is\n"
+"    converted as a single branch. If ``svn://repo/path/trunk`` exists\n"
+"    it replaces the default branch. If ``svn://repo/path/branches``\n"
+"    exists, its subdirectories are listed as possible branches. If\n"
+"    ``svn://repo/path/tags`` exists, it is looked for tags referencing\n"
+"    converted branches. Default ``trunk``, ``branches`` and ``tags``\n"
+"    values can be overridden with following options. Set them to paths\n"
 "    relative to the source URL, or leave them blank to disable auto\n"
 "    detection."
 msgstr ""
 
-msgid ""
-"    --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"
+msgid "    The following options can be set with ``--config``:"
+msgstr ""
+
+msgid ""
+"    :convert.svn.branches: specify the directory containing branches.\n"
+"        The default is ``branches``."
+msgstr ""
+
+msgid ""
+"    :convert.svn.tags: specify the directory containing tags. The\n"
+"        default is ``tags``."
+msgstr ""
+
+msgid ""
+"    :convert.svn.trunk: specify the name of the trunk branch. The\n"
+"        default is ``trunk``."
 msgstr ""
 
 msgid ""
 "    Source history can be retrieved starting at a specific revision,\n"
 "    instead of being integrally converted. Only single branch\n"
 "    conversions are supported."
 msgstr ""
 
 msgid ""
-"    --config convert.svn.startrev=0           (svn revision number)\n"
-"        specify start Subversion revision."
+"    :convert.svn.startrev: specify start Subversion revision number.\n"
+"        The default is 0."
 msgstr ""
 
 msgid ""
 "    Perforce Source\n"
-"    ---------------"
+"    '''''''''''''''"
 msgstr ""
 
 msgid ""
 "    The Perforce (P4) importer can be given a p4 depot path or a\n"
 "    client specification as source. It will convert all files in the\n"
 "    source to a flat Mercurial repository, ignoring labels, branches\n"
 "    and integrations. Note that when a depot path is given you then\n"
 "    usually should specify a target directory, because otherwise the\n"
-"    target may be named ...-hg."
+"    target may be named ``...-hg``."
 msgstr ""
 
 msgid ""
 "    It is possible to limit the amount of source history to be\n"
-"    converted by specifying an initial Perforce revision."
-msgstr ""
-
-msgid ""
-"    --config convert.p4.startrev=0            (perforce changelist number)\n"
-"        specify initial Perforce revision."
+"    converted by specifying an initial Perforce revision:"
+msgstr ""
+
+msgid ""
+"    :convert.p4.startrev: specify initial Perforce revision (a\n"
+"        Perforce changelist number)."
 msgstr ""
 
 msgid ""
 "    Mercurial Destination\n"
-"    ---------------------"
-msgstr ""
-
-msgid ""
-"    --config convert.hg.clonebranches=False   (boolean)\n"
-"        dispatch source branches in separate clones.\n"
-"    --config convert.hg.tagsbranch=default    (branch name)\n"
-"        tag revisions branch name\n"
-"    --config convert.hg.usebranchnames=True   (boolean)\n"
-"        preserve branch names"
-msgstr ""
-
-msgid "    "
+"    '''''''''''''''''''''"
+msgstr ""
+"    Mercurial di Destinazione\n"
+"    '''''''''''''''''''''"
+
+msgid "    The following options are supported:"
+msgstr "    Sono supportate le opzioni seguenti:"
+
+msgid ""
+"    :convert.hg.clonebranches: dispatch source branches in separate\n"
+"        clones. The default is False."
+msgstr ""
+
+msgid ""
+"    :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n"
+"        ``default``."
+msgstr ""
+
+msgid ""
+"    :convert.hg.usebranchnames: preserve branch names. The default is\n"
+"        True.\n"
+"    "
 msgstr ""
 
 msgid "create changeset information from CVS"
 msgstr ""
 
 msgid ""
 "    This command is intended as a debugging tool for the CVS to\n"
 "    Mercurial converter, and can be used as a direct replacement for\n"
@@ -1234,36 +1220,39 @@ msgstr ""
 
 msgid ""
 "    Hg debugcvsps reads the CVS rlog for current directory (or any\n"
 "    named directory) in the CVS repository, and converts the log to a\n"
 "    series of changesets based on matching commit log entries and\n"
 "    dates."
 msgstr ""
 
-msgid "username mapping filename"
-msgstr "nome del file con il mapping degli username"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr ""
+
+msgid "source repository type"
+msgstr "tipo del repository sorgente"
 
 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 "remap usernames using this file"
+msgstr "rimappa i nomi utente usando questo file"
+
+msgid "remap file names using contents of file"
+msgstr "rimappa i nomi dei file usando il contenuto del file"
 
 msgid "splice synthesized history into place"
 msgstr ""
 
 msgid "change branch names while converting"
-msgstr ""
+msgstr "modifica i nomi dei branch durante la conversione"
 
 msgid "try to sort changesets by branches"
 msgstr "prova ad ordinare i changeset per branch"
 
 msgid "try to sort changesets by date"
 msgstr "prova ad ordinare i changeset per data"
 
 msgid "preserve source changesets order"
@@ -1370,17 +1359,17 @@ msgstr "%s: tipo di repository sconosciu
 
 msgid "getting files"
 msgstr "prelievo dei file"
 
 msgid "revisions"
 msgstr "revisioni"
 
 msgid "scanning"
-msgstr ""
+msgstr "scansione in corso"
 
 #, python-format
 msgid "unknown sort mode: %s"
 msgstr "modalità di ordinamento sconosciuta: %s"
 
 #, python-format
 msgid "cycle detected between %s and %s"
 msgstr "ciclo rilevato tra %s e %s"
@@ -1454,31 +1443,31 @@ msgid ""
 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
 msgstr ""
 
 #, python-format
 msgid "%d bytes missing from remote file"
 msgstr "%d byte mancanti dal file remoto"
 
 msgid "malformed response from CVS"
-msgstr ""
+msgstr "risposta malformata da CVS"
 
 #, python-format
 msgid "cvs server: %s\n"
 msgstr "server cvs: %s\n"
 
 #, python-format
 msgid "unknown CVS response: %s"
 msgstr "risposta CVS sconosciuta: %s"
 
 msgid "collecting CVS rlog\n"
 msgstr "sto collezionando gli rlog CVS\n"
 
 msgid "not a CVS sandbox"
-msgstr ""
+msgstr "non è una sandbox CVS"
 
 #, 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"
@@ -1536,39 +1525,54 @@ msgstr "%s non sembra essere un reposito
 
 #, 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 "%s repository format is unsupported, please upgrade"
+msgstr ""
+
+msgid "failed to detect repository format!"
+msgstr "impossibile rilevare il formato del repository!"
+
 msgid "internal calling inconsistency"
 msgstr "inconsistenza nella chiamata interna"
 
 msgid "errors in filemap"
 msgstr "errori nel filemap"
 
 #, python-format
+msgid "%s:%d: path to %s is missing\n"
+msgstr ""
+
+#, 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: superfluous / in %s %r\n"
+msgstr ""
+
+#, 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 Git repository"
 msgstr "%s non sembra essere un repository Git"
 
 msgid "cannot retrieve git heads"
-msgstr ""
+msgstr "impossibile reperire le head git"
 
 #, python-format
 msgid "cannot read %r object at %s"
 msgstr ""
 
 #, python-format
 msgid "cannot read changes in %s"
 msgstr "impossibile leggere le modifiche in %s"
@@ -1654,18 +1658,18 @@ msgid ""
 "svn: cannot probe remote repository, assume it could be a subversion "
 "repository. Use --source-type if you know better.\n"
 msgstr ""
 
 #, python-format
 msgid "%s does not look like a Subversion repository"
 msgstr "%s non sembra essere un repository Subversion"
 
-msgid "Subversion python bindings could not be loaded"
-msgstr "Non è stato possibile caricare i binding python per Subversion"
+msgid "Could not load Subversion python bindings"
+msgstr ""
 
 #, 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 ""
@@ -1735,53 +1739,55 @@ msgid "initializing svn working copy %r\
 msgstr "inizializzo working copy svn %r\n"
 
 msgid "unexpected svn output:\n"
 msgstr "output svn inatteso:\n"
 
 msgid "unable to cope with svn output"
 msgstr "non sono in grado di gestire l'output di svn"
 
-msgid "XXX TAGS NOT IMPLEMENTED YET\n"
-msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n"
+msgid "writing Subversion tags is not yet implemented\n"
+msgstr ""
 
 msgid "automatically manage newlines in repository files"
 msgstr ""
 "gestisci automaticamente i fine linea nei file contenuti nel repository"
 
 msgid ""
 "This extension allows you to manage the type of line endings (CRLF or\n"
 "LF) that are used in the repository and in the local working\n"
 "directory. That way you can get CRLF line endings on Windows and LF on\n"
 "Unix/Mac, thereby letting everybody use their OS native line endings."
 msgstr ""
 
 msgid ""
 "The extension reads its configuration from a versioned ``.hgeol``\n"
-"configuration file every time you run an ``hg`` command. The\n"
+"configuration file found in the root of the working copy. The\n"
 "``.hgeol`` file use the same syntax as all other Mercurial\n"
 "configuration files. It uses two sections, ``[patterns]`` and\n"
 "``[repository]``."
 msgstr ""
 
 msgid ""
-"The ``[patterns]`` section specifies the line endings used in the\n"
-"working directory. The format is specified by a file pattern. The\n"
-"first match is used, so put more specific patterns first. The\n"
-"available line endings are ``LF``, ``CRLF``, and ``BIN``."
+"The ``[patterns]`` section specifies how line endings should be\n"
+"converted between the working copy and the repository. The format is\n"
+"specified by a file pattern. The first match is used, so put more\n"
+"specific patterns first. The available line endings are ``LF``,\n"
+"``CRLF``, and ``BIN``."
 msgstr ""
 
 msgid ""
 "Files with the declared format of ``CRLF`` or ``LF`` are always\n"
-"checked out in that format and files declared to be binary (``BIN``)\n"
-"are left unchanged. Additionally, ``native`` is an alias for the\n"
-"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n"
-"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n"
-"endings) is Mercurial's default behaviour; it is only needed if you\n"
-"need to override a later, more general pattern."
+"checked out and stored in the repository in that format and files\n"
+"declared to be binary (``BIN``) are left unchanged. Additionally,\n"
+"``native`` is an alias for checking out in the platform's default line\n"
+"ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n"
+"Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n"
+"default behaviour; it is only needed if you need to override a later,\n"
+"more general pattern."
 msgstr ""
 
 msgid ""
 "The optional ``[repository]`` section specifies the line endings to\n"
 "use for files stored in the repository. It has a single setting,\n"
 "``native``, which determines the storage line endings for files\n"
 "declared as ``native`` in the ``[patterns]`` section. It can be set to\n"
 "``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n"
@@ -1804,59 +1810,85 @@ msgid ""
 msgstr ""
 
 msgid ""
 "  [repository]\n"
 "  native = LF"
 msgstr ""
 
 msgid ""
+".. note::\n"
+"   The rules will first apply when files are touched in the working\n"
+"   copy, e.g. by updating to null and back to tip to touch all files."
+msgstr ""
+
+msgid ""
 "The extension uses an optional ``[eol]`` section in your hgrc file\n"
 "(not the ``.hgeol`` file) for settings that control the overall\n"
 "behavior. There are two settings:"
 msgstr ""
 
 msgid ""
 "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
-"  ``CRLF`` override the default interpretation of ``native`` for\n"
+"  ``CRLF`` to override the default interpretation of ``native`` for\n"
 "  checkout. This can be used with :hg:`archive` on Unix, say, to\n"
 "  generate an archive where files have line endings for Windows."
 msgstr ""
 
 msgid ""
 "- ``eol.only-consistent`` (default True) can be set to False to make\n"
 "  the extension convert files with inconsistent EOLs. Inconsistent\n"
 "  means that there is both ``CRLF`` and ``LF`` present in the file.\n"
 "  Such files are normally not touched under the assumption that they\n"
 "  have mixed EOLs on purpose."
 msgstr ""
 
 msgid ""
+"The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n"
+"like the deprecated win32text extension does. This means that you can\n"
+"disable win32text and enable eol and your filters will still work. You\n"
+"only need to these filters until you have prepared a ``.hgeol`` file."
+msgstr ""
+
+msgid ""
+"The ``win32text.forbid*`` hooks provided by the win32text extension\n"
+"have been unified into a single hook named ``eol.hook``. The hook will\n"
+"lookup the expected line endings from the ``.hgeol`` file, which means\n"
+"you must migrate to a ``.hgeol`` file first before using the hook.\n"
+"Remember to enable the eol extension in the repository where you\n"
+"install the hook."
+msgstr ""
+
+msgid ""
 "See :hg:`help patterns` for more information about the glob patterns\n"
 "used.\n"
 msgstr ""
 
-#, python-format
+#, fuzzy, python-format
 msgid "%s should not have CRLF line endings"
-msgstr ""
-
-#, python-format
+msgstr "  %s in %s non dovrebbe avere %s fine riga"
+
+#, fuzzy, python-format
 msgid "%s should not have LF line endings"
-msgstr ""
-
-msgid "the eol extension is incompatible with the win32text extension"
+msgstr "  %s in %s non dovrebbe avere %s fine riga"
+
+#, python-format
+msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
+msgstr ""
+
+msgid "the eol extension is incompatible with the win32text extension\n"
 msgstr ""
 
 #, python-format
 msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr ""
+msgstr "ignoro stile di EOL '%s' da %s\n"
 
 #, python-format
 msgid "inconsistent newline style in %s\n"
-msgstr ""
+msgstr "stile di nuova riga inconsistente in %s\n"
 
 msgid "command to allow external programs to compare revisions"
 msgstr ""
 
 msgid ""
 "The extdiff Mercurial extension allows you to use external programs\n"
 "to compare revisions, or revision with working directory. The external\n"
 "diff programs are called with a configurable set of options and two\n"
@@ -1877,16 +1909,18 @@ msgid ""
 "  #cmd.cdiff = gdiff\n"
 "  #opts.cdiff = -Nprc5"
 msgstr ""
 
 msgid ""
 "  # add new command called vdiff, runs kdiff3\n"
 "  vdiff = kdiff3"
 msgstr ""
+"  # aggiunge un nuovo chiamato vdiff, esegue kdiff3\n"
+"  vdiff = kdiff3"
 
 msgid ""
 "  # add new command called meld, runs meld (no need to name twice)\n"
 "  meld ="
 msgstr ""
 
 msgid ""
 "  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
@@ -1905,26 +1939,34 @@ msgid ""
 "  $parent2, $plabel2 - filename, descriptive label of second parent\n"
 "  $parent is an alias for $parent1."
 msgstr ""
 
 msgid ""
 "The extdiff extension will look in your [diff-tools] and [merge-tools]\n"
 "sections for diff tool arguments, when none are specified in [extdiff]."
 msgstr ""
+"L'estensione extdiff guarderà nelle tue sezioni [diff-tools] e [merge-"
+"tools]\n"
+"per gli argomenti dello strumento di diff, quando non si specifica nulla\n"
+"in [extdiff]."
 
 msgid ""
 "  [extdiff]\n"
 "  kdiff3 ="
 msgstr ""
+"  [extdiff]\n"
+"  kdiff3 ="
 
 msgid ""
 "  [diff-tools]\n"
 "  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
 msgstr ""
+"  [diff-tools]\n"
+"  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
 
 msgid ""
 "You can use -I/-X and list of file or directory names like normal\n"
 ":hg:`diff` command. The extdiff extension makes snapshots of only\n"
 "needed files, so running the external diff program will actually be\n"
 "pretty fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
 
@@ -1939,16 +1981,18 @@ msgstr ""
 msgid "cannot specify --rev and --change at the same time"
 msgstr "impossibile specificare sia --rev sia --change"
 
 msgid "cleaning up temp directory\n"
 msgstr "sto ripulendo la directory temporanea\n"
 
 msgid "use external program to diff repository (or selected files)"
 msgstr ""
+"usa un programma esterno per fare il diff di repository (o di file "
+"selezionati)"
 
 msgid ""
 "    Show differences between revisions for the specified files, using\n"
 "    an external program. The default program used is diff, with\n"
 "    default options \"-Npru\"."
 msgstr ""
 
 msgid ""
@@ -1962,27 +2006,30 @@ msgid ""
 "    When two revision arguments are given, then changes are shown\n"
 "    between those revisions. If only one revision is specified then\n"
 "    that revision is compared to the working directory, and, when no\n"
 "    revisions are specified, the working directory files are compared\n"
 "    to its parent."
 msgstr ""
 
 msgid "CMD"
-msgstr ""
+msgstr "CMD"
 
 msgid "comparison program to run"
 msgstr "programma per i confronti da eseguire"
 
 msgid "OPT"
 msgstr "OPZIONE"
 
 msgid "pass option to comparison program"
 msgstr "passa l'opzione al programma per i confronti"
 
+msgid "revision"
+msgstr "revisione"
+
 msgid "change made by revision"
 msgstr "modifica effettuata dalla revisione"
 
 msgid "hg extdiff [OPT]... [FILE]..."
 msgstr "hg extdiff [OPZIONE]... [FILE]..."
 
 #, python-format
 msgid "use %(path)s to diff repository (or selected files)"
@@ -2035,21 +2082,25 @@ msgid ""
 "    order, use --switch-parent."
 msgstr ""
 "    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."
 
-msgid ""
-"    See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr ""
+"   Vedere :hg:`help dates` per l'elenco dei formati validi per -d/--date."
+
+msgid ""
+"    Returns 0 on success.\n"
 "    "
 msgstr ""
-"    Vedere :hg:`help dates` per un elenco dei formati validi per -d/--date.\n"
+"    Restituisce 0 in caso di successo.\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)"
 
@@ -2153,27 +2204,34 @@ msgstr "aggiunge una firma per la revisi
 msgid ""
 "    If no revision is given, the parent of the working directory is used,\n"
 "    or tip if no revision is checked out."
 msgstr ""
 "    Se nessuna revisione è stata specificata, viene usato il genitore\n"
 "    della directory di lavoro, oppure tip se non si è eseguito il\n"
 "    checkout di nessuna revisione."
 
+msgid ""
+"    See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+"    "
+msgstr ""
+"    Vedere :hg:`help dates` per un elenco dei formati validi per -d/--date.\n"
+"    "
+
 msgid "uncommitted merge - please provide a specific revision"
 msgstr ""
 "merge di cui non si è effettuato il commit - si prega di fornire una "
 "revisione specifica"
 
 #, python-format
 msgid "Signing %d:%s\n"
 msgstr "Firma in corso di %d:%s\n"
 
-msgid "Error while signing"
-msgstr "Errore durante la firma"
+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)"
 
@@ -2185,38 +2243,38 @@ msgstr "rende la firma locale"
 
 msgid "sign even if the sigfile is modified"
 msgstr "firma anche se il sigfile è stato modificato"
 
 msgid "do not commit the sigfile after signing"
 msgstr "non effettuare il commit del sigfile dopo la firma"
 
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgid "the key id to sign with"
 msgstr "l'id della chiave con cui firmare"
 
 msgid "TEXT"
-msgstr ""
+msgstr "TESTO"
 
 msgid "commit message"
 msgstr "messaggio di commit"
 
 msgid "hg sign [OPTION]... [REVISION]..."
 msgstr "hg sign [OPZIONE]... [REVISIONE]..."
 
 msgid "hg sigcheck REVISION"
 msgstr "hg sigcheck REVISIONE"
 
 msgid "hg sigs"
 msgstr "hg sigs"
 
 msgid "command to view revision graphs from a shell"
-msgstr ""
+msgstr "comando per visualizzare grafi di revisioni da una shell"
 
 msgid ""
 "This extension adds a --graph option to the incoming, outgoing and log\n"
 "commands. When this options is given, an ASCII representation of the\n"
 "revision graph is also shown.\n"
 msgstr ""
 
 #, python-format
@@ -2232,30 +2290,33 @@ msgid ""
 msgstr ""
 
 msgid ""
 "    Nodes printed as an @ character are parents of the working\n"
 "    directory.\n"
 "    "
 msgstr ""
 
+msgid "--graph option allows at most one file"
+msgstr "l'opzione --graph consente al massimo un file"
+
 msgid "show the revision DAG"
-msgstr ""
+msgstr "mostra il DAG delle revisioni"
 
 msgid "NUM"
-msgstr ""
+msgstr "NUM"
 
 msgid "limit number of changes displayed"
-msgstr ""
+msgstr "limita il numero di modifiche mostrate"
 
 msgid "show patch"
 msgstr "mostra patch"
 
 msgid "show the specified revision or range"
-msgstr ""
+msgstr "mostra la revisione specificata o un range"
 
 msgid "hg glog [OPTION]... [FILE]"
 msgstr "hg glog [OPZIONE]... [FILE]"
 
 msgid "hooks for integrating with the CIA.vc notification service"
 msgstr ""
 
 msgid ""
@@ -2296,21 +2357,21 @@ msgstr ""
 msgid ""
 "  [web]\n"
 "  # If you want hyperlinks (optional)\n"
 "  baseurl = http://server/path/to/repo\n"
 msgstr ""
 
 #, python-format
 msgid "%s returned an error: %s"
-msgstr ""
+msgstr "%s ha restituito un errore: %s"
 
 #, python-format
 msgid "hgcia: sending update to %s\n"
-msgstr ""
+msgstr "hgcia: sto inviando l'aggiornamento a %s\n"
 
 msgid "email.from must be defined when sending by email"
 msgstr "email.from deve essere definito quando si mandano mail"
 
 msgid "browse the repository in a graphical way"
 msgstr ""
 
 msgid ""
@@ -2325,33 +2386,37 @@ msgid ""
 "which provides hooks for hgk to get information. hgk can be found in\n"
 "the contrib directory, and the extension is shipped in the hgext\n"
 "repository, and needs to be enabled."
 msgstr ""
 
 msgid ""
 "The :hg:`view` command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file::"
+"the path to hgk in your configuration file::"
 msgstr ""
 
 msgid ""
 "  [hgk]\n"
 "  path=/location/of/hgk"
 msgstr ""
+"  [hgk]\n"
+"  path=/posizione/di/hgk"
 
 msgid ""
 "hgk can make use of the extdiff extension to visualize revisions.\n"
 "Assuming you had already configured extdiff vdiff command, just add::"
 msgstr ""
 
 msgid ""
 "  [hgk]\n"
 "  vdiff=vdiff"
 msgstr ""
+"  [hgk]\n"
+"  vdiff=vdiff"
 
 msgid ""
 "Revisions context menu will now display additional entries to fire\n"
 "vdiff on hovered and selected revisions.\n"
 msgstr ""
 
 msgid "diff trees from two commits"
 msgstr "mostra le differenze tra alberi di due commit"
@@ -2446,78 +2511,76 @@ msgid "There is a single configuration o
 msgstr ""
 
 msgid ""
 "  [web]\n"
 "  pygments_style = <style>"
 msgstr ""
 
 msgid "The default is 'colorful'.\n"
-msgstr ""
+msgstr "Il default è 'colorful'.\n"
 
 msgid "accelerate status report using Linux's inotify service"
 msgstr ""
 
 msgid "start an inotify server for this repository"
 msgstr "avvia un server inotify per questo repository"
 
 msgid "debugging information for inotify extension"
 msgstr ""
 
 msgid ""
 "    Prints the list of directories being watched by the inotify server.\n"
 "    "
 msgstr ""
 
 msgid "directories being watched:\n"
-msgstr ""
+msgstr "directory sotto osservazione:\n"
 
 msgid "run server in background"
 msgstr "avvia il server in background"
 
 msgid "used internally by daemon mode"
 msgstr "usato internamente dalla modalità demone"
 
 msgid "minutes to sit idle before exiting"
 msgstr "minuti per cui stare in attesa prima di uscire"
 
 msgid "name of file to write process ID to"
 msgstr "nome del file in cui scrivere l'ID del processo"
 
-#, fuzzy
 msgid "hg inserve [OPTION]..."
-msgstr "hg inserve [OPT]..."
-
-#, fuzzy
+msgstr "hg inserve [OPZIONI]..."
+
 msgid "inotify-client: found dead inotify server socket; removing it\n"
-msgstr "(trovato socket morto del server inotify; lo rimuovo)\n"
-
-#, fuzzy, python-format
+msgstr "inotify-client: trovato socket morto del server inotify; lo rimuovo\n"
+
+#, python-format
 msgid "inotify-client: could not start inotify server: %s\n"
-msgstr "impossibile avviare il server inotify: %s\n"
-
-#, fuzzy, python-format
+msgstr "inotify-client: mpossibile avviare il server inotify: %s\n"
+
+#, python-format
 msgid "inotify-client: could not talk to new inotify server: %s\n"
-msgstr "impossibile comunicare con il nuovo server inotify: %s\n"
-
-#, fuzzy, python-format
+msgstr ""
+"inotify-client: impossibile comunicare con il nuovo server inotify: %s\n"
+
+#, python-format
 msgid "inotify-client: failed to contact inotify server: %s\n"
-msgstr "non sono riuscito a contattare il server inotify: %s\n"
-
-#, fuzzy
+msgstr "inotify-client: non sono riuscito a contattare il server inotify: %s\n"
+
 msgid "inotify-client: received empty answer from inotify server"
-msgstr "Risposta inaspettata dal server remoto:"
+msgstr "inotify-client: ricevuta risposta vuota dal server inotify"
 
 #, python-format
 msgid "(inotify: received response from incompatible server version %d)\n"
-msgstr ""
+msgstr "(inotify: ricevuta risposta dalla versione incompatibile %d)\n"
 
 #, python-format
 msgid "(inotify: received '%s' response when expecting '%s')\n"
-msgstr ""
+msgstr "(inotify: ricevuta risposta '%s' mentre era attesa '%s')\n"
 
 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 ""
 
@@ -2585,17 +2648,17 @@ msgstr ""
 msgid "%s reading %d events\n"
 msgstr ""
 
 #, python-format
 msgid "%s hooking back up with %d bytes readable\n"
 msgstr ""
 
 msgid "finished setup\n"
-msgstr ""
+msgstr "setup terminato\n"
 
 #, python-format
 msgid "status: %r %s -> %s\n"
 msgstr "status: %r %s -> %s\n"
 
 msgid "rescanning due to .hgignore change\n"
 msgstr ""
 
@@ -2610,19 +2673,19 @@ msgstr ""
 #, python-format
 msgid "answering query for %r\n"
 msgstr ""
 
 #, python-format
 msgid "received query from incompatible client version %d\n"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "unrecognized query type: %s\n"
-msgstr "risposta non riconosciuta\n"
+msgstr "tipo di interrogazione non riconosciuto: %s\n"
 
 msgid "expand expressions into changelog and summaries"
 msgstr ""
 
 msgid ""
 "This extension allows the use of a special syntax in summaries, which\n"
 "will be automatically expanded into links or any other arbitrary\n"
 "expression, much like InterWiki does."
@@ -2635,16 +2698,21 @@ msgstr ""
 
 msgid ""
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
 "  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
 "i\n"
 "  boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
 msgstr ""
+"  [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"
 
 #, python-format
 msgid "interhg: invalid pattern for %s: %s\n"
 msgstr ""
 
 #, python-format
 msgid "interhg: invalid regexp for %s: %s\n"
 msgstr ""
@@ -2659,39 +2727,45 @@ msgstr ""
 
 msgid ""
 "Keywords are only expanded in local repositories and not stored in the\n"
 "change history. The mechanism can be regarded as a convenience for the\n"
 "current user or for archive distribution."
 msgstr ""
 
 msgid ""
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+
+msgid ""
 "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
 "sections of hgrc files."
 msgstr ""
 
 msgid "Example::"
-msgstr ""
+msgstr "Esempio::"
 
 msgid ""
 "    [keyword]\n"
 "    # expand keywords in every python file except those matching \"x*\"\n"
 "    **.py =\n"
 "    x*    = ignore"
 msgstr ""
 
 msgid ""
 "    [keywordset]\n"
 "    # prefer svn- over cvs-like default keywordmaps\n"
 "    svn = True"
 msgstr ""
 
 msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
+".. note::\n"
+"   The more specific you are in your filename patterns the less you\n"
+"   lose speed in huge repositories."
 msgstr ""
 
 msgid ""
 "For [keywordmaps] template mapping and expansion demonstration and\n"
 "control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n"
 "available templates and filters."
 msgstr ""
 
@@ -2702,39 +2776,38 @@ msgid ""
 "    utcdate      \"2006/09/18 15:13:13\"\n"
 "    svnutcdate   \"2006-09-18 15:13:13Z\"\n"
 "    svnisodate   \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
 msgstr ""
 
 msgid ""
 "The default template mappings (view with :hg:`kwdemo -d`) can be\n"
 "replaced with customized keywords and templates. Again, run\n"
-":hg:`kwdemo` to control the results of your config changes."
-msgstr ""
-
-msgid ""
-"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n"
-"the risk of inadvertently storing expanded keywords in the change\n"
-"history."
+":hg:`kwdemo` to control the results of your configuration changes."
+msgstr ""
+
+msgid ""
+"Before changing/disabling active keywords, you must run :hg:`kwshrink`\n"
+"to avoid storing expanded keywords in the change history."
 msgstr ""
 
 msgid ""
 "To force expansion after enabling it, or a configuration change, run\n"
 ":hg:`kwexpand`."
 msgstr ""
 
 msgid ""
 "Expansions spanning more than one line and incremental expansions,\n"
 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
 "{desc}\" expands to the first line of the changeset description.\n"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "overwriting %s expanding keywords\n"
-msgstr "sovrascrivi %s parziale %s\n"
+msgstr "sovrascrittura di %s durante l'espansione delle keyword\n"
 
 #, python-format
 msgid "overwriting %s shrinking keywords\n"
 msgstr ""
 
 msgid "[keyword] patterns cannot match"
 msgstr ""
 
@@ -2752,61 +2825,67 @@ msgstr ""
 msgid ""
 "    Extend the current configuration by specifying maps as arguments\n"
 "    and using -f/--rcfile to source an external hgrc file."
 msgstr ""
 
 msgid "    Use -d/--default to disable current configuration."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    See :hg:`help templates` for information on templates and filters.\n"
 "    "
 msgstr ""
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
+"    Vedere :hg:`help templates` per informazioni su template e filtri.\n"
 "    "
 
-#, fuzzy, python-format
+#, python-format
 msgid "creating temporary repository at %s\n"
-msgstr "lock del repository remoto fallito"
+msgstr "sto creando un repository temporaneo in %s\n"
 
 msgid ""
 "\n"
 "\tconfiguration using custom keyword template maps\n"
 msgstr ""
 
 msgid "\textending current template maps\n"
 msgstr ""
 
-msgid "\toverriding default template maps\n"
+msgid "\toverriding default svn keywordset\n"
+msgstr "\tsto sovrascrivendo il set di keyword predefinito di svn\n"
+
+msgid "\toverriding default cvs keywordset\n"
+msgstr "\tsto sovrascrivendo il set di keyword predefinito di cvs\n"
+
+msgid ""
+"\n"
+"\tconfiguration using default svn keywordset\n"
 msgstr ""
 
 msgid ""
 "\n"
-"\tconfiguration using default keyword template maps\n"
-msgstr ""
-
-#, fuzzy
+"\tconfiguration using default cvs keywordset\n"
+msgstr ""
+
 msgid "\tdisabling current template maps\n"
-msgstr "mostra usando un file mappa template"
+msgstr ""
 
 msgid ""
 "\n"
 "\tconfiguration using current keyword template maps\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "\n"
 "keywords written to %s:\n"
 msgstr ""
 
 msgid "hg keyword configuration and expansion example"
-msgstr ""
+msgstr "configurazione ed espansione d'esempio del keyword hg"
 
 msgid ""
 "\n"
 "\tkeywords expanded\n"
 msgstr ""
 
 msgid "expand keywords in the working directory"
 msgstr ""
@@ -2815,17 +2894,17 @@ msgid "    Run after (re)enabling keywor
 msgstr ""
 
 msgid ""
 "    kwexpand refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid "show files configured for keyword expansion"
-msgstr ""
+msgstr "mostra i file configurati per l'espansione di keyword"
 
 msgid ""
 "    List which files in the working directory are matched by the\n"
 "    [keyword] configuration patterns."
 msgstr ""
 
 msgid ""
 "    Useful to prevent inadvertent keyword expansion and to speed up\n"
@@ -2849,45 +2928,42 @@ msgid ""
 "      I = ignored\n"
 "      i = ignored (not tracked)\n"
 "    "
 msgstr ""
 
 msgid "revert expanded keywords in the working directory"
 msgstr ""
 
-msgid ""
-"    Run before changing/disabling active keywords or if you experience\n"
-"    problems with :hg:`import` or :hg:`merge`."
+msgid "    Must be run before changing/disabling active keywords."
 msgstr ""
 
 msgid ""
 "    kwshrink refuses to run if given files contain local changes.\n"
 "    "
 msgstr ""
 
 msgid "show default keyword template maps"
 msgstr ""
 
 msgid "read maps from rcfile"
-msgstr ""
+msgstr "legge le mappe dall'rcfile"
 
 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
 msgstr ""
 
 msgid "hg kwexpand [OPTION]... [FILE]..."
 msgstr "hg kwexpand [OPZIONE]... [FILE]..."
 
 msgid "show keyword status flags of all files"
 msgstr ""
 
 msgid "show files excluded from expansion"
 msgstr ""
 
-#, fuzzy
 msgid "only show unknown (not tracked) files"
 msgstr "mostra solo i file sconosciuti (non tracciati)"
 
 msgid "hg kwfiles [OPTION]... [FILE]..."
 msgstr "hg kwfiles [OPZIONE]... [FILE]..."
 
 msgid "hg kwshrink [OPTION]... [FILE]..."
 msgstr "hg kwshrink [OPZIONE]... [FILE]..."
@@ -2968,16 +3044,20 @@ msgstr ""
 msgid ""
 "You will by default be managing a patch queue named \"patches\". You can\n"
 "create other, independent patch queues with the :hg:`qqueue` command.\n"
 msgstr ""
 "Di default, verrà gestita una coda di patch chiamata \"patches\".\n"
 "Se ne possono creare altre indipendenti, col comando :hg:`qqueue`.\n"
 
 #, python-format
+msgid "malformated mq status line: %s\n"
+msgstr ""
+
+#, python-format
 msgid "mq.git option can be auto/keep/yes/no got %s"
 msgstr "l'opzione mg.git può valere auto/keep/yes/no, impostata a %s"
 
 #, 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"
@@ -3060,16 +3140,19 @@ msgstr "sto applicando %s\n"
 #, python-format
 msgid "unable to read %s\n"
 msgstr "impossibile leggere %s\n"
 
 #, python-format
 msgid "patch %s is empty\n"
 msgstr "la patch %s è vuota\n"
 
+msgid "repository commit failed"
+msgstr "commit del repository fallito"
+
 msgid "patch failed, rejects left in working dir\n"
 msgstr ""
 "patch fallita, frammenti rifiutati lasciati nella directory di lavoro\n"
 
 msgid "fuzz found when applying patch, stopping\n"
 msgstr "trovato fuzz nell'applicare la patch, arresto\n"
 
 #, python-format
@@ -3096,34 +3179,46 @@ msgid "patch %s not in series file"
 msgstr "la patch %s non è nel file series"
 
 msgid "no patches applied"
 msgstr "nessuna patch applicata"
 
 msgid "working directory revision is not qtip"
 msgstr "la revisione della directory di lavoro non è qtip"
 
+#, python-format
+msgid "uncommitted changes in subrepository %s"
+msgstr "invertito commit delle modifiche nel subrepository %s"
+
 msgid "local changes found, refresh first"
 msgstr "trovate modifiche locali, effettuare prima un refresh"
 
 msgid "local changes found"
 msgstr "trovate modifiche locali"
 
 #, python-format
 msgid "\"%s\" cannot be used as the name of a patch"
 msgstr "\"%s\" non può essere usato come nome di una patch"
 
 #, python-format
+msgid "\"%s\" already exists as a directory"
+msgstr "\"%s\" esiste già come directory"
+
+#, python-format
 msgid "patch \"%s\" already exists"
 msgstr "la patch \"%s\" esiste già"
 
 msgid "cannot manage merge changesets"
 msgstr "impossibile gestire un changeset di merge"
 
 #, python-format
+msgid "cannot write patch \"%s\": %s"
+msgstr "impossibile scrivere la patch \"%s\": %s"
+
+#, python-format
 msgid "error unlinking %s\n"
 msgstr "errore nella cancellazione di %s\n"
 
 #, python-format
 msgid "patch name \"%s\" is ambiguous:\n"
 msgstr "il nome della patch \"%s\" è ambiguo:\n"
 
 #, python-format
@@ -3132,40 +3227,50 @@ msgstr "la patch %s non è nel file series"
 
 msgid "(working directory not at a head)\n"
 msgstr "(la directory di lavoro non è a una head)\n"
 
 msgid "no patches in series\n"
 msgstr "nessuna patch nella serie\n"
 
 #, python-format
+msgid "qpush: %s is already at the top\n"
+msgstr "qpush: %s è già in cima\n"
+
+#, python-format
 msgid "cannot push to a previous patch: %s"
 msgstr "impossibile fare push fino a 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 dalla guardia %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 "cannot use --exact and --move together"
+msgstr ""
+
+msgid "cannot push --exact with applied patches"
+msgstr "impossibile fare un push --exact con patch applicate"
+
+#, python-format
+msgid "%s does not have a parent recorded"
+msgstr "%s non sembra avere un genitore registrato"
+
 msgid "please specify the patch to move"
 msgstr "si prega di specificare la patch da spostare"
 
 msgid "cleaning up working directory..."
 msgstr "sto pulendo la directory di lavoro..."
 
 #, python-format
 msgid "errors during apply, please fix and refresh %s\n"
@@ -3239,18 +3344,18 @@ 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 "aggiornamento directory della coda\n"
+msgid "updating queue directory\n"
+msgstr "sto aggiornando la directory della coda\n"
 
 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"
@@ -3281,61 +3386,68 @@ 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 ""
+msgstr "la revisione %d ha figli non gestiti"
 
 #, python-format
 msgid "cannot import merge revision %d"
-msgstr ""
+msgstr "impossibile importare la revisione di merge %d"
 
 #, 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"
 
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "sto rinominando %s in %s\n"
+
 msgid "need --name to import a patch from -"
 msgstr "necessario --name per importare una patch da -"
 
 #, python-format
 msgid "unable to read file %s"
 msgstr "impossibile leggere file %s"
 
 #, python-format
 msgid "adding %s to series file\n"
 msgstr "sto aggiungendo %s al file series\n"
 
 msgid "remove patches from queue"
-msgstr ""
+msgstr "rimuove patch dalla coda"
 
 msgid ""
 "    The patches must not be applied, and at least one patch is required. "
 "With\n"
 "    -k/--keep, the patch files are preserved in the patch directory."
 msgstr ""
 
 msgid ""
 "    To stop managing a patch and move it into permanent history,\n"
 "    use the :hg:`qfinish` command."
 msgstr ""
 
 msgid "print the patches already applied"
 msgstr "stampa le patch già applicate"
 
+msgid "    Returns 0 on success."
+msgstr "    Restituisce 0 in caso di successo."
+
 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"
@@ -3371,19 +3483,31 @@ msgid ""
 "    format. See the diffs help topic for information on why this is\n"
 "    important for preserving rename/copy information and permission\n"
 "    changes."
 msgstr ""
 
 msgid ""
 "    To import a patch from standard input, pass - as the patch file.\n"
 "    When importing from standard input, a patch name must be specified\n"
-"    using the --name flag.\n"
+"    using the --name flag."
+msgstr ""
+
+msgid "    To import an existing patch while renaming it::"
+msgstr "    Per importare una patch esistente mentre la si rinomina::"
+
+msgid "      hg qimport -e existing-patch -n new-name"
+msgstr "      hg qimport -e patch-esistente -n nuovo-nome"
+
+msgid ""
+"    Returns 0 if import succeeded.\n"
 "    "
 msgstr ""
+"    Restituisce 0 se l'import è terminato correttamente.\n"
+"    "
 
 msgid "init a new queue repository (DEPRECATED)"
 msgstr "inizializza un nuovo repository della coda (DEPRECATO)"
 
 msgid ""
 "    The queue repository is unversioned by default. If\n"
 "    -c/--create-repo is specified, qinit will create a separate nested\n"
 "    repository for patches (qinit -c may also be run later to convert\n"
@@ -3410,27 +3534,38 @@ msgstr "clona assieme il repository prin
 
 msgid ""
 "    If source is local, destination will have no patches applied. If\n"
 "    source is remote, this command can not check if patches are\n"
 "    applied in source, so cannot guarantee that patches are not\n"
 "    applied in destination. If you clone remote repository, be sure\n"
 "    before that it has no patches applied."
 msgstr ""
+"    Se la sorgente è locale, la destinazione non avrà patch applicate.\n"
+"    Se la sorgente è remota, questo comando non può controllare\n"
+"    se le patch sono applicate alla sorgente, quindi non può garantire\n"
+"    che le patch non siano applicate alla destinazione. Se cloni un\n"
+"    repository remoto, assicurati prima che non abbia patch applicate."
 
 msgid ""
 "    Source patch repository is looked for in <src>/.hg/patches by\n"
 "    default. Use -p <url> to change."
 msgstr ""
 
 msgid ""
 "    The patch directory must be a nested Mercurial repository, as\n"
-"    would be created by :hg:`init --mq`.\n"
+"    would be created by :hg:`init --mq`."
+msgstr ""
+
+msgid ""
+"    Return 0 on success.\n"
 "    "
 msgstr ""
+"    Restituisce 0 in caso di successo.\n"
+"    "
 
 msgid "versioned patch repository not found (see init --mq)"
 msgstr ""
 "repository delle patch sotto controllo di versione non trovato (vedere init "
 "--mq)"
 
 msgid "cloning main repository\n"
 msgstr "clonazione del repository principale\n"
@@ -3501,23 +3636,28 @@ msgstr ""
 "    della patch così come il messaggio di commit. Se nulla è stato\n"
 "    specificato, l'intestazione sarà vuota e il messaggio di commit\n"
 "    '[mq]: PATCH'."
 
 msgid ""
 "    Use the -g/--git option to keep the patch in the git extended diff\n"
 "    format. Read the diffs help topic for more information on why this\n"
 "    is important for preserving permission changes and copy/rename\n"
-"    information.\n"
-"    "
+"    information."
 msgstr ""
 "    Usa l'opzione -g/--git per mantenere la patch nel formato diff esteso\n"
 "    git. Leggere le informazioni di aiuto sui diff per maggiori\n"
 "    informazioni sul perché quest'opzione è importante per preservare\n"
-"    modifiche di permessi e informazioni su copie/rinomine.\n"
+"    modifiche di permessi e informazioni su copie/rinomine."
+
+msgid ""
+"    Returns 0 on successful creation of a new patch.\n"
+"    "
+msgstr ""
+"    Restituisce 0 alla creazione con successo di una nuova patch.\n"
 "    "
 
 msgid "update the current patch"
 msgstr "aggiorna la patch corrente"
 
 msgid ""
 "    If any file patterns are provided, the refreshed patch will\n"
 "    contain only the modifications that match those patterns; the\n"
@@ -3525,21 +3665,28 @@ msgid ""
 msgstr ""
 
 msgid ""
 "    If -s/--short is specified, files currently included in the patch\n"
 "    will be refreshed just like matched files and remain in the patch."
 msgstr ""
 
 msgid ""
+"    If -e/--edit is specified, Mercurial will start your configured editor "
+"for\n"
+"    you to enter a message. In case qrefresh fails, you will find a backup "
+"of\n"
+"    your message in ``.hg/last-message.txt``."
+msgstr ""
+
+msgid ""
 "    hg add/remove/copy/rename work as usual, though you might want to\n"
 "    use git-style patches (-g/--git or [diff] git=1) to track copies\n"
 "    and renames. See the diffs help topic for more information on the\n"
-"    git diff format.\n"
-"    "
+"    git diff format."
 msgstr ""
 
 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
 msgstr "l'opzione \"-e\" è incompatibile con \"-m\" o \"-l\""
 
 msgid "diff of the current patch and subsequent modifications"
 msgstr ""
 
@@ -3549,54 +3696,50 @@ msgid ""
 "    last refresh (thus showing what the current patch would become\n"
 "    after a qrefresh)."
 msgstr ""
 
 msgid ""
 "    Use :hg:`diff` if you only want to see the changes made since the\n"
 "    last qrefresh, or :hg:`export qtip` if you want to see changes\n"
 "    made by the current patch without including changes made since the\n"
-"    qrefresh.\n"
-"    "
+"    qrefresh."
 msgstr ""
 
 msgid "fold the named patches into the current patch"
 msgstr "ripiega le patch indicate in quella corrente"
 
 msgid ""
 "    Patches must not yet be applied. Each patch will be successively\n"
 "    applied to the current patch in the order given. If all the\n"
 "    patches apply successfully, the current patch will be refreshed\n"
 "    with the new cumulative patch, and the folded patches will be\n"
 "    deleted. With -k/--keep, the folded patch files will not be\n"
 "    removed afterwards."
 msgstr ""
 
 msgid ""
 "    The header for each folded patch will be concatenated with the\n"
-"    current patch header, separated by a line of '* * *'."
+"    current patch header, separated by a line of ``* * *``."
 msgstr ""
 
 msgid "qfold requires at least one patch name"
 msgstr "qfold richiede almeno un nome di patch"
 
-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 "Skipping already folded patch %s\n"
+msgstr "Salto patch già ripiegata %s\n"
 
 #, 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 "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 ""
 "applica o rimuove delle patch finché la patch indicata si trova in cima alla "
 "pila"
 
 msgid "set or print guards for a patch"
 msgstr "imposta o stampa le guardie per una patch"
@@ -3607,70 +3750,79 @@ msgid ""
 "    pushed only if the :hg:`qselect` command has activated it. A patch with\n"
 "    a negative guard (\"-foo\") is never pushed if the :hg:`qselect` "
 "command\n"
 "    has activated it."
 msgstr ""
 
 msgid ""
 "    With no arguments, print the currently active guards.\n"
-"    With arguments, set guards for the named patch.\n"
-"    NOTE: Specifying negative guards now requires '--'."
+"    With arguments, set guards for the named patch."
+msgstr ""
+"    Senza argomenti stampa le guardie attualmente attive.\n"
+"    Con argomenti imposta le guardie per la patch selezionata.."
+
+msgid ""
+"    .. note::\n"
+"       Specifying negative guards now requires '--'."
 msgstr ""
 
 msgid "    To set guards on another patch::"
 msgstr ""
 
-msgid ""
-"      hg qguard other.patch -- +2.6.17 -stable\n"
-"    "
+msgid "      hg qguard other.patch -- +2.6.17 -stable"
 msgstr ""
 
 msgid "cannot mix -l/--list with options or arguments"
 msgstr ""
 
 msgid "no patch to work with"
-msgstr ""
+msgstr "nessuna patch con cui lavorare"
 
 #, python-format
 msgid "no patch named %s"
-msgstr ""
+msgstr "nessuna patch di nome %s"
 
 msgid "print the header of the topmost or specified patch"
 msgstr ""
 
 msgid "push the next patch onto the stack"
-msgstr ""
+msgstr "applica la patch successiva in cima alla pila"
 
 msgid ""
 "    When -f/--force is applied, all local changes in patched files\n"
-"    will be lost.\n"
+"    will be lost."
+msgstr ""
+
+msgid ""
+"    Return 0 on succces.\n"
 "    "
 msgstr ""
+"    Restituisce 0 in caso di successo.\n"
+"    "
 
 msgid "no saved queues found, please use -n\n"
 msgstr ""
 
 #, python-format
 msgid "merging with queue at: %s\n"
 msgstr ""
 
 msgid "pop the current patch off the stack"
-msgstr ""
+msgstr "toglie la patch corrente dalla pila"
 
 msgid ""
 "    By default, pops off the top of the patch stack. If given a patch\n"
 "    name, keeps popping off patches until the named patch is at the\n"
-"    top of the stack.\n"
-"    "
+"    top of the stack."
 msgstr ""
 
 #, python-format
 msgid "using patch queue: %s\n"
-msgstr ""
+msgstr "uso la coda delle patch: %s\n"
 
 msgid "rename a patch"
 msgstr "rinomina una patch"
 
 msgid ""
 "    With one argument, renames the current patch to PATCH1.\n"
 "    With two arguments, renames PATCH1 to PATCH2."
 msgstr ""
@@ -3680,50 +3832,44 @@ msgstr ""
 #, 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"
 
-#, python-format
-msgid "renaming %s to %s\n"
-msgstr "sto rinominando %s in %s\n"
-
 msgid "restore the queue state saved by a revision (DEPRECATED)"
 msgstr "ripristina lo stato della coda salvato da una revisione (DEPRECATO)"
 
-msgid "    This command is deprecated, use rebase --mq instead."
-msgstr "    Questo comando è deprecato, usare invece rebase --mq."
+msgid "    This command is deprecated, use :hg:`rebase` instead."
+msgstr "    Questo comando è deprecato, usare invece :hg:`rebase`"
 
 msgid "save current queue state (DEPRECATED)"
 msgstr "salva lo stato corrente della coda (DEPRECATO)"
 
 #, 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"
 
-msgid "strip a changeset and all its descendants from the repository"
-msgstr "elimina una revisione e tutti i suoi discendenti dal repository"
-
-msgid ""
-"    The strip command removes all changesets whose local revision\n"
-"    number is greater than or equal to REV, and then restores any\n"
-"    changesets that are not descendants of REV. If the working\n"
-"    directory has uncommitted changes, the operation is aborted unless\n"
-"    the --force flag is supplied."
+msgid "strip changesets and all their descendants from the repository"
+msgstr "elimina le revisioni e tutti i loro discendenti dal repository"
+
+msgid ""
+"    The strip command removes the specified changesets and all their\n"
+"    descendants. If the working directory has uncommitted changes,\n"
+"    the operation is aborted unless the --force flag is supplied."
 msgstr ""
 
 msgid ""
 "    If a parent of the working directory is stripped, then the working\n"
 "    directory will automatically be updated to the most recent\n"
 "    available ancestor of the stripped parent after the operation\n"
 "    completes."
 msgstr ""
@@ -3737,20 +3883,22 @@ msgid ""
 "    bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
 "    be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n"
 "    where BUNDLE is the bundle file created by the strip. Note that\n"
 "    the local revision numbers will in general be different after the\n"
 "    restore."
 msgstr ""
 
 msgid ""
-"    Use the --nobackup option to discard the backup bundle once the\n"
-"    operation completes.\n"
-"    "
-msgstr ""
+"    Use the --no-backup option to discard the backup bundle once the\n"
+"    operation completes."
+msgstr ""
+
+msgid "empty revision set"
+msgstr "insieme di revisioni vuoto"
 
 msgid "set or print guarded patches to push"
 msgstr "imposta o stampa le patch controllate da guardia"
 
 msgid ""
 "    Use the :hg:`qguard` command to set or print guards on patch, then use\n"
 "    qselect to tell mq which guards to use. A patch will be pushed if\n"
 "    it has no guards or any positive guards match the currently\n"
@@ -3839,18 +3987,17 @@ msgid ""
 "    is specified, all applied mq revisions are removed from mq\n"
 "    control. Otherwise, the given revisions must be at the base of the\n"
 "    stack of applied patches."
 msgstr ""
 
 msgid ""
 "    This can be especially useful if your changes have been applied to\n"
 "    an upstream repository, or if you are about to push your changes\n"
-"    to upstream.\n"
-"    "
+"    to upstream."
 msgstr ""
 
 msgid "no revisions specified"
 msgstr "nessuna revisione specificata"
 
 msgid "manage multiple patch queues"
 msgstr ""
 
@@ -3872,38 +4019,45 @@ msgid ""
 "    active, except in the case where there are applied patches from the\n"
 "    currently active queue in the repository. Then the queue will only be\n"
 "    created and switching will fail."
 msgstr ""
 
 msgid ""
 "    To delete an existing queue, use --delete. You cannot delete the "
 "currently\n"
-"    active queue.\n"
-"    "
+"    active queue."
 msgstr ""
 
 msgid "patches applied - cannot set new queue active"
 msgstr ""
 
+msgid "cannot delete queue that does not exist"
+msgstr "impossibile cancellare una coda che non esiste"
+
+msgid "cannot delete currently active queue"
+msgstr "impossibile cancellare la coda correntemente attiva"
+
 msgid " (active)\n"
-msgstr ""
+msgstr " (attiva)\n"
 
 msgid "invalid queue name, may not contain the characters \":\\/.\""
 msgstr ""
 
 #, python-format
 msgid "queue \"%s\" already exists"
 msgstr "la coda \"%s\" esiste già"
 
-msgid "cannot delete queue that does not exist"
-msgstr "impossibile cancellare una coda che non esiste"
-
-msgid "cannot delete currently active queue"
-msgstr "impossibile cancellare la coda correntemente attiva"
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr "impossibile rinominare \"%s\" nel suo nome corrente"
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
+msgstr "la directory non per la coda \"%s\" esiste già"
 
 msgid "use --create to create a new queue"
 msgstr "usa --create per creare una nuova coda"
 
 msgid "cannot commit over an applied mq patch"
 msgstr "impossibile effettuare commit su una patch mq applicata"
 
 msgid "source has mq patches applied"
@@ -3918,18 +4072,18 @@ msgid "Tag %s overrides mq patch of the 
 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 "only a local queue repository may be initialized"
 msgstr "solo un repository locale della coda può essere inizializzato"
 
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "non esiste alcun repository Mercurial qui (.hg non trovata)"
 
 msgid "no queue repository"
 msgstr "nessun repository della coda"
 
 #, python-format
 msgid "%d applied"
 msgstr "%d applicate"
 
@@ -3957,17 +4111,17 @@ msgstr "usa il protocollo pull per copia
 
 msgid "do not update the new working directories"
 msgstr "non aggiornare le nuove directory di lavoro"
 
 msgid "use uncompressed transfer (fast over LAN)"
 msgstr "usa trasferimento non compresso (veloce su LAN)"
 
 msgid "REPO"
-msgstr ""
+msgstr "REPO"
 
 msgid "location of source patch repository"
 msgstr "posizione del repository sorgente delle patch"
 
 msgid "hg qclone [OPTION]... SOURCE [DEST]"
 msgstr "hg qclone [OPZIONE]... SORGENTE [DEST]"
 
 msgid "hg qcommit [OPTION]... [FILE]..."
@@ -3977,17 +4131,17 @@ msgid "hg qdiff [OPTION]... [FILE]..."
 msgstr "hg qdiff [OPZIONE]... [FILE]..."
 
 msgid "keep patch file"
 msgstr "mantieni il file della patch"
 
 msgid "stop managing a revision (DEPRECATED)"
 msgstr "smetti di gestire una revisione (DEPRECATO)"
 
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgid "hg qdelete [-k] [PATCH]..."
 msgstr ""
 
 msgid "edit patch header"
 msgstr "modifica l'intestazione della patch"
 
 msgid "keep folded patch files"
 msgstr "mantieni il file della patch ripiegata"
 
@@ -4001,149 +4155,139 @@ msgid "hg qgoto [OPTION]... PATCH"
 msgstr "hg qgoto [OPZIONE]... PATCH"
 
 msgid "list all patches and guards"
 msgstr "elenca tutte le patch e le guardie"
 
 msgid "drop all guards"
 msgstr "scarta tutte le guardie"
 
-#, fuzzy
 msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARDIA]... [-GUARDIA]..."
+msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARDIA]... [-GUARDIA]...]"
 
 msgid "hg qheader [PATCH]"
 msgstr "hg qheader [PATCH]"
 
-#, fuzzy
 msgid "import file in patch directory"
 msgstr "importa il file nella directory delle patch"
 
-#, fuzzy
+msgid "NAME"
+msgstr "NOME"
+
 msgid "name of patch file"
-msgstr "mantieni il file della patch"
+msgstr "nome del file della patch"
 
 msgid "overwrite existing files"
 msgstr "sovrascrive i file esistenti"
 
 msgid "place existing revisions under mq control"
 msgstr "metti le revisioni esistenti sotto il controllo di mq"
 
 msgid "use git extended diff format"
 msgstr "usa il formato diff git esteso"
 
 msgid "qpush after importing"
-msgstr ""
-
-#, fuzzy
+msgstr "qpush dopo l'importazione "
+
 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
-msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-r REV]... FILE..."
+msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-P] [-r REV]... FILE..."
 
 msgid "create queue repository"
 msgstr "crea il repository della coda"
 
 msgid "hg qinit [-c]"
 msgstr "hg qinit [-c]"
 
-#, fuzzy
 msgid "import uncommitted changes (DEPRECATED)"
-msgstr "modifica il messaggio di commit (DEPRECATO)"
+msgstr "importa modifiche non registrate (DEPRECATO)"
 
 msgid "add \"From: <current user>\" to patch"
 msgstr "aggiunge \"Da: <utente corrente>\" alla patch"
 
 msgid "USER"
-msgstr ""
-
-#, fuzzy
+msgstr "UTENTE"
+
 msgid "add \"From: <USER>\" to patch"
-msgstr "aggiunge \"Da: <utente fornito>\" alla patch"
+msgstr "aggiunge \"Da: <utente>\" alla patch"
 
 msgid "add \"Date: <current date>\" to patch"
 msgstr "aggiunge \"Data: <data corrente>\" alla patch"
 
-#, fuzzy
 msgid "add \"Date: <DATE>\" to patch"
-msgstr "aggiunge \"Data: <data fornita>\" alla patch"
-
-#, fuzzy
+msgstr "aggiunge \"Data: <data>\" alla patch"
+
 msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TESTO] [-l FILE] [-f] PATCH [FILE]..."
+msgstr "hg qnew [-e] [-m TESTO] [-l FILE] 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"
 
-#, fuzzy
 msgid "queue name to pop (DEPRECATED)"
-msgstr "nome della coda da disapplicare"
-
-#, fuzzy
+msgstr "nome della coda da disapplicare (DEPRECATED)"
+
 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 ""
+msgstr ""
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
+msgid "apply on top of local changes"
+msgstr "applica in cima alle modifiche locali"
+
+msgid "apply the target patch to its recorded parent"
+msgstr "applica la patch selezionata al suo genitore registrato"
 
 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"
 
-#, fuzzy
 msgid "merge from another queue (DEPRECATED)"
-msgstr "effettua il merge da un'altra coda"
-
-#, fuzzy
+msgstr "effettua il merge da un'altra coda (DEPRECATO)"
+
 msgid "merge queue name (DEPRECATED)"
-msgstr "nome della coda del merge"
+msgstr "effettua il merge del nome della coda (DEPRECATO)"
 
 msgid "reorder patch series and apply only the patch"
-msgstr ""
-
-#, fuzzy
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [PATCH | INDICE]"
+msgstr "riordina la serie di patch e applica solo la patch"
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDICE]"
 
 msgid "refresh only files already in the patch and specified files"
 msgstr "aggiorna solo file già nella patch e quelli specificati"
 
 msgid "add/update author field in patch with current user"
-msgstr ""
+msgstr "aggiunge/aggiorna il campo autore alla patch con l'utente corrente"
 
 msgid "add/update author field in patch with given user"
-msgstr ""
-
-#, fuzzy
+msgstr "aggiunge/aggiorna il campo autore alla con l'utente fornito"
+
 msgid "add/update date field in patch with current date"
-msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)"
-
-#, fuzzy
+msgstr "aggiunge/aggiorna il campo data alla patch con la data corrente"
+
 msgid "add/update date field in patch with given date"
-msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)"
+msgstr "aggiunge/aggiorna il campo data alla patch con la data fornita"
 
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
 msgstr "hg qrefresh [-I] [-X] [-e] [-m TESTO] [-l FILE] [-s] [FILE]..."
 
 msgid "hg qrename PATCH1 [PATCH2]"
 msgstr "hg qrename PATCH1 [PATCH2]"
 
 msgid "delete save entry"
 msgstr "elimina la voce salvata"
 
-#, fuzzy
 msgid "update queue working directory"
 msgstr "aggiorna la directory di lavoro della coda"
 
 msgid "hg qrestore [-d] [-u] REV"
 msgstr "hg qrestore [-d] [-u] REV"
 
 msgid "copy patch directory"
 msgstr "copia la directory delle patch"
@@ -4189,42 +4333,54 @@ msgstr ""
 msgid ""
 "bundle only changesets with local revision number greater than REV which are "
 "not descendants of REV (DEPRECATED)"
 msgstr ""
 
 msgid "no backups"
 msgstr "nessun backup"
 
-msgid "hg strip [-f] [-n] REV"
-msgstr ""
+msgid "no backups (DEPRECATED)"
+msgstr "non effettuare backup (DEPRECATO)"
+
+msgid "do not modify working copy during strip"
+msgstr "non modificare la copia di lavoro durante l'operazione di strip"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
 
 msgid "hg qtop [-s]"
-msgstr ""
+msgstr "hg qtop [-s]"
 
 msgid "show only the first patch"
 msgstr "mostra solo la prima patch"
 
 msgid "hg qunapplied [-1] [-s] [PATCH]"
 msgstr ""
 
 msgid "finish all applied changesets"
 msgstr "finalizza tutti i changeset applicati"
 
 msgid "hg qfinish [-a] [REV]..."
-msgstr ""
+msgstr "hg qfinish [-a] [REV]..."
 
 msgid "list all available queues"
-msgstr ""
+msgstr "elenca tutte le code disponibili"
 
 msgid "create new queue"
 msgstr "crea nuova coda"
 
+msgid "rename active queue"
+msgstr "rinomina la coda attiva"
+
 msgid "delete reference to queue"
-msgstr ""
+msgstr "elimina i riferimenti alla coda"
+
+msgid "delete queue, and remove patch dir"
+msgstr "elimina la coda e rimuove la directory delle patch"
 
 msgid "[OPTION] [QUEUE]"
 msgstr "[OPZIONE] [CODA]"
 
 msgid "hooks for sending email notifications at commit/push time"
 msgstr ""
 
 msgid ""
@@ -4342,17 +4498,17 @@ msgstr ""
 msgid "browse command output with an external pager"
 msgstr ""
 
 msgid "To set the pager that should be used, set the application variable::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
-"  pager = LESS='FSRX' less"
+"  pager = less -FRSX"
 msgstr ""
 
 msgid ""
 "If no pager is set, the pager extensions uses the environment variable\n"
 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
 msgstr ""
 
 msgid ""
@@ -4390,29 +4546,38 @@ msgid ""
 "paged."
 msgstr ""
 
 msgid "If pager.attend is present, pager.ignore will be ignored."
 msgstr ""
 
 msgid ""
 "To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in the global .hgrc\n"
-msgstr ""
+"to specify them in your user configuration file."
+msgstr ""
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+
+msgid "when to paginate (boolean, always, auto, or never)"
+msgstr "quando effettuare la paginazione (booleano, sempre, auto o mai)"
 
 msgid "interpret suffixes to refer to ancestor revisions"
-msgstr ""
+msgstr "interpreta i suffissi per riferirsi alle revisioni antenate"
 
 msgid ""
 "This extension allows you to use git-style suffixes to refer to the\n"
 "ancestors of a specific revision."
 msgstr ""
 
 msgid "For example, if you can refer to a revision as \"foo\", then::"
-msgstr ""
+msgstr "Per esempio, se puoi riferirti ad una revisione come \"foo\", allora::"
 
 msgid ""
 "  foo^N = Nth parent of foo\n"
 "  foo^0 = foo\n"
 "  foo^1 = first parent of foo\n"
 "  foo^2 = second parent of foo\n"
 "  foo^  = foo^1"
 msgstr ""
@@ -4446,22 +4611,16 @@ msgstr ""
 
 msgid ""
 "Each message refers to the first in the series using the In-Reply-To\n"
 "and References headers, so they will show up as a sequence in threaded\n"
 "mail and news readers, and in mail archives."
 msgstr ""
 
 msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
-msgstr ""
-
-msgid ""
 "To configure other defaults, add a section like this to your hgrc\n"
 "file::"
 msgstr ""
 
 msgid ""
 "  [email]\n"
 "  from = My Name <my@email>\n"
 "  to = recipient1, recipient2, ...\n"
@@ -4476,86 +4635,58 @@ msgid ""
 msgstr ""
 
 msgid ""
 "Then you can use the :hg:`email` command to mail a series of\n"
 "changesets as a patchbomb."
 msgstr ""
 
 msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-
-msgid "  % mutt -R -f mbox"
-msgstr ""
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-
-msgid "  % formail -s sendmail -bm -t < mbox"
-msgstr ""
-
-msgid "That should be all. Now your patchbomb is on its way out."
-msgstr ""
-
-msgid ""
 "You can also either configure the method option in the email section\n"
 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
 "that the patchbomb extension can automatically send patchbombs\n"
 "directly from the commandline. See the [email] and [smtp] sections in\n"
 "hgrc(5) for details.\n"
 msgstr ""
 
 #, python-format
 msgid "%s Please enter a valid value"
 msgstr "%s Si prega di inserire un valore valido"
 
 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"
 msgstr "invia dei changeset via email"
 
 msgid ""
 "    By default, diffs are sent in the format generated by\n"
 "    :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
 "    of N]\" introduction, which describes the series as a whole."
 msgstr ""
 
 msgid ""
 "    Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
 "    the first line of the changeset description as the subject text.\n"
 "    The message contains two or three parts. First, the changeset\n"
-"    description. Next, (optionally) if the diffstat program is\n"
-"    installed and -d/--diffstat is used, the result of running\n"
-"    diffstat on the patch. Finally, the patch itself, as generated by\n"
-"    :hg:`export`."
+"    description."
+msgstr ""
+
+msgid ""
+"    With the -d/--diffstat option, if the diffstat program is\n"
+"    installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+
+msgid "    Finally, the patch itself, as generated by :hg:`export`."
+msgstr ""
+
+msgid ""
+"    With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+"    with a final summary of all messages and asked for confirmation before\n"
+"    the messages are sent."
 msgstr ""
 
 msgid ""
 "    By default the patch is included as text in the email body for\n"
 "    easy reviewing. Using the -a/--attach option will instead create\n"
 "    an attachment for the patch. With -i/--inline an inline attachment\n"
 "    will be created."
 msgstr ""
@@ -4568,16 +4699,38 @@ msgstr ""
 
 msgid ""
 "    With -b/--bundle, changesets are selected as for --outgoing, but a\n"
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent."
 msgstr ""
 
 msgid ""
+"    With -m/--mbox, instead of previewing each patchbomb message in a\n"
+"    pager or sending the messages directly, it will create a UNIX\n"
+"    mailbox file with the patch emails. This mailbox file can be\n"
+"    previewed with any mail user agent which supports UNIX mbox\n"
+"    files."
+msgstr ""
+
+msgid ""
+"    With -n/--test, all steps will run, but mail will not be sent.\n"
+"    You will be prompted for an email recipient address, a subject and\n"
+"    an introductory message describing the patches of your patchbomb.\n"
+"    Then when all is done, patchbomb messages are displayed. If the\n"
+"    PAGER environment variable is set, your pager will be fired up once\n"
+"    for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+
+msgid ""
+"    In case email sending fails, you will find a backup of your series\n"
+"    introductory message in ``.hg/last-email.txt``."
+msgstr ""
+
+msgid ""
 "      hg email -r 3000          # send patch 3000 only\n"
 "      hg email -r 3000 -r 3001  # send patches 3000 and 3001\n"
 "      hg email -r 3000:3005     # send patches 3000 through 3005\n"
 "      hg email 3000             # send patch 3000 (deprecated)"
 msgstr ""
 
 msgid ""
 "      hg email -o               # send all patches not in default\n"
@@ -4590,21 +4743,37 @@ msgid ""
 "      hg email -b               # send bundle of all patches not in default\n"
 "      hg email -b DEST          # send bundle of all patches not in DEST\n"
 "      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
 "default\n"
 "      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST"
 msgstr ""
 
 msgid ""
+"      hg email -o -m mbox &&    # generate an mbox file...\n"
+"        mutt -R -f mbox         # ... and view it with mutt\n"
+"      hg email -o -m mbox &&    # generate an mbox file ...\n"
+"        formail -s sendmail \\   # ... and use formail to send from the "
+"mbox\n"
+"          -bm -t < mbox         # ... using sendmail"
+msgstr ""
+
+msgid ""
 "    Before using this command, you will need to enable email in your\n"
 "    hgrc. See the [email] section in hgrc(5) for details.\n"
 "    "
 msgstr ""
 
+#, python-format
+msgid "comparing with %s\n"
+msgstr "sto confrontando con %s\n"
+
+msgid "no changes found\n"
+msgstr "nessuna modifica trovata\n"
+
 msgid "specify at least one changeset with -r or -o"
 msgstr ""
 
 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
 msgstr ""
 
 msgid "too many destinations"
 msgstr "troppe destinazioni"
@@ -4618,40 +4787,65 @@ msgid ""
 msgstr ""
 "\n"
 "Scrivi il messaggio introduttivo per la serie di patch."
 
 #, python-format
 msgid "This patch series consists of %d patches."
 msgstr "Questa serie di patch consiste di %d patch."
 
-msgid "Final summary:\n"
-msgstr "Sommario finale:\n"
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+"\n"
+"Sommario finale:"
+
+msgid "are you sure you want to send (yn)?"
+msgstr "sei sicuro di voler effettuare l'invio (yn)?"
+
+msgid "&No"
+msgstr "&No"
+
+msgid "&Yes"
+msgstr "&Si"
+
+msgid "patchbomb canceled"
+msgstr "patchbomb cancellato"
 
 msgid "Displaying "
 msgstr "Sto mostrando "
 
 msgid "Writing "
 msgstr "Sto scrivendo "
 
+msgid "writing"
+msgstr "sto scrivendo"
+
 msgid "Sending "
 msgstr "Sto inviando "
 
+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 "ask for confirmation before sending"
+msgstr "chiede la conferma prima dell'invio"
+
 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"
@@ -4715,61 +4909,91 @@ msgstr ""
 msgid ""
 "This extension uses the progress information logged by hg commands\n"
 "to draw progress bars that are as informative as possible. Some progress\n"
 "bars only offer indeterminate information, while others have a definite\n"
 "end point."
 msgstr ""
 
 msgid "The following settings are available::"
-msgstr ""
+msgstr "Le seguenti impostazioni sono disponibili::"
 
 msgid ""
 "  [progress]\n"
 "  delay = 3 # number of seconds (float) before showing the progress bar\n"
 "  refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
-"  format = topic bar number # format of the progress bar\n"
+"  format = topic bar number estimate # format of the progress bar\n"
 "  width = <none> # if set, the maximum width of the progress information\n"
 "                 # (that is, min(width, term width) will be used)\n"
 "  clear-complete = True # clear the progress bar after it's done\n"
 "  disable = False # if true, don't show a progress bar\n"
 "  assume-tty = False # if true, ALWAYS show a progress bar, unless\n"
 "                     # disable is given"
 msgstr ""
 
 msgid ""
-"Valid entries for the format field are topic, bar, number, unit, and\n"
-"item. item defaults to the last 20 characters of the item, but this\n"
-"can be changed by adding either ``-<num>`` which would take the last\n"
-"num characters, or ``+<num>`` for the first num characters.\n"
-msgstr ""
-
-#, fuzzy
+"Valid entries for the format field are topic, bar, number, unit,\n"
+"estimate, and item. item defaults to the last 20 characters of the\n"
+"item, but this can be changed by adding either ``-<num>`` which would\n"
+"take the last num characters, or ``+<num>`` for the first num\n"
+"characters.\n"
+msgstr ""
+
+#. i18n: format XX seconds as "XXs"
+#, python-format
+msgid "%02ds"
+msgstr "%02ds"
+
+#. i18n: format X minutes and YY seconds as "XmYYs"
+#, python-format
+msgid "%dm%02ds"
+msgstr "%dm%02ds"
+
+#. i18n: format X hours and YY minutes as "XhYYm"
+#, python-format
+msgid "%dh%02dm"
+msgstr "%dh%02dm"
+
+#. i18n: format X days and YY hours as "XdYYh"
+#, python-format
+msgid "%dd%02dh"
+msgstr "%dd%02dh"
+
+#. i18n: format X weeks and YY days as "XwYYd"
+#, python-format
+msgid "%dw%02dd"
+msgstr "%dw%02dd"
+
+#. i18n: format X years and YY weeks as "XyYYw"
+#, python-format
+msgid "%dy%02dw"
+msgstr "%dy%02dw"
+
 msgid "command to delete untracked files from the working directory"
-msgstr "non effettuare il commit, aggiorna solo la directory di lavoro"
+msgstr "comando per cancellare file non tracciati dalla directory di lavoro"
 
 msgid "removes files not tracked by Mercurial"
-msgstr ""
+msgstr "rimuove i file non tracciati da Mercurial"
 
 msgid ""
 "    Delete files not known to Mercurial. This is useful to test local\n"
 "    and uncommitted changes in an otherwise-clean source tree."
 msgstr ""
 
 msgid "    This means that purge will delete:"
-msgstr ""
+msgstr "    Questo significa che purge cancellerà:"
 
 msgid ""
 "    - Unknown files: files marked with \"?\" by :hg:`status`\n"
 "    - Empty directories: in fact Mercurial ignores directories unless\n"
 "      they contain files under source control management"
 msgstr ""
 
 msgid "    But it will leave untouched:"
-msgstr ""
+msgstr "    Ma lascerà intoccati:"
 
 msgid ""
 "    - Modified and unmodified tracked files\n"
 "    - Ignored files (unless --all is specified)\n"
 "    - New files added to the repository (with :hg:`add`)"
 msgstr ""
 
 msgid ""
@@ -4802,68 +5026,68 @@ msgid "Removing directory %s\n"
 msgstr "Sto rimuovendo la directory %s\n"
 
 msgid "abort if an error occurs"
 msgstr "abortisce se si verifica un errore"
 
 msgid "purge ignored files too"
 msgstr "rimuove anche i file ignorati"
 
-#, fuzzy
 msgid "print filenames instead of deleting them"
 msgstr "stampa i nomi dei file invece di cancellarli"
 
-#, fuzzy
 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
-msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)"
+msgstr ""
+"termina i nomi dei file con NUL, per usarli con xargs (implica -p/--print)"
 
 msgid "hg purge [OPTION]... [DIR]..."
 msgstr "hg purge [OPZIONE]... [DIR]..."
 
-#, fuzzy
 msgid "command to move sets of revisions to a different ancestor"
-msgstr "sposta insiemi di revisioni su un antenato differente"
-
-#, fuzzy
+msgstr "comando per spostare insiemi di revisioni su un antenato differente"
+
 msgid ""
 "This extension lets you rebase changesets in an existing Mercurial\n"
 "repository."
 msgstr ""
-"Questa estensione consente di effettuare il rebase di changeset in un\n"
-"repository Mercurial esistente."
-
-#, fuzzy
+"Questa estensione consente di effettuare il rebase di changeset in\n"
+"un repository Mercurial esistente."
+
 msgid ""
 "For more information:\n"
 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
 msgstr ""
 "Per maggiori informazioni:\n"
-"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
-
-#, fuzzy
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
+
 msgid "move changeset (and descendants) to a different branch"
-msgstr "sposta changeset (e discendenti) su una branch differente"
-
-#, fuzzy
+msgstr "sposta changeset (e discendenti) su un branch differente"
+
 msgid ""
 "    Rebase uses repeated merging to graft changesets from one part of\n"
 "    history (the source) onto another (the destination). This can be\n"
 "    useful for linearizing *local* changes relative to a master\n"
 "    development tree."
 msgstr ""
 "    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."
+"    della storia (la sorgente) ad un'altra (la destinazione). Questo\n"
+"    può essere utile per linearizzare modifiche *locali* relative ad\n"
+"    un albero di sviluppo principale."
 
 msgid ""
 "    You should not rebase changesets that have already been shared\n"
 "    with others. Doing so will force everybody else to perform the\n"
 "    same rebase or they will end up with duplicated changesets after\n"
 "    pulling in your rebased changesets."
 msgstr ""
+"    Non si dovrebbe effettuare il rebase di modifiche che sono già\n"
+"    state condivise con altri. Così facendo si forzerebbe chiunque\n"
+"    altro ad effettuare lo stesso rebase, altrimenti finirebbero \n"
+"    per l'avere changeset duplicati dopo aver effettuato il pull\n"
+"    dei changeset di cui è stato effettuato il rebase."
 
 msgid ""
 "    If you don't specify a destination changeset (``-d/--dest``),\n"
 "    rebase uses the tipmost head of the current named branch as the\n"
 "    destination. (The destination changeset is not modified by\n"
 "    rebasing, but new changesets are added as its descendants.)"
 msgstr ""
 
@@ -4893,63 +5117,67 @@ msgid ""
 "    One result of the rules for selecting the destination changeset\n"
 "    and source branch is that, unlike ``merge``, rebase will do\n"
 "    nothing if you are at the latest (tipmost) head of a named branch\n"
 "    with two heads. You need to explicitly specify source and/or\n"
 "    destination (or ``update`` to the other head, if it's the head of\n"
 "    the intended source branch)."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
 "    continued with --continue/-c or aborted with --abort/-a."
 msgstr ""
 "    Se un rebase viene interrotto per risolvere manualmente un merge,\n"
-"    può essere ripreso con --continue o abortito con --abort.\n"
-"    "
+"    può essere ripreso con --continue/-c o abortito con --abort/-a."
 
 msgid ""
 "    Returns 0 on success, 1 if nothing to rebase.\n"
 "    "
 msgstr ""
+"    Restituisce 0 in caso di successo, 1 se non c'è nulla di cui fare\n"
+"    il rebase.\n"
+"    "
 
 msgid "cannot use both abort and continue"
 msgstr "non è possibile usare sia abort sia continue"
 
 msgid "cannot use collapse with continue or abort"
 msgstr "non è possibile usare collapse con continue o abort"
 
-#, fuzzy
 msgid "cannot use detach with continue or abort"
-msgstr "non è possibile usare collapse con continue o abort"
+msgstr "non è possibile usare detach con continue o abort"
 
 msgid "abort and continue do not allow specifying revisions"
 msgstr "abort e continue non consentono di specificare revisioni"
 
 msgid "cannot specify both a revision and a base"
 msgstr "non è possibile specificare sia una revisione sia una base"
 
 msgid "detach requires a revision to be specified"
-msgstr ""
-
-#, fuzzy
+msgstr "detach richiede di specificare una revisione"
+
 msgid "cannot specify a base with detach"
-msgstr "impossibile specificare sia --rev sia --change"
+msgstr "impossibile specificare una base con detach"
 
 msgid "nothing to rebase\n"
 msgstr "niente di cui effettuare il rebase\n"
 
 msgid "cannot use both keepbranches and extrafn"
 msgstr "non è possibile usare sia keepbranches sia extrafn"
 
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr ""
-"correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --"
-"continue"
+msgid "rebasing"
+msgstr "sto effettuando il rebase"
+
+msgid "changesets"
+msgstr "sto aggiungendo i changeset"
+
+msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
+msgstr ""
+"conflitti non risolti (vedere hg resolve e poi eseguire hg rebase --continue)"
 
 #, python-format
 msgid "no changes, revision %d skipped\n"
 msgstr "nessuna modifica, revisione %d saltata\n"
 
 msgid "rebase merging completed\n"
 msgstr "merge del rebase completato\n"
 
@@ -4971,221 +5199,198 @@ msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno"
 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 "no rebase in progress"
 msgstr "nessun rebase in corso"
 
-#, fuzzy
 msgid "warning: new changesets detected on target branch, can't abort\n"
 msgstr ""
-"attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
+"attenzione: nuovi changeset rilevati sulla branch target, impossibile "
+"abortire\n"
 
 msgid "rebase aborted\n"
 msgstr "rebase abortito\n"
 
 msgid "cannot rebase onto an applied mq patch"
 msgstr "non è possibile effettuare il rebase su una patch mq applicata"
 
-#, fuzzy
 msgid "source is ancestor of destination"
-msgstr "nessuna sorgente o destinazione specificata"
+msgstr "la sorgente è un antenato della destinazione"
 
 msgid "source is descendant of destination"
-msgstr ""
+msgstr "la sorgente è un discendente della destinazione"
 
 msgid "rebase working directory to branch head"
 msgstr "effettua il rebase della directory di lavoro sulla head della branch"
 
-#, fuzzy
 msgid "rebase from the specified changeset"
-msgstr "mostra i genitori della revisione specificata"
+msgstr "effettua il rebase dal changeset specificato"
 
 msgid ""
 "rebase from the base of the specified changeset (up to greatest common "
 "ancestor of base and dest)"
 msgstr ""
-
-#, fuzzy
+"rebase dalla base del changeset specificato (fino al più grande antenato "
+"comune tra la base e la destinazione)"
+
 msgid "rebase onto the specified changeset"
-msgstr "rev %d punta al changeset inatteso %d"
-
-#, fuzzy
+msgstr "rebase sul changeset specificato"
+
 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
+msgstr "mantiene i changeset originali"
+
 msgid "keep original branch names"
 msgstr "mantiene le branch originali"
 
 msgid "force detaching of source from its original branch"
-msgstr ""
+msgstr "forza la separazione della sorgente dalla sua branch originaria"
 
 msgid "continue an interrupted rebase"
 msgstr "continua un rebase interrotto"
 
 msgid "abort an interrupted rebase"
 msgstr "abortisce un rebase interrotto"
 
-#, fuzzy
 msgid ""
 "hg rebase [-s REV | -b REV] [-d REV] [options]\n"
 "hg rebase {-a|-c}"
 msgstr ""
-"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
-
-#, fuzzy
+"hg rebase [-s REV | -b REV] [-d REV] [opzioni]\n"
+"hg rebase {-a|-c}"
+
 msgid "commands to interactively select changes for commit/qrefresh"
-msgstr "cambia interattivamente la selezione durante un commit o qrefresh"
+msgstr ""
+"comando per selezionare interattivamente le modifiche per il commit/qrefresh"
 
 msgid "this modifies a binary file (all or nothing)\n"
 msgstr "questo modifica un file binario (tutto o niente)\n"
 
 msgid "this is a binary file\n"
 msgstr "questo è un file binario\n"
 
 #, python-format
 msgid "%d hunks, %d lines changed\n"
 msgstr ""
 
 msgid "[Ynsfdaq?]"
-msgstr "[Ynsfdaq?]"
-
-#, fuzzy
+msgstr ""
+
 msgid "&Yes, record this change"
-msgstr "y - registra questa modifica"
-
-#, fuzzy
+msgstr "&Yes, registra questa modifica"
+
 msgid "&No, skip this change"
-msgstr "salta il changeset di test"
+msgstr "&No, salta questa modifca"
 
 msgid "&Skip remaining changes to this file"
-msgstr ""
+msgstr "&Salta le modifiche rimanenti a questo file"
 
 msgid "Record remaining changes to this &file"
-msgstr ""
+msgstr "Registra le modifiche rimanenti a questo &file"
 
 msgid "&Done, skip remaining changes and files"
-msgstr ""
-
-#, fuzzy
+msgstr "&Fatto, salta le modifiche e i file rimanenti"
+
 msgid "Record &all changes to all remaining files"
-msgstr "registra cancellazione per i file mancanti"
-
-#, fuzzy
+msgstr "Registra &tutte le modifiche a tutti i file rimanenti"
+
 msgid "&Quit, recording no changes"
-msgstr "y - registra questa modifica"
-
-#, fuzzy
+msgstr "&Esce, non registrando alcuna modifica"
+
 msgid "&?"
-msgstr "?"
+msgstr "&?"
 
 msgid "user quit"
-msgstr ""
+msgstr "utente uscito"
 
 #, python-format
 msgid "examine changes to %s?"
-msgstr ""
+msgstr "esaminare le modifiche a %s?"
 
 msgid " and "
 msgstr " e "
 
 #, python-format
 msgid "record this change to %r?"
 msgstr "registrare questa modifica a %r?"
 
-#, fuzzy, python-format
+#, python-format
 msgid "record change %d/%d to %r?"
-msgstr "registrare questa modifica a %r?"
-
-#, fuzzy
+msgstr "registrare la modifica %d/%d a %r?"
+
 msgid "interactively select changes to commit"
 msgstr "seleziona interattivamente le modifiche di cui eseguire il commit"
 
-#, fuzzy
 msgid ""
 "    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be candidates for recording."
 msgstr ""
 "    Se viene omesso un elenco di file, tutte le modifiche\n"
-"    riportate da \"hg status\" saranno candidati per la\n"
+"    riportate da :hg:`status` saranno candidate per la\n"
 "    registrazione."
 
-#, fuzzy
-msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr ""
-"    Vedere 'hg help dates' per un elenco di formati\n"
-"    validi per -d/--date."
-
-#, fuzzy
 msgid ""
 "    You will be prompted for whether to record changes to each\n"
 "    modified file, and for files with multiple changes, for each\n"
 "    change to use. For each query, the following responses are\n"
 "    possible::"
 msgstr ""
 "    Si verrà interrogati su quali modifiche registrare\n"
 "    per ogni file modificato e, per file con modifiche\n"
 "    multiple, per ogni modifica da usare. Per ogni domanda\n"
-"    sono possibili le seguenti risposte:"
-
-#, fuzzy
+"    sono possibili le seguenti risposte::"
+
 msgid ""
 "      y - record this change\n"
 "      n - skip this change"
 msgstr ""
-"    y - registra questa modifica\n"
-"    n - salta questa modifica"
-
-#, fuzzy
+"      y - registra questa modifica\n"
+"      n - salta questa modifica"
+
 msgid ""
 "      s - skip remaining changes to this file\n"
 "      f - record remaining changes to this file"
 msgstr ""
-"    s - salta le modifiche rimanenti di questo file\n"
-"    f - registra le modifiche rimanenti di questo file"
-
-#, fuzzy
+"      s - salta le modifiche rimanenti di questo file\n"
+"      f - registra le modifiche rimanenti di questo file"
+
 msgid ""
 "      d - done, skip remaining changes and files\n"
 "      a - record all changes to all remaining files\n"
 "      q - quit, recording no changes"
 msgstr ""
-"    d - fatto, salta le modifiche e i file rimanenti\n"
-"    a - registra tutte le modifiche a tutti i file rimanenti\n"
-"    q - esci, non registrare alcuna modifica"
-
-#, fuzzy
+"      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"
+
 msgid "      ? - display help"
-msgstr "    ? - mostra il messaggio di aiuto"
+msgstr "      ? - mostra il messaggio di aiuto"
 
 msgid "    This command is not available when committing a merge."
-msgstr ""
+msgstr "    Questo comando non è disponibile durante il commit di un merge."
 
 msgid "'mq' extension not loaded"
 msgstr "estensione 'mq' non caricata"
 
 msgid "running non-interactively, use commit instead"
-msgstr ""
-
-msgid "cannot partially commit a merge (use hg commit instead)"
-msgstr ""
+msgstr "esecuzione non interattiva, usare invece commit"
+
+msgid "cannot partially commit a merge (use \"hg commit\" instead)"
+msgstr ""
+"impossibile eseguire il commit parziale di un merge (usare invece \"hg commit"
+"\")"
 
 msgid "no changes to record\n"
 msgstr "nessuna modifica da registrare\n"
 
-msgid "patch failed to apply"
-msgstr ""
-
 msgid "hg record [OPTION]... [FILE]..."
 msgstr "hg record [OPZIONE]... [FILE]..."
 
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr "hg qrecord [OPZIONE]... PATCH [FILE]..."
 
 msgid "recreates hardlinks between repository clones"
 msgstr ""
@@ -5223,88 +5428,87 @@ msgstr ""
 
 msgid ""
 "    Do not attempt any read operations on this repository while the\n"
 "    command is running. (Both repositories will be locked against\n"
 "    writes.)\n"
 "    "
 msgstr ""
 
+msgid "hardlinks are not supported on this system"
+msgstr "hardlink non supportati su questo sistema"
+
 #, fuzzy
-msgid "hardlinks are not supported on this system"
-msgstr "Hardlink non supportati"
-
-#, fuzzy, python-format
+msgid "must specify local origin repository"
+msgstr "%s non è un repository locale Mercurial"
+
+#, python-format
 msgid "relinking %s to %s\n"
-msgstr "sto ottenendo %s in %s\n"
+msgstr "sto ricollegando %s a %s\n"
+
+#, fuzzy
+msgid "there is nothing to relink\n"
+msgstr "non c'è nulla di cui fare il merge"
 
 #, python-format
 msgid "tip has %d files, estimated total number of files: %s\n"
-msgstr ""
-
-#, fuzzy
+msgstr "tip ha %d file, numero totale stimato di file: %s\n"
+
 msgid "collecting"
-msgstr "sto collezionando gli rlog CVS\n"
-
-#, fuzzy
+msgstr "sto collezionando"
+
 msgid "files"
-msgstr "file:"
+msgstr "file"
 
 #, python-format
 msgid "collected %d candidate storage files\n"
 msgstr ""
 
-#, fuzzy
 msgid "source and destination are on different devices"
-msgstr "nessuna sorgente o destinazione specificata"
-
-#, fuzzy, python-format
+msgstr "sorgente e destinazione sono su periferiche differenti"
+
+#, python-format
 msgid "not linkable: %s\n"
-msgstr "non nel dirstate: %s\n"
-
-#, fuzzy
-msgid " files"
-msgstr "file:"
-
-#, fuzzy
+msgstr "non collegabile: %s\n"
+
 msgid "pruning"
-msgstr "sto eseguendo %s\n"
+msgstr "eliminazione"
 
 #, python-format
 msgid "pruned down to %d probably relinkable files\n"
 msgstr ""
 
 msgid "relinking"
-msgstr ""
+msgstr "ricollegamento in corso"
 
 #, python-format
 msgid "relinked %d files (%d bytes reclaimed)\n"
 msgstr ""
 
 msgid "[ORIGIN]"
-msgstr ""
+msgstr "[ORIGINE]"
 
 msgid "extend schemes with shortcuts to repository swarms"
 msgstr ""
 
 msgid ""
 "This extension allows you to specify shortcuts for parent URLs with a\n"
 "lot of repositories to act like a scheme, for example::"
 msgstr ""
 
 msgid ""
 "  [schemes]\n"
 "  py = http://code.python.org/hg/"
 msgstr ""
 
 msgid "After that you can use it like::"
-msgstr ""
+msgstr "In seguito puoi usarlo come::"
 
 msgid "  hg clone py://trunk/"
-msgstr ""
+msgstr "  hg clone py://trunk/"
 
 msgid ""
 "Additionally there is support for some more complex schemas, for\n"
 "example used by Google Code::"
 msgstr ""
 
 msgid ""
 "  [schemes]\n"
@@ -5334,41 +5538,40 @@ msgstr ""
 msgid ""
 "You can override a predefined scheme by defining a new scheme with the\n"
 "same name.\n"
 msgstr ""
 
 msgid "share a common history between several working directories"
 msgstr ""
 
-#, fuzzy
 msgid "create a new shared repository"
-msgstr "crea il repository della coda"
+msgstr "crea un nuovo repository condiviso"
 
 msgid ""
 "    Initialize a new repository and working directory that shares its\n"
 "    history with another repository."
 msgstr ""
 
 msgid ""
-"    NOTE: using rollback or extensions that destroy/modify history\n"
-"    (mq, rebase, etc.) can cause considerable confusion with shared\n"
-"    clones. In particular, if two shared clones are both updated to\n"
-"    the same changeset, and one of them destroys that changeset with\n"
-"    rollback, the other clone will suddenly stop working: all\n"
-"    operations will fail with \"abort: working directory has unknown\n"
-"    parent\". The only known workaround is to use debugsetparents on\n"
-"    the broken clone to reset it to a changeset that still exists\n"
-"    (e.g. tip).\n"
+"    .. note::\n"
+"       using rollback or extensions that destroy/modify history (mq,\n"
+"       rebase, etc.) can cause considerable confusion with shared\n"
+"       clones. In particular, if two shared clones are both updated to\n"
+"       the same changeset, and one of them destroys that changeset\n"
+"       with rollback, the other clone will suddenly stop working: all\n"
+"       operations will fail with \"abort: working directory has unknown\n"
+"       parent\". The only known workaround is to use debugsetparents on\n"
+"       the broken clone to reset it to a changeset that still exists\n"
+"       (e.g. tip).\n"
 "    "
 msgstr ""
 
-#, fuzzy
 msgid "do not create a working copy"
-msgstr "non aggiornare le nuove directory di lavoro"
+msgstr "non crea una directory di lavoro"
 
 msgid "[-U] SOURCE [DEST]"
 msgstr "[-U] SORGENTE [DEST]"
 
 msgid "command to transplant changesets from another branch"
 msgstr ""
 
 msgid "This extension allows you to transplant patches from another branch."
@@ -5404,17 +5607,17 @@ msgstr "filtraggio fallito"
 
 msgid "can only omit patchfile if merging"
 msgstr ""
 
 #, python-format
 msgid "%s: empty changeset"
 msgstr "%s: changeset vuoto"
 
-msgid "Fix up the merge and run hg transplant --continue"
+msgid "fix up the merge and run hg transplant --continue"
 msgstr ""
 
 #, python-format
 msgid "%s transplanted as %s\n"
 msgstr "%s trapiantato come %s\n"
 
 msgid "transplant log file is corrupt"
 msgstr ""
@@ -5435,25 +5638,32 @@ msgid ""
 "q: cancel transplant\n"
 "?: show this help\n"
 msgstr ""
 
 msgid "apply changeset? [ynmpcq?]:"
 msgstr "applicare il changeset? [ynmpcq?]:"
 
 msgid "no such option\n"
-msgstr ""
+msgstr "nessuna opzione\n"
 
 msgid "transplant changesets from another branch"
 msgstr ""
 
 msgid ""
 "    Selected changesets will be applied on top of the current working\n"
-"    directory with the log of the original changeset. If --log is\n"
-"    specified, log messages will have a comment appended of the form::"
+"    directory with the log of the original changeset. The changesets\n"
+"    are copied and will thus appear twice in the history. Use the\n"
+"    rebase extension instead if you want to move a whole branch of\n"
+"    unpublished changesets."
+msgstr ""
+
+msgid ""
+"    If --log is specified, log messages will have a comment appended\n"
+"    of the form::"
 msgstr ""
 
 msgid "      (transplanted from CHANGESETHASH)"
 msgstr ""
 
 msgid ""
 "    You can rewrite the changelog message with the --filter option.\n"
 "    Its argument will be invoked with the current changelog message as\n"
@@ -5465,19 +5675,19 @@ msgid ""
 "    repository. If --branch/-b is specified, selects changesets from\n"
 "    the branch holding the named revision, up to that revision. If\n"
 "    --all/-a is specified, all changesets on the branch will be\n"
 "    transplanted, otherwise you will be prompted to select the\n"
 "    changesets you want."
 msgstr ""
 
 msgid ""
-"    :hg:`transplant --branch REVISION --all` will rebase the selected\n"
-"    branch (up to the named revision) onto your current working\n"
-"    directory."
+"    :hg:`transplant --branch REVISION --all` will transplant the\n"
+"    selected branch (up to the named revision) onto your current\n"
+"    working directory."
 msgstr ""
 
 msgid ""
 "    You can optionally mark selected transplanted changesets as merge\n"
 "    changesets. You will not be prompted to transplant any ancestors\n"
 "    of a merged transplant, and you can merge descendants of them\n"
 "    normally instead of transplanting them."
 msgstr ""
@@ -5496,35 +5706,40 @@ 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 ""
+msgstr "--all richiede la revisione di un branch"
 
 msgid "--all is incompatible with a revision list"
 msgstr ""
 
 msgid "no revision checked out"
-msgstr ""
+msgstr "nessuna revisione estratta"
 
 msgid "outstanding uncommitted merges"
 msgstr ""
 
 msgid "outstanding local changes"
 msgstr ""
 
+msgid ""
+"``transplanted(set)``\n"
+"    Transplanted changesets in set."
+msgstr ""
+
 msgid "pull patches from REPO"
 msgstr ""
 
 msgid "BRANCH"
-msgstr ""
+msgstr "BRANCH"
 
 msgid "pull patches from branch BRANCH"
 msgstr ""
 
 msgid "pull all changesets up to BRANCH"
 msgstr ""
 
 msgid "skip over REV"
@@ -5534,61 +5749,62 @@ msgid "merge at REV"
 msgstr ""
 
 msgid "append transplant info to log message"
 msgstr ""
 
 msgid "continue last transplant session after repair"
 msgstr ""
 
-#, fuzzy
 msgid "filter changesets through command"
-msgstr "%d changeset trovati\n"
+msgstr "changeset filtrati tramite il comando"
 
 msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
 msgstr ""
 
 msgid "allow the use of MBCS paths with problematic encodings"
-msgstr ""
+msgstr "consente l'uso di percorsi MBCS con codifiche problematiche"
 
 msgid ""
 "Some MBCS encodings are not good for some path operations (i.e.\n"
 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
 "This extension can be used to fix the issue with those encodings by\n"
 "wrapping some functions to convert to Unicode string before path\n"
 "operation."
 msgstr ""
 
 msgid "This extension is useful for:"
-msgstr ""
+msgstr "Questa estensione è utile per:"
 
 msgid ""
 "- Japanese Windows users using shift_jis encoding.\n"
 "- Chinese Windows users using big5 encoding.\n"
 "- All users who use a repository with one of problematic encodings on\n"
 "  case-insensitive file system."
 msgstr ""
 
 msgid "This extension is not needed for:"
-msgstr ""
+msgstr "Questa estensione non è necessaria per:"
 
 msgid ""
 "- Any user who use only ASCII chars in path.\n"
 "- Any user who do not use any of problematic encodings."
 msgstr ""
 
 msgid "Note that there are some limitations on using this extension:"
-msgstr ""
-
-msgid "- You should use single encoding in one repository."
-msgstr ""
-
-msgid ""
-"\n"
+msgstr "Notare che ci sono alcune limitazioni all'uso di questa estensione:"
+
+msgid ""
+"- You should use single encoding in one repository.\n"
+"- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n"
+"- win32mbcs is not compatible with fixutf8 extension."
+msgstr ""
+
+msgid ""
 "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n"
 "You can specify the encoding by config option::"
 msgstr ""
 
 msgid ""
 " [win32mbcs]\n"
 " encoding = sjis"
 msgstr ""
@@ -5694,172 +5910,193 @@ msgid ""
 "[extensions]\n"
 "win32text =\n"
 "[encode]\n"
 "** = %sencode:\n"
 "[decode]\n"
 "** = %sdecode:\n"
 msgstr ""
 
+msgid ""
+"win32text is deprecated: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension\n"
+msgstr ""
+"win32text è deprecato: http://mercurial.selenic.com/wiki/Win32TextExtension\n"
+
 msgid "discover and advertise repositories on the local network"
-msgstr ""
+msgstr "scopre e pubblicizza repository sulla rete locale"
 
 msgid ""
 "Zeroconf-enabled repositories will be announced in a network without\n"
 "the need to configure a server or a service. They can be discovered\n"
 "without knowing their actual IP address."
 msgstr ""
 
 msgid ""
 "To allow other people to discover your repository using run\n"
 ":hg:`serve` in your repository::"
 msgstr ""
 
 msgid ""
 "  $ cd test\n"
 "  $ hg serve"
 msgstr ""
+"  $ cd test\n"
+"  $ hg serve"
 
 msgid ""
 "You can discover Zeroconf-enabled repositories by running\n"
 ":hg:`paths`::"
 msgstr ""
+"Si possono scoprire repository abilitati a Zeroconf eseguendo\n"
+":hg:`paths`::"
 
 msgid ""
 "  $ hg paths\n"
 "  zc-test = http://example.com:8000/test\n"
 msgstr ""
+"  $ hg paths\n"
+"  zc-test = http://example.com:8000/test\n"
 
 msgid "archive prefix contains illegal components"
-msgstr ""
+msgstr "il prefisso dell'archivio contiene componenti non consentite"
 
 msgid "cannot give prefix when archiving to files"
-msgstr ""
+msgstr "impossibile fornire un prefisso durante l'archiviazione dei file"
 
 #, python-format
 msgid "unknown archive type '%s'"
-msgstr ""
+msgstr "tipo di archivio '%s' sconosciuto"
+
+msgid "archiving"
+msgstr "archiviazione"
+
+#, python-format
+msgid "bookmark '%s' contains illegal character"
+msgstr "il segnalibro '%s' contiene caratteri non consentiti"
+
+msgid "searching for changed bookmarks\n"
+msgstr "sto cercando segnalibri modificati\n"
+
+msgid "no changed bookmarks found\n"
+msgstr "non è stato trovato alcun segnalibro modificato\n"
 
 msgid "invalid changegroup"
-msgstr ""
+msgstr "changegroup invalido"
 
 msgid "unknown parent"
-msgstr ""
+msgstr "genitore sconosciuto"
 
 #, 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 ""
+msgstr "controllo di integrità fallito su %s:%d"
 
 msgid "cannot create new bundle repository"
-msgstr ""
-
-#, python-format
-msgid "premature EOF reading chunk (got %d bytes, expected %d)"
-msgstr ""
-
-#, fuzzy
+msgstr "impossibile creare un nuovo repository bundle"
+
+#, python-format
+msgid "stream ended unexpectedly (got %d bytes, expected %d)"
+msgstr "flusso terminato in maniera inattesa (%d byte, attesi %d)"
+
+#, python-format
+msgid "invalid chunk length %d"
+msgstr "lunghezza del chunk invalida %d"
+
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s: non è un bundle di Mercurial"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: versione di bundle sconosciuta %s"
+
 msgid "empty username"
-msgstr "stringa vuota\n"
+msgstr "username vuoto"
 
 #, python-format
 msgid "username %s contains a newline"
-msgstr ""
+msgstr "il nome utente %s contiene un carattere di nuova riga"
 
 #, python-format
 msgid "the name '%s' is reserved"
 msgstr "il nome '%s' è riservato"
 
 msgid "options --message and --logfile are mutually exclusive"
 msgstr ""
 
 #, python-format
 msgid "can't read commit message '%s': %s"
 msgstr ""
 
 msgid "limit must be a positive integer"
-msgstr ""
+msgstr "limit dev'essere un intero positivo "
 
 msgid "limit must be positive"
-msgstr ""
-
-msgid "too many revisions specified"
-msgstr ""
+msgstr "limit dev'essere positivo"
 
 #, python-format
 msgid "invalid format spec '%%%s' in output filename"
 msgstr ""
 
 #, python-format
 msgid "adding %s\n"
-msgstr ""
+msgstr "aggiunta in corso di %s\n"
 
 #, 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 has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+
+#, python-format
 msgid "%s: not copying - file is not managed\n"
-msgstr ""
+msgstr "%s: non copio - il file non è gestito\n"
 
 #, python-format
 msgid "%s: not copying - file has been marked for remove\n"
-msgstr ""
+msgstr "%s: non copio - il file è stato rimosso per la rimozione\n"
 
 #, python-format
 msgid "%s: not overwriting - %s collides with %s\n"
-msgstr ""
+msgstr "%s: non sovrascrivo - %s collide con %s\n"
 
 #, python-format
 msgid "%s: not overwriting - file exists\n"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "%s: non sovrascrivo - il file esiste\n"
+
+#, python-format
 msgid "%s: not recording move - %s does not exist\n"
-msgstr "il nodo %s:%d non esiste\n"
-
-#, fuzzy, python-format
+msgstr "%s: non registro la rinomina - %s non esiste\n"
+
+#, python-format
 msgid "%s: not recording copy - %s does not exist\n"
-msgstr "il nodo %s:%d non esiste\n"
+msgstr "%s: non registro la copia - %s non esiste\n"
 
 #, python-format
 msgid "%s: deleted in working copy\n"
-msgstr ""
+msgstr "%s: rimosso nella copia di lavoro\n"
 
 #, 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 ""
@@ -5871,27 +6108,31 @@ msgstr "la destinazione %s non è una directory"
 
 msgid "no files to copy"
 msgstr "nessun file da copiare"
 
 msgid "(consider using --after)\n"
 msgstr "(considera di usare --after)\n"
 
 msgid "child process failed to start"
-msgstr ""
+msgstr "avvio fallito del processo figlio"
 
 #, 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 "bookmark:    %s\n"
+msgstr "segnalibro:    %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
@@ -5947,128 +6188,146 @@ msgstr "revisione corrispondente alla da
 
 #, python-format
 msgid "cannot follow nonexistent file: \"%s\""
 msgstr "impossibile seguire il file non esistente: \"%s\""
 
 msgid "can only follow copies/renames for explicit filenames"
 msgstr ""
 
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr "sto saltando il subrepository mancante: %s\n"
+
 msgid "HG: Enter commit message.  Lines beginning with 'HG:' are removed."
 msgstr ""
+"HG: Inserisci il messaggio di commit. Le linee che iniziano HG: con 'HG:' "
+"vengono rimosse."
 
 msgid "HG: Leave message empty to abort commit."
-msgstr ""
+msgstr "HG: Lasciare il messaggio vuoto per abortire il commit."
 
 #, python-format
 msgid "HG: user: %s"
 msgstr "HG: utente: %s"
 
 msgid "HG: branch merge"
-msgstr ""
+msgstr "HG: branch merge"
 
 #, python-format
 msgid "HG: branch '%s'"
-msgstr ""
+msgstr "HG: branch '%s'"
 
 #, python-format
 msgid "HG: subrepo %s"
 msgstr "HG: subrepository %s"
 
 #, python-format
 msgid "HG: added %s"
-msgstr ""
+msgstr "HG: aggiunto %s"
 
 #, python-format
 msgid "HG: changed %s"
 msgstr "HG: cambiato %s"
 
 #, python-format
 msgid "HG: removed %s"
 msgstr "HG: rimosso %s"
 
 msgid "HG: no files changed"
 msgstr "HG: nessun file modificato"
 
 msgid "empty commit message"
 msgstr "messaggio di commit vuoto"
 
 msgid "add the specified files on the next commit"
-msgstr ""
+msgstr "aggiunge i file specificati al prossimo commit"
 
 msgid ""
 "    Schedule files to be version controlled and added to the\n"
 "    repository."
 msgstr ""
-
-#, fuzzy
+"    Pianifica i file che devono essere versionati e aggiunti\n"
+"    al repository"
+
 msgid ""
 "    The files will be added to the repository at the next commit. To\n"
 "    undo an add before that, see :hg:`forget`."
 msgstr ""
-"    Questo trova tutte le modifiche dal repository al percorso o URL "
-"specificato\n"
-"    e le aggiunge al repository locale."
+"    I file saranno aggiunti al repository al prossimo commit. Per\n"
+"    annullare prima un aggiunta, vedere :hg:`forget`."
 
 msgid "    If no names are given, add all files to the repository."
-msgstr ""
+msgstr "    Se non vengono forniti nomi, aggiunge tutti i file al repository."
 
 msgid "    .. container:: verbose"
-msgstr ""
+msgstr "    .. contenitore:: verboso"
 
 msgid ""
 "       An example showing how new (unknown) files are added\n"
 "       automatically by :hg:`add`::"
 msgstr ""
+"       Un esempio che mostra come file nuovi (sconosciuti) vengono \n"
+"       aggiunti automaticamente da :hg:`add`::"
 
 msgid ""
 "         $ ls\n"
 "         foo.c\n"
 "         $ hg status\n"
 "         ? foo.c\n"
 "         $ hg add\n"
 "         adding foo.c\n"
 "         $ hg status\n"
 "         A foo.c"
 msgstr ""
+"         $ ls\n"
+"         foo.c\n"
+"         $ hg status\n"
+"         ? foo.c\n"
+"         $ hg add\n"
+"         adding foo.c\n"
+"         $ hg status\n"
+"         A foo.c"
 
 msgid ""
 "    Returns 0 if all files are successfully added.\n"
 "    "
 msgstr ""
+"    Restituisce 0 se tutti i file sono stati aggiunti con successo.\n"
+"    "
 
 msgid "add all new files, delete all missing files"
-msgstr ""
+msgstr "aggiunge tutti i nuovi file, cancella tuitti i file mancanti"
 
 msgid ""
 "    Add all new files and remove all missing files from the\n"
 "    repository."
 msgstr ""
 
 msgid ""
 "    New files are ignored if they match any of the patterns in\n"
-"    .hgignore. As with add, these changes take effect at the next\n"
+"    ``.hgignore``. As with add, these changes take effect at the next\n"
 "    commit."
 msgstr ""
 
 msgid ""
 "    Use the -s/--similarity option to detect renamed files. With a\n"
 "    parameter greater than 0, this compares every removed file with\n"
 "    every added file and records those similar enough as renames. This\n"
 "    option takes a percentage between 0 (disabled) and 100 (files must\n"
 "    be identical) as its parameter. Detecting renamed files this way\n"
 "    can be expensive. After using this option, :hg:`status -C` can be\n"
 "    used to check which files were identified as moved or renamed."
 msgstr ""
 
 msgid "similarity must be a number"
-msgstr ""
+msgstr "similarity dev'essere un numero"
 
 msgid "similarity must be between 0 and 100"
-msgstr ""
+msgstr "similarity dev'essere compreso tra 0 e 100"
 
 msgid "show changeset information by line for each file"
 msgstr ""
 
 msgid ""
 "    List changes in files, showing the revision id responsible for\n"
 "    each line"
 msgstr ""
@@ -6080,30 +6339,25 @@ msgstr ""
 
 msgid ""
 "    Without the -a/--text option, annotate will avoid processing files\n"
 "    it detects as binary. With -a, annotate will annotate the file\n"
 "    anyway, although the results will probably be neither useful\n"
 "    nor desirable."
 msgstr ""
 
-msgid ""
-"    Returns 0 on success.\n"
-"    "
-msgstr ""
-
 msgid "at least one filename or pattern is required"
-msgstr ""
+msgstr "è richiesto almeno un nome di file o pattern"
 
 msgid "at least one of -n/-c is required for -l"
 msgstr ""
 
 #, python-format
 msgid "%s: binary file\n"
-msgstr ""
+msgstr "%s: è un file binario\n"
 
 msgid "create an unversioned archive of a repository revision"
 msgstr ""
 
 msgid ""
 "    By default, the revision used is the parent of the working\n"
 "    directory; use -r/--rev to specify a different revision."
 msgstr ""
@@ -6141,89 +6395,85 @@ msgid "no working directory: please spec
 msgstr ""
 
 msgid "repository root cannot be destination"
 msgstr ""
 
 msgid "cannot archive plain files to stdout"
 msgstr ""
 
-#, fuzzy
 msgid "reverse effect of earlier changeset"
 msgstr "inverte l'effetto di un changeset precedente"
 
-#, fuzzy
-msgid ""
-"    Commit the backed out changes as a new changeset. The new\n"
-"    changeset is a child of the backed out changeset."
-msgstr ""
-"    Effettua il commit delle modifiche di cui si è fatto backout\n"
-"    come nuovo changeset. Il nuovo changeset è un figlio del\n"
-"    changeset di cui si è fatto backout."
-
-#, fuzzy
-msgid ""
-"    If you backout a changeset other than the tip, a new head is\n"
-"    created. This head will be the new tip and you should merge this\n"
-"    backout changeset with another head."
-msgstr ""
-"    Se si fa il backout di un changeset diverso da tip, viene creata\n"
-"    una nuova head. Questa sarà la nuova tip e si dovrebbe fare il\n"
-"    merge di questo changeset di backout con un'altra head\n"
-"    (attualmente una di default)."
-
-#, fuzzy
-msgid ""
-"    The --merge option remembers the parent of the working directory\n"
-"    before starting the backout, then merges the new head with that\n"
-"    changeset afterwards. This saves you from doing the merge by hand.\n"
-"    The result of this merge is not committed, as with a normal merge."
-msgstr ""
-"    L'opzione --merge ricorda il genitore della directory di lavoro\n"
-"    prima di avviare il backout, poi fa il merge della nuova head con\n"
-"    quel changeset. Questo evita di fare il merge a mano. Non viene\n"
-"    effettuato il commit del risultato di questo merge, come per un\n"
-"    merge normale."
+msgid ""
+"    Prepare a new changeset with the effect of REV undone in the\n"
+"    current working directory."
+msgstr ""
+"    Prepara un nuovo changeset con l'effetto dell'annullamento\n"
+"    di REV nella directory di lavoro corrente."
+
+msgid ""
+"    If REV is the parent of the working directory, then this new changeset\n"
+"    is committed automatically. Otherwise, hg needs to merge the\n"
+"    changes and the merged result is left uncommitted."
+msgstr ""
+"    Se REV è il genitore della copia di lavoro, allore di questo nuovo\n"
+"    changeset viene fatto il commit automatico. Altrimenti, hg necessita\n"
+"    di effettuare il merge delle modifiche e del risultato del merge non\n"
+"    viene effettuato il commit."
+
+msgid ""
+"    By default, the pending changeset will have one parent,\n"
+"    maintaining a linear history. With --merge, the pending changeset\n"
+"    will instead have two parents: the old parent of the working\n"
+"    directory and a new child of REV that simply undoes REV."
+msgstr ""
+"    Di default, il changeset in attesa avrà un solo genitore,\n"
+"    mantenendo una storia lineare. Con --merge, il changeset in attesa\n"
+"    avrà invece due genitori: il vecchio genitore della directory di\n"
+"    lavoro e un nuovo figlio di REV che semplicemente annulla REV."
+
+msgid ""
+"    Before version 1.7, the behavior without --merge was equivalent to\n"
+"    specifying --merge followed by :hg:`update --clean .` to cancel\n"
+"    the merge and leave the child of REV as a head to be merged\n"
+"    separately."
+msgstr ""
 
 msgid "please specify just one revision"
-msgstr ""
+msgstr "si prega di specificare solo una revisione"
 
 msgid "please specify a revision to backout"
-msgstr ""
+msgstr "si prega di specificare una revisione di cui effettuare il backout"
 
 msgid "cannot backout change on a different branch"
 msgstr ""
+"impossibile effettuare il backout di modifiche su una branch differente"
 
 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 ""
+msgstr "%s non è un genitore di %s"
 
 msgid "cannot use --parent on non-merge changeset"
 msgstr ""
 
 #, python-format
 msgid "changeset %s backs out changeset %s\n"
 msgstr ""
 
 #, python-format
 msgid "merging with changeset %s\n"
 msgstr "sto effettuando il merge con il changeset %s\n"
 
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr ""
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr ""
-
 msgid "subdivision search of changesets"
 msgstr ""
 
 msgid ""
 "    This command helps to find changesets which introduce problems. To\n"
 "    use, mark the earliest changeset you know exhibits the problem as\n"
 "    bad, then mark the latest changeset which is free from the problem\n"
 "    as good. Bisect will update your working directory to a revision\n"
@@ -6241,23 +6491,27 @@ msgstr ""
 msgid ""
 "    If you supply a command, it will be used for automatic bisection.\n"
 "    Its exit status will be used to mark revisions as good or bad:\n"
 "    status 0 means good, 125 means to skip the revision, 127\n"
 "    (command not found) will abort the bisection, and any other\n"
 "    non-zero exit status means the revision is bad."
 msgstr ""
 
-#, fuzzy
 msgid "The first good revision is:\n"
-msgstr "La prima revisione %s è:\n"
-
-#, fuzzy
+msgstr "La prima revisione buona è:\n"
+
 msgid "The first bad revision is:\n"
-msgstr "La prima revisione %s è:\n"
+msgstr "La prima revisione errata è:\n"
+
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
 
 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)"
@@ -6283,16 +6537,66 @@ msgstr "%s ucciso"
 #, python-format
 msgid "Changeset %d:%s: %s\n"
 msgstr "Changeset %d:%s: %s\n"
 
 #, python-format
 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
 msgstr ""
 
+msgid "track a line of development with movable markers"
+msgstr "segui una linea di sviluppo con puntatori mobili"
+
+msgid ""
+"    Bookmarks are pointers to certain commits that move when\n"
+"    committing. Bookmarks are local. They can be renamed, copied and\n"
+"    deleted. It is possible to use bookmark names in :hg:`merge` and\n"
+"    :hg:`update` to merge and update respectively to a given bookmark."
+msgstr ""
+
+msgid ""
+"    You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
+"    directory's parent revision with the given name. If you specify\n"
+"    a revision using -r REV (where REV may be an existing bookmark),\n"
+"    the bookmark is assigned to that revision."
+msgstr ""
+
+msgid ""
+"    Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+"    push` and :hg:`help pull`). This requires both the local and remote\n"
+"    repositories to support bookmarks. For versions prior to 1.8, this "
+"means\n"
+"    the bookmarks extension must be enabled.\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 "bookmark names cannot consist entirely of whitespace"
+msgstr "il nome di un segnalibro non può consistere interamente di whitespace"
+
+msgid "a bookmark cannot have the name of an existing branch"
+msgstr "un segnalibro non può avere lo stesso nome di una branch esistente"
+
+msgid "no bookmarks set\n"
+msgstr ""
+
 msgid "set or show the current branch name"
 msgstr ""
 
 msgid ""
 "    With no argument, show the current branch name. With one argument,\n"
 "    set the working directory branch name (the branch will not exist\n"
 "    in the repository until the next commit). Standard practice\n"
 "    recommends that primary development take place on the 'default'\n"
@@ -6390,19 +6694,18 @@ msgid ""
 "    permissions, copy/rename information, and revision history."
 msgstr ""
 
 msgid ""
 "    Returns 0 on success, 1 if no changes found.\n"
 "    "
 msgstr ""
 
-#, fuzzy
 msgid "--base is incompatible with specifying a destination"
-msgstr "un changeset base da specificare invece di una destinazione"
+msgstr "--base è incompatibile con la selezione di una destinazione"
 
 msgid "unknown bundle type specified with --type"
 msgstr ""
 
 msgid "output the current or given revision of files"
 msgstr ""
 
 msgid ""
@@ -6431,30 +6734,31 @@ msgstr ""
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
 "    basename of the source."
 msgstr ""
 
 msgid ""
 "    The location of the source is added to the new repository's\n"
-"    .hg/hgrc file, as the default to be used for future pulls."
-msgstr ""
-
-#, fuzzy
+"    ``.hg/hgrc`` file, as the default to be used for future pulls."
+msgstr ""
+
 msgid "    See :hg:`help urls` for valid source format details."
 msgstr ""
-"    Vedere pull per dettagli sui formati di sorgenti validi.\n"
-"    "
+"    Vedere :hg:`help urls` per dettagli sui formati validi per la sorgente."
 
 msgid ""
 "    It is possible to specify an ``ssh://`` URL as the destination, but no\n"
-"    .hg/hgrc and working directory will be created on the remote side.\n"
+"    ``.hg/hgrc`` and working directory will be created on the remote side.\n"
 "    Please see :hg:`help urls` for important details about ``ssh://`` URLs."
 msgstr ""
+"    E' possibile specificare un URL ``ssh://`` come destinazione, ma sul\n"
+"    sistema remoto non verranno creati ``.hg/hgrc`` nè directory di lavoro.\n"
+"    Vedere :hg:`help urls` per dettagli importanti sugli URL ``ssh://``."
 
 msgid ""
 "    A set of changesets (tags, or branch names) to pull may be specified\n"
 "    by listing each changeset (tag, or branch name) with -r/--rev.\n"
 "    If -r/--rev is used, the cloned repository will contain only a subset\n"
 "    of the changesets of the source repository. Only the set of changesets\n"
 "    defined by all -r/--rev options (including all their ancestors)\n"
 "    will be pulled into the destination repository.\n"
@@ -6506,55 +6810,53 @@ msgid ""
 "       latest head of that branch)\n"
 "    d) the changeset specified with -r\n"
 "    e) the tipmost head specified with -b\n"
 "    f) the tipmost head specified with the url#branch source syntax\n"
 "    g) the tipmost head of the default branch\n"
 "    h) tip"
 msgstr ""
 
-#, fuzzy
 msgid "cannot specify both --noupdate and --updaterev"
-msgstr "non è possibile specificare sia una revisione sia una base"
-
-#, fuzzy
+msgstr "impossibile selezionare sia --noupdate sia --updaterev"
+
 msgid "commit the specified files or all outstanding changes"
 msgstr ""
-"effettua il commit dei file specificati o di tutte le modifiche pendenti"
-
-#, fuzzy
+"effettua il commit dei file selezionati o di tutte le modifiche in attesa"
+
 msgid ""
 "    Commit changes to the given files into the repository. Unlike a\n"
-"    centralized RCS, this operation is a local operation. See\n"
+"    centralized SCM, this operation is a local operation. See\n"
 "    :hg:`push` for a way to actively distribute your changes."
-msgstr "    Effettua il commit delle modifiche sui file dati nel repository."
-
-#, fuzzy
+msgstr ""
+"    Effettua il commit nel repository delle modifiche ai file selezionati.\n"
+"    A differenza di un SCM centralizzato, questa operazione è una\n"
+"    operazione locale. Vedere :hg:`push` per un modo per distribuire\n"
+"    attivamente le tue modifiche."
+
 msgid ""
 "    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be committed."
 msgstr ""
-"    Se si omette un elenco di file, si farà il commit di tutte le\n"
-"    modifiche riportate da \"hg status\"."
-
-#, fuzzy
+"    Se un elenco di file viene omesso, verrà effettuato il commit di\n"
+"    tutte le modifiche riportate da :hg:`status`."
+
 msgid ""
 "    If you are committing the result of a merge, do not provide any\n"
 "    filenames or -I/-X filters."
 msgstr ""
 "    Se si sta effettuando il commit del risultato di un merge, non\n"
 "    fornire nessun nome di file o filtri -I/-X."
 
-#, fuzzy
-msgid ""
-"    If no commit message is specified, the configured editor is\n"
-"    started to prompt you for a message."
-msgstr ""
-"    Se non è specificato nessun messaggio di commit, l'editor\n"
-"    configurato viene lanciato per inserire un messaggio."
+msgid ""
+"    If no commit message is specified, Mercurial starts your\n"
+"    configured editor where you can enter a message. In case your\n"
+"    commit fails, you will find a backup of your message in\n"
+"    ``.hg/last-message.txt``."
+msgstr ""
 
 msgid ""
 "    Returns 0 on success, 1 if nothing changed.\n"
 "    "
 msgstr ""
 
 msgid "can only close branch heads"
 msgstr ""
@@ -6638,46 +6940,43 @@ msgid ""
 "current\n"
 "       node, or\n"
 "     - the name of a local tag you placed earlier using \":tag\", or\n"
 "     - empty to denote the default parent."
 msgstr ""
 
 msgid ""
 "    All string valued-elements are either strictly alphanumeric, or must\n"
-"    be enclosed in double quotes (\"...\"), with \"\" as escape character."
+"    be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
 msgstr ""
 
 msgid ""
 "    Note that the --overwritten-file and --appended-file options imply the\n"
 "    use of \"HGMERGE=internal:local\" during DAG buildup.\n"
 "    "
 msgstr ""
 
 msgid "need at least one of -m, -a, -o, -n"
 msgstr ""
 
-#, fuzzy
 msgid "repository is not empty"
-msgstr "repository %s non trovato"
-
-#, fuzzy, python-format
+msgstr "il repository non è vuoto"
+
+#, python-format
 msgid "%s command %s"
-msgstr "comandi base:"
-
-#, fuzzy
+msgstr "%s comando %s"
+
 msgid "list all available commands and options"
-msgstr "mostra le opzioni dei comandi"
+msgstr "elenca tutti comandi disponibili e le relative opzioni"
 
 msgid "returns the completion list associated with the given command"
 msgstr "restituisce l'elenco di completamento associato al dato comando"
 
-#, fuzzy
 msgid "show information detected about current filesystem"
-msgstr "mostra solo i file rimossi (ma tracciati)"
+msgstr "mostra le informazioni rilevare del filesystem corrente"
 
 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
@@ -6715,19 +7014,19 @@ msgid ""
 "    items with matching section names."
 msgstr ""
 
 msgid ""
 "    With --debug, the source (filename and line number) is printed\n"
 "    for each config item."
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "read config from: %s\n"
-msgstr "opzione --config malformata: %s"
+msgstr "lettura delle configurazioni da: %s\n"
 
 msgid "only one config item permitted"
 msgstr ""
 
 msgid "access the pushkey key/value protocol"
 msgstr ""
 
 msgid "    With two args, list the keys in the given namespace."
@@ -6760,55 +7059,66 @@ msgstr ""
 msgid "format the changelog or an index DAG as a concise textual description"
 msgstr ""
 
 msgid ""
 "    If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
 "    revision numbers, they get labelled in the output as rN."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    Otherwise, the changelog DAG of the current repo is emitted.\n"
 "    "
 msgstr ""
-"    Stampa la directory radice del repository corrente.\n"
+"    Altrimenti, viene mostrato il DAG dei changelog del repository\n"
+"    corrente.\n"
 "    "
 
 msgid "need repo for changelog dag"
 msgstr ""
 
 msgid "dump the contents of a data file revision"
 msgstr ""
 
 #, python-format
 msgid "invalid revision identifier %s"
 msgstr ""
 
 msgid "parse and display a date"
 msgstr ""
 
+msgid "display the combined ignore pattern"
+msgstr ""
+
+msgid "no ignore patterns found"
+msgstr ""
+
 msgid "dump the contents of an index file"
 msgstr ""
 
+#, python-format
+msgid "unknown format %d"
+msgstr "formato sconosciuto %d"
+
 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 ""
+#, python-format
+msgid "Checking installed modules (%s)...\n"
+msgstr "Sto controllando i moduli installati (%s)...\n"
 
 msgid " One or more extensions could not be found"
 msgstr ""
 
 msgid " (check that you compiled the extensions)\n"
 msgstr ""
 
 msgid "Checking templates...\n"
@@ -6826,42 +7136,45 @@ 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"
+"Please check your configuration file)\n"
 msgstr ""
 
 msgid ""
 " Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/bts/\n"
-msgstr ""
+"selenic.com/wiki/BugTracker\n"
+msgstr ""
+" Fallimento del patcher interno, si prega di segnalare questo errore a "
+"http://mercurial.selenic.com/wiki/BugTracker\n"
 
 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"
+msgid " (specify a commit editor in your configuration file)\n"
+msgstr ""
+" (specificare un editor per il commit nel proprio file di configurazione)\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 " (specify a username in your configuration file)\n"
+msgstr " (specificare un nome utente nel proprio file di configurazione)\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"
 
@@ -6884,19 +7197,20 @@ msgstr ""
 
 msgid "    Show differences between revisions for the specified files."
 msgstr ""
 
 msgid "    Differences between files are shown using the unified diff format."
 msgstr ""
 
 msgid ""
-"    NOTE: diff may generate unexpected results for merges, as it will\n"
-"    default to comparing against the working directory's first parent\n"
-"    changeset if no revisions are specified."
+"    .. note::\n"
+"       diff may generate unexpected results for merges, as it will\n"
+"       default to comparing against the working directory's first\n"
+"       parent changeset if no revisions are specified."
 msgstr ""
 
 msgid ""
 "    Alternatively you can specify -c/--change with a revision to see\n"
 "    the changes in that changeset relative to its first parent."
 msgstr ""
 
 msgid ""
@@ -6918,53 +7232,54 @@ msgstr ""
 
 msgid ""
 "    The information shown in the changeset header is: author, date,\n"
 "    branch name (if non-default), changeset hash, parent(s) and commit\n"
 "    comment."
 msgstr ""
 
 msgid ""
-"    NOTE: export may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only."
-msgstr ""
+"    .. note::\n"
+"       export may generate unexpected diff output for merge\n"
+"       changesets, as it will compare the merge changeset against its\n"
+"       first parent only."
+msgstr ""
+"    .. nota::\n"
+"       l'export potrebbe generare un diff inatteso per changeset di \n"
+"       merge, dal momento che confronterà tali changeset solo con\n"
+"       il loro primo genitore."
 
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are as follows:"
 msgstr ""
 
 msgid ""
 "    :``%%``: literal \"%\" character\n"
-"    :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+"    :``%H``: changeset hash (40 hexadecimal digits)\n"
 "    :``%N``: number of patches being generated\n"
 "    :``%R``: changeset revision number\n"
 "    :``%b``: basename of the exporting repository\n"
-"    :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+"    :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
 "    :``%n``: zero-padded sequence number, starting at 1\n"
 "    :``%r``: zero-padded changeset revision number"
 msgstr ""
 
 msgid ""
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
 "    diff anyway, probably with undesirable results."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
 "    format. See :hg:`help diffs` for more information."
 msgstr ""
-"    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"
-"    "
+"    Usa l'opzione --git per generare diff nel formato diff esteso\n"
+"    git. Vedere :hg:`help diffs` per maggiori informazioni."
 
 msgid ""
 "    With the --switch-parent option, the diff will be against the\n"
 "    second parent. It can be useful to review a merge."
 msgstr ""
 
 msgid "export requires at least one changeset"
 msgstr ""
@@ -6990,19 +7305,19 @@ msgid ""
 msgstr ""
 
 msgid "    To undo a forget before the next commit, see :hg:`add`."
 msgstr ""
 
 msgid "no files specified"
 msgstr "nessun file specificato"
 
-#, fuzzy, python-format
+#, python-format
 msgid "not removing %s: file is already untracked\n"
-msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
+msgstr "%s non rimosso: il file non viene già tracciato\n"
 
 msgid "search for a pattern in specified files and revisions"
 msgstr ""
 
 msgid "    Search revisions of files for a regular expression."
 msgstr ""
 
 msgid ""
@@ -7027,19 +7342,18 @@ msgstr ""
 
 #, python-format
 msgid "grep: invalid match pattern: %s\n"
 msgstr ""
 
 msgid "show current repository heads or show branch heads"
 msgstr ""
 
-#, fuzzy
 msgid "    With no arguments, show all repository branch heads."
-msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
+msgstr "    Senza argomenti mostra tutte le teste dei branch del repository."
 
 msgid ""
 "    Repository \"heads\" are changesets with no child changesets. They are\n"
 "    where development generally takes place and are the usual targets\n"
 "    for update and merge operations. Branch heads are changesets that have\n"
 "    no child changeset on the same branch."
 msgstr ""
 
@@ -7064,34 +7378,33 @@ msgid ""
 "    changesets without children will be shown."
 msgstr ""
 
 msgid ""
 "    Returns 0 if matching heads are found, 1 if not.\n"
 "    "
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "no open branch heads found on branches %s"
-msgstr "svn: la branch non ha nessuna revisione %s"
-
-#, fuzzy, python-format
+msgstr "nessuna testa di branch aperta trovata sui branch %s"
+
+#, python-format
 msgid " (started at %s)"
-msgstr " (default: %s)"
-
-#, fuzzy
+msgstr " (iniziato a %s)"
+
 msgid "show help for a given topic or a help overview"
 msgstr "mostra l'aiuto per un dato argomento o una panoramica d'aiuto"
 
-#, fuzzy
 msgid ""
 "    With no arguments, print a list of commands with short help messages."
-msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
-
-#, fuzzy
+msgstr ""
+"    Senza argomenti stampa un elenco dei comandi ed un breve\n"
+"    messaggio d'aiuto."
+
 msgid ""
 "    Given a topic, extension, or command name, print help for that\n"
 "    topic."
 msgstr ""
 "    Dato un argomento, estensione o nome di comando, stampa l'aiuto\n"
 "    per tale argomento."
 
 msgid ""
@@ -7106,18 +7419,20 @@ msgid "use \"hg help\" for the full list
 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"
+msgid "use \"hg -v help%s\" to show builtin aliases and global options"
+msgstr ""
+"usare \"hg -v help%s\" per mostrare gli alias predefiniti e le opzioni "
+"globali"
 
 #, python-format
 msgid "use \"hg -v help %s\" to show global options"
 msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali"
 
 msgid "list of commands:"
 msgstr "elenco dei comandi:"
 
@@ -7127,64 +7442,68 @@ msgid ""
 "aliases: %s\n"
 msgstr ""
 "\n"
 "alias: %s\n"
 
 msgid "(no help text available)"
 msgstr "(nessun testo di aiuto disponibile)"
 
-#, fuzzy, python-format
+#, python-format
+msgid "shell alias for::"
+msgstr "alias shell per::"
+
+#, python-format
+msgid "    %s"
+msgstr ""
+
+#, python-format
 msgid "alias for: hg %s"
-msgstr ""
-"\n"
-"alias: %s\n"
+msgstr "alias per: hg %s"
 
 #, python-format
 msgid "%s"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "use \"hg -v help %s\" to show verbose help\n"
-msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali"
+msgstr ""
+"\n"
+"usare \"hg -v help %s\" per mostrare l'aiuto più esteso\n"
 
 msgid "options:\n"
 msgstr "opzioni:\n"
 
 msgid "no commands defined\n"
 msgstr "nessun comando definito\n"
 
 msgid "no help text available"
 msgstr "nessun testo di aiuto disponibile"
 
-#, fuzzy, python-format
+#, python-format
 msgid "%s extension - %s"
-msgstr "estensione %s - %s\n"
+msgstr "estensione %s - %s"
 
 msgid "use \"hg help extensions\" for information on enabling extensions\n"
 msgstr ""
 
 #, python-format
 msgid "'%s' is provided by the following extension:"
 msgstr ""
 
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial SCM Distribuito\n"
 
 msgid "basic commands:"
 msgstr "comandi base:"
 
-#, fuzzy
 msgid "enabled extensions:"
-msgstr ""
-"\n"
-"estensioni abilitate:\n"
-"\n"
+msgstr "estensioni abilitate:"
 
 msgid "VALUE"
 msgstr ""
 
 msgid "DEPRECATED"
 msgstr ""
 
 msgid ""
@@ -7194,464 +7513,299 @@ msgstr ""
 
 msgid ""
 "\n"
 "additional help topics:"
 msgstr ""
 "\n"
 "argomenti di aiuto aggiuntivi:"
 
-#, fuzzy
 msgid "identify the working copy or specified revision"
 msgstr "identifica la copia di lavoro o una revisione specifica"
 
-#, fuzzy
 msgid ""
 "    With no revision, print a summary of the current state of the\n"
 "    repository."
 msgstr ""
-"    Con nessuna revisione, stampa un sommario dello stato corrente del\n"
+"    Senza revisioni, stampa un sommario dello stato corrente del\n"
 "    repository."
 
-#, fuzzy
 msgid ""
 "    Specifying a path to a repository root or Mercurial bundle will\n"
 "    cause lookup to operate on that repository/bundle."
-msgstr "    Con un percorso, effettua una ricerca in un altro repository."
-
-#, fuzzy
+msgstr ""
+"    Specificando un percorso alla root di un repository o un\n"
+"    bundle Mercurial si effettuerà la ricerca su tale repository/bundle."
+
 msgid ""
 "    This summary identifies the repository state using one or two\n"
 "    parent hash identifiers, followed by a \"+\" if there are\n"
 "    uncommitted changes in the working directory, a list of tags for\n"
 "    this revision and a branch name for non-default branches."
 msgstr ""
 "    Questo sommario identifica lo stato del repository usando uno o\n"
-"    due hash dei genitori, seguito da un \"+\" se ci sono modifiche di\n"
-"    cui non si è eseguito il commit nella directory di lavoro, un\n"
-"    elenco di tag per questa revisione e un nome di branch per branch\n"
-"    non-default.\n"
-"    "
-
-#, fuzzy
+"    due identificatori hash genitori, seguito da un \"+\" se ci sono \n"
+"    modifiche di cui non si è eseguito il commit nella directory di \n"
+"    lavoro, un elenco di tag per questa revisione e un nome di branch\n"
+"    per branch non-default.    "
+
+msgid "can't query remote revision number, branch, tags, or bookmarks"
+msgstr ""
+
 msgid "import an ordered set of patches"
 msgstr "importa un insieme ordinato di patch"
 
-#, fuzzy
 msgid ""
 "    Import a list of patches and commit them individually (unless\n"
 "    --no-commit is specified)."
 msgstr ""
 "    Importa un elenco di patch e ne effettua il commit\n"
-"    individualmente."
-
-#, fuzzy
+"    individualmente (a meno che non venga specificato --no-commit)."
+
 msgid ""
 "    If there are outstanding changes in the working directory, import\n"
 "    will abort unless given the -f/--force flag."
 msgstr ""
 "    Se ci sono modifiche pendenti nella directory di lavoro,\n"
-"    l'importazione abortirà a meno che non si usi il flag -f."
-
-#, fuzzy
+"    l'importazione abortirà a meno che non si usi il flag -f/--force."
+
 msgid ""
 "    You can import a patch straight from a mail message. Even patches\n"
 "    as attachments work (to use the body part, it must have type\n"
 "    text/plain or text/x-patch). From and Subject headers of email\n"
 "    message are used as default committer and commit message. All\n"
 "    text/plain body parts before first diff are added to commit\n"
 "    message."
 msgstr ""
 "    E' possibile importare una patch direttamente da un messaggio\n"
 "    mail. Anche le patch come allegato funzionano (il corpo deve\n"
-"    essere di tipo text/plain o deve essere usato text/x-patch). Le\n"
-"    intestazioni Da e Soggetto della mail sono usate come committente\n"
+"    essere di tipo text/plain o text/x-patch). Le intestazioni Da e \n"
+"    Soggetto della mail sono usate come autore del commit\n"
 "    e messaggio di commit di default. Tutte le parti del corpo\n"
 "    text/plain antecedenti il primo diff sono aggiunte al messaggio di\n"
 "    commit."
 
-#, fuzzy
 msgid ""
 "    If the imported patch was generated by :hg:`export`, user and\n"
 "    description from patch override values from message headers and\n"
 "    body. Values given on command line with -m/--message and -u/--user\n"
 "    override these."
 msgstr ""
-"    Se la patch importata è stata generata da hg export, l'utente e la\n"
-"    descrizione dalla patch rimpiazzano i valori dal corpo e\n"
-"    dall'intestazione del messaggio. I valori forniti dalla riga di\n"
-"    comando con -m e -u rimpiazzano questi."
-
-#, fuzzy
+"    Se la patch importata è stata generata da :hg:`export`, l'utente e la\n"
+"    descrizione dalla patch rimpiazzano i valori del corpo e\n"
+"    dell'intestazione del messaggio. I valori forniti dalla riga di\n"
+"    comando con -m/--message e -u/--user rimpiazzano questi."
+
 msgid ""
 "    If --exact is specified, import will set the working directory to\n"
 "    the parent of each patch before applying it, and will abort if the\n"
 "    resulting changeset has a different ID than the one recorded in\n"
 "    the patch. This may happen due to character set problems or other\n"
 "    deficiencies in the text patch format."
 msgstr ""
 "    Se viene specificato --exact, l'importazione imposterà la\n"
 "    directory di lavoro al genitore di ogni patch prima di applicarla,\n"
 "    e abortirà se il changeset risultante avrà un ID differente\n"
-"    rispetto a quello registrato nella patch Questo potrebbe capitare\n"
+"    rispetto a quello registrato nella patch. Questo potrebbe capitare\n"
 "    a causa di problemi del set di caratteri o altre carenze nel\n"
 "    formato della patch testuale."
 
-#, fuzzy
 msgid ""
 "    With -s/--similarity, hg will attempt to discover renames and\n"
 "    copies in the patch in the same way as 'addremove'."
 msgstr ""
-"    Con --similarity, hg tenterà di scoprire le rinomine e le copie\n"
+"    Con -s/--similarity, hg tenterà di scoprire le rinomine e le copie\n"
 "    nella patch allo stesso modo di 'addremove'."
 
-#, fuzzy
 msgid ""
 "    To read a patch from standard input, use \"-\" as the patch name. If\n"
 "    a URL is specified, the patch will be downloaded from it.\n"
 "    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Per leggere una patch dallo standard input, usare come nome della\n"
-"    patch \"-\". Vedere 'hg help dates' per un elenco dei formati validi\n"
+"    patch \"-\". Se viene specificato un URL, la patch verrà scaricata da\n"
+"    questo. Vedere :hg:`help dates` per un elenco dei formati validi\n"
 "    per -d/--date.\n"
 "    "
 
-#, fuzzy
 msgid "to working directory"
-msgstr "aggiorna la directory di lavoro"
-
-#, fuzzy
+msgstr "alla directory di lavoro"
+
 msgid "not a Mercurial patch"
-msgstr "non è una patch di mercurial"
+msgstr "non è una patch di Mercurial"
 
 msgid "patch is damaged or loses information"
 msgstr "la patch è danneggiata o perde informazioni"
 
 msgid "applying patch from stdin\n"
 msgstr "sto applicando patch dallo stdin\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "applied %s\n"
-msgstr "sto applicando %s\n"
+msgstr "applicata %s\n"
 
 msgid "no diffs found"
 msgstr "nessun diff trovato"
 
-#, fuzzy
 msgid "show new changesets found in source"
 msgstr "mostra i nuovi changeset trovati nella sorgente"
 
-#, fuzzy
 msgid ""
 "    Show new changesets found in the specified path/URL or the default\n"
 "    pull location. These are the changesets that would have been pulled\n"
 "    if a pull at the time you issued this command."
 msgstr ""
 "    Mostra i nuovi changeset trovati nel percorso/URL specificato o\n"
 "    nella posizione di pull di default. Questi sono i changeset di cui\n"
-"    si effettuerebbe il pull se questo venisse richiesto."
-
-#, fuzzy
+"    si effettuerebbe il pull se questo venisse richiesto in quel momento."
+
 msgid ""
 "    For remote repository, using --bundle avoids downloading the\n"
 "    changesets twice if the incoming is followed by a pull."
 msgstr ""
 "    Per repository remoti, usare --bundle evita di scaricare due volte\n"
 "    i changeset se incoming è seguito da un pull."
 
-#, fuzzy
 msgid "    See pull for valid source format details."
-msgstr ""
-"    Vedere pull per dettagli sui formati di sorgenti validi.\n"
-"    "
+msgstr "    Vedere pull per dettagli sui formati di sorgenti validi."
 
 msgid ""
 "    Returns 0 if there are incoming changes, 1 otherwise.\n"
 "    "
 msgstr ""
 
-#, fuzzy
+msgid "cannot combine --bundle and --subrepos"
+msgstr ""
+
+msgid "remote doesn't support bookmarks\n"
+msgstr "il repository remoto non supporta i segnalibri\n"
+
 msgid "create a new repository in the given directory"
-msgstr "crea un nuovo repository nella directory data"
-
-#, fuzzy
+msgstr "crea un nuovo repository nella directory specificata"
+
 msgid ""
 "    Initialize a new repository in the given directory. If the given\n"
 "    directory does not exist, it will be created."
 msgstr ""
 "    Inizializza un nuovo repository nella directory data. Se tale\n"
 "    directory non esiste la crea."
 
-#, fuzzy
 msgid "    If no directory is given, the current directory is used."
-msgstr "    Se nessuna directory è specificata si usa la directory corrente."
-
-#, fuzzy
+msgstr ""
+"    Se non viene specificata alcuna directory, viene usata la directory "
+"corrente."
+
 msgid ""
 "    It is possible to specify an ``ssh://`` URL as the destination.\n"
 "    See :hg:`help urls` for more information."
 msgstr ""
 "    E' possibile specificare un URL ``ssh://`` come destinazione.\n"
-"    Vedere 'hg help urls' per maggiorni informazioni.\n"
-"    "
-
-#, fuzzy
+"    Vedere :hg:`help urls` per maggiori informazioni.    "
+
 msgid "locate files matching specific patterns"
 msgstr "trova file corrispondenti a pattern specificati"
 
-#, fuzzy
 msgid ""
 "    Print files under Mercurial control in the working directory whose\n"
 "    names match the given patterns."
 msgstr ""
-"    Stampa tutti i file sotto il controllo di Mercurial il cui nome\n"
-"    corrisponde ai dati pattern."
-
-#, fuzzy
+"    Stampa tutti i file sotto il controllo di Mercurial nella directory di\n"
+"    lavoro il cui nome corrisponde ai pattern specificati."
+
 msgid ""
 "    By default, this command searches all directories in the working\n"
 "    directory. To search just the current directory and its\n"
 "    subdirectories, use \"--include .\"."
 msgstr ""
-"    Questo comando cerca nell'intero repository di default. Per\n"
-"    ricercare solo nella directory corrente e le sue sottodirectory,\n"
-"    usare \"--include .\"."
-
-#, fuzzy
+"    Di default questo comando cerca in tutte le directory della copia\n"
+"    di lavoro. Per cercare solo nella directory corrente e le sue \n"
+"    sottodirectory, usare \"--include .\"."
+
 msgid ""
 "    If no patterns are given to match, this command prints the names\n"
 "    of all files under Mercurial control in the working directory."
 msgstr ""
-"    Se non sono forniti pattern, questo comando stampa il nome di\n"
-"    tutti i file."
-
-#, fuzzy
+"    Se non vengono forniti pattern da confrontare, questo comando\n"
+"    stampa il nome di tutti i file sotto il controllo di Mercurial nella "
+"directory\n"
+"    di lavoro."
+
 msgid ""
 "    If you want to feed the output of this command into the \"xargs\"\n"
 "    command, use the -0 option to both this command and \"xargs\". This\n"
 "    will avoid the problem of \"xargs\" treating single filenames that\n"
 "    contain whitespace as multiple filenames."
 msgstr ""
 "    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\", 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
+"    nomi di file singoli che contengono spazi bianchi come nomi di\n"
+"    file multipli."
+
 msgid "show revision history of entire repository or files"
-msgstr ""
-"show revision history of entire repository or files\n"
-"\n"
-"    Print the revision history of the specified files or the entire\n"
-"    project.\n"
-"\n"
-"    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
-"    ancestors or descendants of the starting revision. --follow-first\n"
-"    only follows the first parent of merge revisions.\n"
-"\n"
-"    If no revision range is specified, the default is tip:0 unless\n"
-"    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision.\n"
-"\n"
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
-"\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
-"\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
-"    "
-
-#, fuzzy
+msgstr "mostra la storia delle revisioni dell'intero repository o di file"
+
 msgid ""
 "    Print the revision history of the specified files or the entire\n"
 "    project."
 msgstr ""
-"show revision history of entire repository or files\n"
-"\n"
-"    Print the revision history of the specified files or the entire\n"
-"    project.\n"
-"\n"
-"    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
-"    ancestors or descendants of the starting revision. --follow-first\n"
-"    only follows the first parent of merge revisions.\n"
-"\n"
-"    If no revision range is specified, the default is tip:0 unless\n"
-"    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision.\n"
-"\n"
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
-"\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
-"\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
-"    "
-
-#, fuzzy
+"    Stampa la storia delle revisioni o dei file specificati o dell'intero\n"
+"    progetto."
+
 msgid ""
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a filename to follow history across\n"
 "    renames and copies. --follow without a filename will only show\n"
 "    ancestors or descendants of the starting revision. --follow-first\n"
 "    only follows the first parent of merge revisions."
 msgstr ""
-"show revision history of entire repository or files\n"
-"\n"
-"    Print the revision history of the specified files or the entire\n"
-"    project.\n"
-"\n"
-"    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
-"    ancestors or descendants of the starting revision. --follow-first\n"
-"    only follows the first parent of merge revisions.\n"
-"\n"
-"    If no revision range is specified, the default is tip:0 unless\n"
-"    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision.\n"
-"\n"
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
-"\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
-"\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
-"    "
-
-#, fuzzy
-msgid ""
-"    If no revision range is specified, the default is tip:0 unless\n"
+"    La storia dei file viene mostrata senza seguire la storia delle\n"
+"    rinomine o delle copie dei file. Usare -f/--follow con il nome di\n"
+"    un file per seguirne la storia attraverso copie e rinomine.\n"
+"    --follow senza il nome di un file mostrerà solamente gli antenati\n"
+"    o i discendenti della revisione di partenza. --follow-first segue\n"
+"    solo il primo genitore delle revisioni di merge."
+
+msgid ""
+"    If no revision range is specified, the default is ``tip:0`` unless\n"
 "    --follow is set, in which case the working directory parent is\n"
 "    used as the starting revision. You can specify a revision set for\n"
 "    log, see :hg:`help revsets` for more information."
 msgstr ""
-"show revision history of entire repository or files\n"
-"\n"
-"    Print the revision history of the specified files or the entire\n"
-"    project.\n"
-"\n"
-"    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
-"    ancestors or descendants of the starting revision. --follow-first\n"
-"    only follows the first parent of merge revisions.\n"
-"\n"
-"    If no revision range is specified, the default is tip:0 unless\n"
-"    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision.\n"
-"\n"
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
-"\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
-"\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
-"    "
-
-#, fuzzy
+"    Se non viene specificato alcun range di revisioni, il default\n"
+"    è ``tip:0`` a meno di impostare --follow, in questo caso la\n"
+"    directory genitore viene usata come revisione di partenza.\n"
+"    E' possibile specificare un insieme di revisioni per log, vedere\n"
+"    :hg:`help revsets` per maggiori informazioni."
+
 msgid ""
 "    By default this command prints revision number and changeset id,\n"
 "    tags, non-trivial parents, user, date and time, and a summary for\n"
 "    each commit. When the -v/--verbose switch is used, the list of\n"
 "    changed files and full commit message are shown."
 msgstr ""
-"show revision history of entire repository or files\n"
-"\n"
-"    Print the revision history of the specified files or the entire\n"
-"    project.\n"
-"\n"
-"    File history is shown without following rename or copy history of\n"
-"    files. Use -f/--follow with a file name to follow history across\n"
-"    renames and copies. --follow without a file name will only show\n"
-"    ancestors or descendants of the starting revision. --follow-first\n"
-"    only follows the first parent of merge revisions.\n"
-"\n"
-"    If no revision range is specified, the default is tip:0 unless\n"
-"    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision.\n"
-"\n"
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
-"\n"
-"    By default this command outputs: changeset id and hash, tags,\n"
-"    non-trivial parents, user, date and time, and a summary for each\n"
-"    commit. When the -v/--verbose switch is used, the list of changed\n"
-"    files and full commit message is shown.\n"
-"\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
-"    that are different from BOTH parents.\n"
-"\n"
-"    "
-
-#, fuzzy
-msgid ""
-"    NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-"    changesets, as it will only compare the merge changeset against\n"
-"    its first parent. Also, only files different from BOTH parents\n"
-"    will appear in files:."
-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"
-"    "
+"    Di default questo comando stampa il numero di revisione e l'id del\n"
+"    changeset, tag, genitori non triviali, utente, data e ora e un \n"
+"    sommario per ogni commit. Quando viene usato -v/--verbose,\n"
+"    viene mostrato l'elenco dei file modificati e l'intero messaggio\n"
+"    di commit."
+
+msgid ""
+"    .. note::\n"
+"       log -p/--patch may generate unexpected diff output for merge\n"
+"       changesets, as it will only compare the merge changeset against\n"
+"       its first parent. Also, only files different from BOTH parents\n"
+"       will appear in files:."
+msgstr ""
+"    .. nota::\n"
+"       log -p/--patch potrebbe generare un diff inatteso per changeset\n"
+"       di merge, in quanto confronta solo i changeset di merge con il loro\n"
+"       primo genitore. Inoltre, solo i file differente da ENTRAMBI i "
+"genitori\n"
+"       compariranno nei file:."
 
 msgid "output the current or given revision of the project manifest"
 msgstr ""
 
 msgid ""
 "    Print a list of version controlled files for the given revision.\n"
 "    If no revision is given, the first parent of the working directory\n"
 "    is used, or the null revision if no revision is checked out."
@@ -7673,124 +7827,128 @@ msgstr ""
 msgid ""
 "    Files that changed between either parent are marked as changed for\n"
 "    the next commit and a commit must be performed before any further\n"
 "    updates to the repository are allowed. The next commit will have\n"
 "    two parents."
 msgstr ""
 
 msgid ""
+"    ``--tool`` can be used to specify the merge tool used for file\n"
+"    merges. It overrides the HGMERGE environment variable and your\n"
+"    configuration files."
+msgstr ""
+
+msgid ""
 "    If no revision is specified, the working directory's parent is a\n"
 "    head revision, and the current branch contains exactly one other\n"
 "    head, the other head is merged with by default. Otherwise, an\n"
 "    explicit revision with which to merge with must be provided."
 msgstr ""
 
+msgid "    :hg:`resolve` must be used to resolve unresolved files."
+msgstr "    :hg:`resolve` deve essere usato per decidere su file irrisolti."
+
 msgid ""
 "    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
 "    will check out a clean copy of the original merge parent, losing\n"
 "    all changes."
 msgstr ""
 
 msgid ""
 "    Returns 0 on success, 1 if there are unresolved files.\n"
 "    "
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "branch '%s' has %d heads - please merge with an explicit rev\n"
 "(run 'hg heads .' to see heads)"
-msgstr "la branch '%s' ha %d head - fare il merge con una revisione esplicita"
-
-#, fuzzy, python-format
+msgstr ""
+"il branch '%s' ha %d head -  si prega di effettuare il  merge con\n"
+"una revisione esplicita (eseguire 'hg heads .' per vedere le head)"
+
+#, python-format
 msgid ""
 "branch '%s' has one head - please merge with an explicit rev\n"
 "(run 'hg heads' to see all heads)"
-msgstr "la branch '%s' ha una head - fare il merge con una revisione esplicita"
+msgstr ""
+"il branch '%s' ha una head - si prega di effettuare il merge con\n"
+"una revisione esplicita (eseguire 'hg heads' per vedere tutte le head)"
 
 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 the destination"
 msgstr "mostra changeset non trovati nella destinazione"
 
-#, fuzzy
 msgid ""
 "    Show changesets not found in the specified destination repository\n"
 "    or the default push location. These are the changesets that would\n"
 "    be pushed if a push was requested."
 msgstr ""
 "    Mostra i changeset non trovati nel repository di destinazione\n"
 "    specificato o nella posizione di default di push. Questi sono i\n"
-"    changeset che di cui si effetterebbe il push se questo venisse\n"
+"    changeset di cui si effettuerebbe il push se questo venisse\n"
 "    richiesto."
 
-#, fuzzy
 msgid "    See pull for details of valid destination formats."
-msgstr ""
-"    Vedere pull per dettagli sui formati validi di destinazioni.\n"
-"    "
+msgstr "    Vedere pull per dettagli sui formati validi di destinazioni."
 
 msgid ""
 "    Returns 0 if there are outgoing changes, 1 otherwise.\n"
 "    "
 msgstr ""
 
-#, fuzzy
 msgid "show the parents of the working directory or revision"
 msgstr "mostra i genitori della directory di lavoro o di una revisione"
 
-#, fuzzy
 msgid ""
 "    Print the working directory's parent revisions. If a revision is\n"
 "    given via -r/--rev, the parent of that revision will be printed.\n"
 "    If a file argument is given, the revision in which the file was\n"
 "    last changed (before the working directory revision or the\n"
 "    argument to --rev if given) is printed."
 msgstr ""
 "    Stampa le revisioni genitori della directory di lavoro. Se una\n"
-"    revisione è data tramite --rev, verrà stampato il genitore di\n"
-"    quella revisione. Se viene fornito un file come argomento,\n"
+"    revisione è specificata tramite -r/--rev, verrà stampato il genitore\n"
+"    di 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
+"    o dell'argomento di --rev se fornito)."
+
 msgid "can only specify an explicit filename"
-msgstr "possibile specificare solo due etichette."
+msgstr "possibile specificare solo un nome di file esplicito"
 
 #, python-format
 msgid "'%s' not found in manifest!"
 msgstr "'%s' non trovato nel manifesto!"
 
 msgid "show aliases for remote repositories"
 msgstr ""
 
 msgid ""
 "    Show definition of symbolic path name NAME. If no name is given,\n"
 "    show definition of all available names."
 msgstr ""
 
 msgid ""
-"    Path names are defined in the [paths] section of\n"
-"    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+"    Path names are defined in the [paths] section of your\n"
+"    configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
 "    repository, ``.hg/hgrc`` is used, too."
 msgstr ""
 
 msgid ""
 "    The path names ``default`` and ``default-push`` have a special\n"
 "    meaning.  When performing a push or pull operation, they are used\n"
 "    as fallbacks if no location is specified on the command-line.\n"
 "    When ``default-push`` is set, it will be used for push and\n"
@@ -7812,127 +7970,86 @@ msgid "not updating, since new heads add
 msgstr ""
 
 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
 msgstr "(esegui 'hg heads' per vedere le head, 'hg merge' per fare un merge)\n"
 
 msgid "(run 'hg update' to get a working copy)\n"
 msgstr "(esegui 'hg update' per ottenere una copia funzionante)\n"
 
-#, fuzzy
 msgid "pull changes from the specified source"
-msgstr ""
-"effettua il pull delle modifiche dalla sorgente specificata\n"
-"\n"
-"    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
-"\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL "
-"specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia "
-"del\n"
-"    progetto nella directory di lavoro.\n"
-"\n"
-"    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
-"    Vedere 'hg help urls' per maggiori informazioni.\n"
-"    "
-
-#, fuzzy
+msgstr "effettua il pull delle modifiche dalla sorgente specificata"
+
 msgid "    Pull changes from a remote repository to a local one."
 msgstr ""
-"effettua il pull delle modifiche dalla sorgente specificata\n"
-"\n"
-"    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
-"\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL "
-"specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia "
-"del\n"
-"    progetto nella directory di lavoro.\n"
-"\n"
-"    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
-"    Vedere 'hg help urls' per maggiori informazioni.\n"
-"    "
-
-#, fuzzy
+"    Effettua il pull delle modifiche da un repository remoto\n"
+"    ad uno locale."
+
 msgid ""
 "    This finds all changes from the repository at the specified path\n"
 "    or URL and adds them to a local repository (the current one unless\n"
 "    -R is specified). By default, this does not update the copy of the\n"
 "    project in the working directory."
 msgstr ""
-"effettua il pull delle modifiche dalla sorgente specificata\n"
-"\n"
-"    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
-"\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL "
-"specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia "
-"del\n"
-"    progetto nella directory di lavoro.\n"
-"\n"
-"    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
-"    Vedere 'hg help urls' per maggiori informazioni.\n"
-"    "
-
-#, fuzzy
+"    Questo trova tutte le modifiche dal repository al percorso o URL\n"
+"    specificato e le aggiunge al repository locale (quello corrente a\n"
+"    meno che non venga specificato -R). Di default, non viene \n"
+"    aggiornata la copia del progetto nella directory di lavoro."
+
 msgid ""
 "    Use :hg:`incoming` if you want to see what would have been added\n"
 "    by a pull at the time you issued this command. If you then decide\n"
 "    to add those changes to the repository, you should use :hg:`pull\n"
 "    -r X` where ``X`` is the last changeset listed by :hg:`incoming`."
 msgstr ""
-"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"
-"    "
-
-#, fuzzy
+"    Usare :hg:`incoming` per vedere quello che verrebbe aggiunto da\n"
+"    un pull nel momento dell'esecuzione di questo comando. Se si decidesse\n"
+"    di aggiungere in seguito tali modifiche al repository, si dovrebbe "
+"usare\n"
+"    :hg:`pull -r X` dove ``X`` è l'ultimo changeset elencato da :hg:"
+"`incoming`."
+
 msgid ""
 "    If SOURCE is omitted, the 'default' path will be used.\n"
 "    See :hg:`help urls` for more information."
 msgstr ""
-"effettua il pull delle modifiche dalla sorgente specificata\n"
-"\n"
-"    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
-"\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL "
-"specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia "
-"del\n"
-"    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"
-"    "
+"    Se viene omessa la SORGENTE, verrà usato il \n"
+"    percorso 'default'. Vedere :hg:`help urls` per\n"
+"    maggiori informazioni."
 
 msgid ""
 "    Returns 0 on success, 1 if an update had unresolved files.\n"
 "    "
 msgstr ""
 
-#, fuzzy
+#, python-format
+msgid "remote bookmark %s not found!"
+msgstr "repository remoto %s non trovato!"
+
+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 \n"
+"non può essere specificata."
+
+#, python-format
+msgid "importing bookmark %s\n"
+msgstr "importazione segnalibro %s\n"
+
 msgid "push changes to the specified destination"
 msgstr "effettua il push di modifiche verso la destinazione specificata"
 
-#, fuzzy
 msgid ""
 "    Push changesets from the local repository to the specified\n"
 "    destination."
 msgstr ""
 "    Effettua il push di modifiche dal repository locale verso la\n"
-"    destinazione data."
+"    destinazione specificata."
 
 msgid ""
 "    This operation is symmetrical to pull: it is identical to a pull\n"
 "    in the destination repository from the current one."
 msgstr ""
 
 msgid ""
 "    By default, push will not allow creation of new heads at the\n"
@@ -7947,63 +8064,69 @@ msgid ""
 "    only create a new branch without forcing other changes."
 msgstr ""
 
 msgid ""
 "    Use -f/--force to override the default behavior and push all\n"
 "    changesets on all branches."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    If -r/--rev is used, the specified revision and all its ancestors\n"
 "    will be pushed to the remote repository."
 msgstr ""
-"    Se si usa -r, si farà il push del changeset dato e tutti i suoi "
-"antenati\n"
-"    verso il repository remoto."
-
-#, fuzzy
+"    Se si usa -r/--rev, si effettuerà  il push del changeset dato e\n"
+"    di tutti i suoi antenati verso il repository remoto."
+
 msgid ""
 "    Please see :hg:`help urls` for important details about ``ssh://``\n"
 "    URLs. If DESTINATION is omitted, a default path will be used."
 msgstr ""
-"    Vedere il testo di aiuto per gli url per importanti dettagli sugli\n"
-"    URL ``ssh://``.\n"
-"    Se viene omessa DESTINATION, verrà usato il percorso di default.\n"
-"    Vedere 'hg help urls' per maggiori informazioni.\n"
-"    "
+"    Vedere :hg:`help urls` per importanti dettagli sugli URL ``ssh://``.\n"
+"    Se viene omessa DESTINATION, verrà usato il percorso di default."
 
 msgid ""
 "    Returns 0 if push was successful, 1 if nothing to push.\n"
 "    "
 msgstr ""
 
 #, python-format
 msgid "pushing to %s\n"
 msgstr "sto effettuando il push verso %s\n"
 
-#, fuzzy
+#, python-format
+msgid "exporting bookmark %s\n"
+msgstr "esportazione segnalibro %s\n"
+
+#, python-format
+msgid "deleting remote bookmark %s\n"
+msgstr "eliminazione segnalibro remoto %s\n"
+
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr "il segnalibro %s non esiste nel repository locale o remoto!\n"
+
+#, python-format
+msgid "updating bookmark %s failed!\n"
+msgstr "aggiornamento del segnalibro %s fallito!\n"
+
 msgid "roll back an interrupted transaction"
 msgstr "effettua il rollback di una transazione interrotta"
 
-#, fuzzy
 msgid "    Recover from an interrupted commit or pull."
-msgstr "    Effettua il ripristino da un commit o pull interrotto."
-
-#, fuzzy
+msgstr "    Riprende un commit o un pull interrotti."
+
 msgid ""
 "    This command tries to fix the repository status after an\n"
 "    interrupted operation. It should only be necessary when Mercurial\n"
 "    suggests it."
 msgstr ""
 "    Questo comando prova a correggere lo stato del repository dopo\n"
 "    un'operazione interrotta. Dovrebbe essere necessario solamente\n"
-"    quando Mercurial lo suggerisce.\n"
-"    "
+"    quando Mercurial lo suggerisce.    "
 
 msgid ""
 "    Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
 "    "
 msgstr ""
 
 msgid "remove the specified files on the next commit"
 msgstr ""
@@ -8040,80 +8163,97 @@ msgid ""
 "    To undo a remove before that, see :hg:`revert`."
 msgstr ""
 
 msgid ""
 "    Returns 0 on success, 1 if any warnings encountered.\n"
 "    "
 msgstr ""
 
-#, fuzzy, python-format
+#, 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"
+msgstr "non rimuovo %s: il file non è tracciato\n"
+
+#, python-format
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr ""
+"non rimuovo %s: il file esiste già (usare -f per forzare la rimozione)\n"
+
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr ""
+"non rimuovo %s: il file è stato modificato (usare -f per forzare la "
+"rimozione)\n"
+
+#, python-format
+msgid ""
+"not removing %s: file has been marked for add (use -f to force removal)\n"
+msgstr ""
+"non rimuovo %s: il file è stato marcato per l'aggiunta (usare -f per forzare "
+"la rimozione)\n"
 
 msgid "rename files; equivalent of copy + remove"
 msgstr ""
 
 msgid ""
 "    Mark dest as copies of sources; mark sources for deletion. If dest\n"
 "    is a directory, copies are put in that directory. If dest is a\n"
 "    file, there can only be one source."
 msgstr ""
 
 msgid ""
 "    This command takes effect at the next commit. To undo a rename\n"
 "    before that, see :hg:`revert`."
 msgstr ""
 
-msgid "various operations to help finish a merge"
-msgstr ""
-
-msgid ""
-"    This command includes several actions that are often useful while\n"
-"    performing a merge, after running ``merge`` but before running\n"
-"    ``commit``.  (It is only meaningful if your working directory has\n"
-"    two parents.)  It is most relevant for merges with unresolved\n"
-"    conflicts, which are typically a result of non-interactive merging with\n"
-"    ``internal:merge`` or a command-line merge tool like ``diff3``."
-msgstr ""
-
-#, fuzzy
-msgid "    The available actions are:"
-msgstr "%s non è più disponibile in %s"
-
-msgid ""
-"      1) list files that were merged with conflicts (U, for unresolved)\n"
-"         and without conflicts (R, for resolved): ``hg resolve -l``\n"
-"         (this is like ``status`` for merges)\n"
-"      2) record that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
-"      3) forget that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
-"      4) discard your current attempt(s) at resolving conflicts and\n"
-"         restart the merge from scratch: ``hg resolve file...``\n"
-"         (or ``-a`` for all unresolved files)"
-msgstr ""
-
-msgid ""
-"    Note that Mercurial will not let you commit files with unresolved merge\n"
-"    conflicts.  You must use ``hg resolve -m ...`` before you can commit\n"
-"    after a conflicting merge."
+msgid "redo merges or set/view the merge status of files"
+msgstr ""
+
+msgid ""
+"    Merges with unresolved conflicts are often the result of\n"
+"    non-interactive merging using the ``internal:merge`` configuration\n"
+"    setting, or a command-line merge tool like ``diff3``. The resolve\n"
+"    command is used to manage the files involved in a merge, after\n"
+"    :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+"    working directory must have two parents)."
+msgstr ""
+
+msgid "    The resolve command can be used in the following ways:"
+msgstr ""
+
+msgid ""
+"    - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
+"specified\n"
+"      files, discarding any previous merge attempts. Re-merging is not\n"
+"      performed for files already marked as resolved. Use ``--all/-a``\n"
+"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      the merge tool used for the given files. It overrides the HGMERGE\n"
+"      environment variable and your configuration files."
+msgstr ""
+
+msgid ""
+"    - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+"      (e.g. after having manually fixed-up the files). The default is\n"
+"      to mark all unresolved files."
+msgstr ""
+
+msgid ""
+"    - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+"      default is to mark all resolved files."
+msgstr ""
+
+msgid ""
+"    - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+"      In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+
+msgid ""
+"    Note that Mercurial will not let you commit files with unresolved\n"
+"    merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+"    commit after a conflicting merge."
 msgstr ""
 
 msgid ""
 "    Returns 0 on success, 1 if any files fail a resolve attempt.\n"
 "    "
 msgstr ""
 
 msgid "too many options specified"
@@ -8122,104 +8262,99 @@ 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"
 
-#, fuzzy
 msgid "restore individual files or directories to an earlier state"
 msgstr "ripristina file singoli o directory ad uno stato precedente"
 
 msgid ""
-"    NOTE: This command is most likely not what you are looking for. revert\n"
-"    will partially overwrite content in the working directory without "
-"changing\n"
-"    the working directory parents. Use :hg:`update -r rev` to check out "
-"earlier\n"
-"    revisions, or :hg:`update --clean .` to undo a merge which has added\n"
-"    another parent."
-msgstr ""
-
-#, fuzzy
+"    .. note::\n"
+"       This command is most likely not what you are looking for.\n"
+"       Revert will partially overwrite content in the working\n"
+"       directory without changing the working directory parents. Use\n"
+"       :hg:`update -r rev` to check out earlier revisions, or\n"
+"       :hg:`update --clean .` to undo a merge which has added another\n"
+"       parent."
+msgstr ""
+
 msgid ""
 "    With no revision specified, revert the named files or directories\n"
 "    to the contents they had in the parent of the working directory.\n"
 "    This restores the contents of the affected files to an unmodified\n"
 "    state and unschedules adds, removes, copies, and renames. If the\n"
 "    working directory has two parents, you must explicitly specify a\n"
 "    revision."
 msgstr ""
 "    Se nessuna revisione viene specificata, i file o directory\n"
 "    specificati vengono riportati al contenuto che avevano nel\n"
 "    genitore della directory di lavoro. Questo ripristina il contenuto\n"
 "    dei file interessati ad uno stato non modificato e annulla\n"
 "    aggiunte, rimozioni, copie e rinomine. Se la directory di lavoro\n"
 "    ha due genitori, è necessario specificare esplicitamente la\n"
 "    revisione a cui tornare."
 
-#, fuzzy
 msgid ""
 "    Using the -r/--rev option, revert the given files or directories\n"
 "    to their contents as of a specific revision. This can be helpful\n"
 "    to \"roll back\" some or all of an earlier change. See :hg:`help\n"
 "    dates` for a list of formats valid for -d/--date."
 msgstr ""
-"    Usando l'opzione -r, riporta i dati file o directory al loro\n"
+"    Usando l'opzione -r(--rev, 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"
+"    precedenti. Vedere :hg:`help dates` per un elenco dei formati\n"
 "    validi per -d/--date."
 
-#, fuzzy
 msgid ""
 "    Revert modifies the working directory. It does not commit any\n"
 "    changes, or change the parent of the working directory. If you\n"
 "    revert to a revision other than the parent of the working\n"
 "    directory, the reverted files will thus appear modified\n"
 "    afterwards."
 msgstr ""
 "    Revert modifica la directory di lavoro. Non effettua il commit di\n"
-"    alcuna modifica, nè cambia i genitori della directory di lavoro Se\n"
+"    alcuna modifica, nè cambia i genitori della directory di lavoro. Se\n"
 "    si effettua il revert ad una revisione differente di quella del\n"
-"    genitore della directory di lavoro, i file interessati in seguito\n"
-"    appariranno quindi modificati."
-
-#, fuzzy
+"    genitore della directory di lavoro, i file interessati appariranno\n"
+"    quindi in seguito modificati."
+
 msgid ""
 "    If a file has been deleted, it is restored. If the executable mode\n"
 "    of a file was changed, it is reset."
 msgstr ""
 "    Se un file è stato cancellato viene ripristinato. Se è stato\n"
-"    modificato il flag di esecuzione di file, questo viene resettato."
-
-#, fuzzy
+"    modificato il flag di esecuzione di un file, questo viene resettato."
+
 msgid ""
 "    If names are given, all files matching the names are reverted.\n"
 "    If no arguments are given, no files are reverted."
 msgstr ""
 "    Se vengono forniti nomi, tutti i file corrispondenti ai nomi\n"
 "    vengono ripristinati. Se non vengono forniti argomenti nessun file\n"
 "    viene ripristinato."
 
-#, fuzzy
 msgid ""
 "    Modified files are saved with a .orig suffix before reverting.\n"
 "    To disable these backups, use --no-backup."
 msgstr ""
 "    I file modificati vengono salvati con un suffisso .orig prima di\n"
 "    essere ripristinati. Per disabilitare questi backup, usare\n"
-"    --no-backup.\n"
-"    "
+"    --no-backup.    "
 
 msgid "you can't specify a revision and a date"
 msgstr "non è possibile specificare sia una revisione sia una data"
 
+msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
+msgstr ""
+
 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"
@@ -8239,128 +8374,120 @@ msgstr "sto salvando la versione corrent
 #, 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 (dangerous)"
-msgstr "effettua il rollback dell'ultima transazione"
-
-#, fuzzy
+msgstr "effettua il rollback dell'ultima transazione (pericoloso)"
+
 msgid ""
 "    This command should be used with care. There is only one level of\n"
 "    rollback, and there is no way to undo a rollback. It will also\n"
 "    restore the dirstate at the time of the last transaction, losing\n"
 "    any dirstate changes since that time. This command does not alter\n"
 "    the working directory."
 msgstr ""
 "    Questo comando dovrebbe essere usato con cautela. Esiste un solo\n"
 "    livello di rollback e non c'è modo di annullare un rollback.\n"
 "    Ripristinerà anche il dirstate al tempo dell'ultima transazione,\n"
-"    perdendo qualunque modifica ad esso da quel momento in poi."
-
-#, fuzzy
+"    perdendo qualunque modifica ad esso da quel momento in poi.\n"
+"    Questo comando non altera la copia di lavoro."
+
 msgid ""
 "    Transactions are used to encapsulate the effects of all commands\n"
 "    that create new changesets or propagate existing changesets into a\n"
 "    repository. For example, the following commands are transactional,\n"
 "    and their effects can be rolled back:"
 msgstr ""
 "    Le transazioni sono usate per incapsulare gli effetti di tutti i\n"
 "    comandi che creano nuovi changeset o propagano changeset esistenti\n"
 "    in un altro repository. Ad esempio, i seguenti comandi sono\n"
-"    transazionali ed è possibile effettuare il rollback dei loro\n"
+"    usano transazioni ed è possibile effettuare il rollback dei loro\n"
 "    effetti:"
 
-#, fuzzy
 msgid ""
 "    - commit\n"
 "    - import\n"
 "    - pull\n"
 "    - push (with this repository as the destination)\n"
 "    - unbundle"
 msgstr ""
-"      commit\n"
-"      import\n"
-"      pull\n"
-"      push (con questo repository come destinazione)\n"
-"      unbundle"
-
-#, fuzzy
+"    - commit\n"
+"    - import\n"
+"    - pull\n"
+"    - push (con questo repository come destinazione)\n"
+"    - unbundle"
+
 msgid ""
 "    This command is not intended for use on public repositories. Once\n"
 "    changes are visible for pull by other users, rolling a transaction\n"
 "    back locally is ineffective (someone else may already have pulled\n"
 "    the changes). Furthermore, a race is possible with readers of the\n"
 "    repository; for example an in-progress pull from the repository\n"
 "    may fail if a rollback is performed."
 msgstr ""
 "    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"
-"    "
+"    modifiche). Inoltre, è possibile che si verifichi una competizione\n"
+"    con i lettori del repository; ad esempio un pull in corso dal\n"
+"    repository potrebbe fallire se viene effettuato un rollback.    "
 
 msgid ""
 "    Returns 0 on success, 1 if no rollback data is available.\n"
 "    "
 msgstr ""
 
-#, fuzzy
 msgid "print the root (top) of the current working directory"
 msgstr "stampa la radice (top) della directory di lavoro corrente"
 
-#, fuzzy
 msgid "    Print the root directory of the current repository."
-msgstr ""
-"    Stampa la directory radice del repository corrente.\n"
-"    "
+msgstr "    Stampa la directory radice del repository corrente.    "
 
 msgid "start stand-alone webserver"
 msgstr ""
 
 msgid ""
 "    Start a local HTTP repository browser and pull server. You can use\n"
-"    this for ad-hoc sharing and browing of repositories. It is\n"
+"    this for ad-hoc sharing and browsing of repositories. It is\n"
 "    recommended to use a real web server to serve a repository for\n"
 "    longer periods of time."
 msgstr ""
 
 msgid ""
 "    Please note that the server does not implement access control.\n"
 "    This means that, by default, anybody can read from the server and\n"
 "    nobody can write to it by default. Set the ``web.allow_push``\n"
 "    option to ``*`` to allow everybody to push to the server. You\n"
 "    should use a real web server if you need to authenticate users."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "    By default, the server logs accesses to stdout and errors to\n"
 "    stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
 "    files."
 msgstr ""
 "    Di default i log del server vengono inviati allo stdout e gli\n"
-"    errori allo stderr. Usare le opzioni \"-A\" e \"-E\" per effettuare il\n"
-"    log su file.\n"
-"    "
+"    errori allo stderr. Usare le opzion -A/--accesslog e \n"
+"    -E/--errorlog\" per effettuare il log su file."
 
 msgid ""
 "    To have the server choose a free port number to listen on, specify\n"
 "    a port number of 0; in this case, the server will print the port\n"
 "    number it uses."
 msgstr ""
 
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
+
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "in ascolto su http://%s%s/%s (limitato a %s:%d)\n"
 
 msgid "show changed files in the working directory"
 msgstr ""
 
 msgid ""
@@ -8373,20 +8500,21 @@ msgid ""
 msgstr ""
 
 msgid ""
 "    Option -q/--quiet hides untracked (unknown and ignored) files\n"
 "    unless explicitly requested with -u/--unknown or -i/--ignored."
 msgstr ""
 
 msgid ""
-"    NOTE: status may appear to disagree with diff if permissions have\n"
-"    changed or a merge has occurred. The standard diff format does not\n"
-"    report permission changes and diff only reports changes relative\n"
-"    to one merge parent."
+"    .. note::\n"
+"       status may appear to disagree with diff if permissions have\n"
+"       changed or a merge has occurred. The standard diff format does\n"
+"       not report permission changes and diff only reports changes\n"
+"       relative to one merge parent."
 msgstr ""
 
 msgid ""
 "    If one revision is given, it is used as the base revision.\n"
 "    If two revisions are given, the differences between them are\n"
 "    shown. The --change option can also be used as a shortcut to list\n"
 "    the changed files of a revision from its first parent."
 msgstr ""
@@ -8505,73 +8633,89 @@ msgstr "update: %d nuovi changeset, %d h
 msgid "1 or more incoming"
 msgstr "1 o più in arrivo"
 
 #, python-format
 msgid "%d outgoing"
 msgstr "%d in uscita"
 
 #, python-format
+msgid "%d incoming bookmarks"
+msgstr "%d segnalibri in ingresso"
+
+#, python-format
+msgid "%d outgoing bookmarks"
+msgstr "%d segnalibri in uscita"
+
+#, python-format
 msgid "remote: %s\n"
 msgstr "remoto: %s\n"
 
 msgid "remote: (synced)\n"
 msgstr "remoto: (sincronizzato)\n"
 
 msgid "add one or more tags for the current or given revision"
 msgstr "aggiunge una o più tag per la revisione corrente o quella data"
 
 msgid "    Name a particular revision using <name>."
 msgstr "    Nomina una revisione particolare usando <nome>."
 
-#, fuzzy
 msgid ""
 "    Tags are used to name particular revisions of the repository and are\n"
 "    very useful to compare different revisions, to go back to significant\n"
-"    earlier versions or to mark branch points as releases, etc."
-msgstr ""
-"    Le tag sono usate per dare un nome a revisioni particolari del\n"
+"    earlier versions or to mark branch points as releases, etc. Changing\n"
+"    an existing tag is normally disallowed; use -f/--force to override."
+msgstr ""
+"    I tag sono usate per dare un nome a revisioni particolari del\n"
 "    repository e sono molto utili per confrontare revisioni\n"
 "    differenti, per tornare indietro a versioni precedenti\n"
-"    significative o per marcare punti di branch come release, ecc."
-
-#, fuzzy
+"    significative o per marcare punti di branch come release, ecc.\n"
+"    La modifica di un tag esistente di norma non è consentito;\n"
+"    usare -f/--force per sovrascriverle."
+
 msgid ""
 "    If no revision is given, the parent of the working directory is\n"
 "    used, or tip if no revision is checked out."
 msgstr ""
 "    Se nessuna revisione viene fornita, viene usato il genitore della\n"
 "    directory di lavoro, o tip se non si è effettuato il check out di\n"
 "    nessuna revisione."
 
-#, fuzzy
 msgid ""
 "    To facilitate version control, distribution, and merging of tags,\n"
-"    they are stored as a file named \".hgtags\" which is managed\n"
-"    similarly to other project files and can be hand-edited if\n"
-"    necessary. The file '.hg/localtags' is used for local tags (not\n"
-"    shared among repositories)."
+"    they are stored as a file named \".hgtags\" which is managed similarly\n"
+"    to other project files and can be hand-edited if necessary. This\n"
+"    also means that tagging creates a new commit. The file\n"
+"    \".hg/localtags\" is used for local tags (not shared among\n"
+"    repositories)."
 msgstr ""
 "    Per facilitare il controllo di versione, la distribuzione e il\n"
-"    merge di tag, sono memorizzate come file chiamato \".hgtags\" che è\n"
+"    merge di tag, sono memorizzate nel 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"
+"    modificato manualmente se necessario. Questo significa anche che\n"
+"    effettuare il tagging crea un nuovo commit. Il file \".hg/localtags\" è\n"
 "    usato per le tag locali (non condivise tra repository)."
 
 msgid ""
+"    Tag commits are usually made at the head of a branch. If the parent\n"
+"    of the working directory is not a branch head, :hg:`tag` aborts; use\n"
+"    -f/--force to force the tag commit to be based on a non-head\n"
+"    changeset."
+msgstr ""
+
+msgid ""
 "    Since tag names have priority over branch names during revision\n"
 "    lookup, using an existing branch name as a tag name is discouraged."
 msgstr ""
 
 msgid "tag names must be unique"
 msgstr "i nomi delle tag devono essere univoci"
 
-#, fuzzy
 msgid "tag names cannot consist entirely of whitespace"
-msgstr "ignora le modifiche nel conteggio degli spazi bianchi"
+msgstr "i nomi dei tag non possono consistere interamente di spazi bianchi"
 
 msgid "--rev and --remove are incompatible"
 msgstr "--rev e --remove sono incompatibili"
 
 #, python-format
 msgid "tag '%s' does not exist"
 msgstr "la tag '%s' non esiste"
 
@@ -8582,16 +8726,22 @@ msgstr "la tag '%s' non è una tag globale"
 #, python-format
 msgid "tag '%s' is not a local tag"
 msgstr "la tag '%s' non è una tag locale"
 
 #, python-format
 msgid "tag '%s' already exists (use -f to force)"
 msgstr "la tag '%s' esiste già (usare -f per forzare)"
 
+msgid "uncommitted merge"
+msgstr "merge con commit in sospeso"
+
+msgid "not at a branch head (use -f to force)"
+msgstr "non ad una head di una branch (usare -f per forzare l'operazione)"
+
 msgid "list repository tags"
 msgstr "elenca le tag del repository"
 
 msgid ""
 "    This lists both regular and local tags. When the -v/--verbose\n"
 "    switch is used, a third column \"local\" is printed for local tags."
 msgstr ""
 "    Questo elenca sia le tag regolari sia le tag locali. Quando viene usata "
@@ -8637,26 +8787,32 @@ msgid ""
 "    "
 msgstr ""
 
 msgid "update working directory (or switch revisions)"
 msgstr "aggiorna la directory di lavoro (o passa a un'altra revisione)"
 
 msgid ""
 "    Update the repository's working directory to the specified\n"
+"    changeset. If no changeset is specified, update to the tip of the\n"
+"    current named branch."
+msgstr ""
+"    Aggiorna la directory di lavoro del repository ad una revisione\n"
+"    specifica. Se non viene specificato alcun changeset, aggiorna\n"
+"    al tip del named branch corrente."
+
+msgid ""
+"    If the changeset is not a descendant of the working directory's\n"
+"    parent, the update is aborted. With the -c/--check option, the\n"
+"    working directory is checked for uncommitted changes; if none are\n"
+"    found, the working directory is updated to the specified\n"
 "    changeset."
 msgstr ""
 
 msgid ""
-"    If no changeset is specified, attempt to update to the tip of the\n"
-"    current branch. If this changeset is a descendant of the working\n"
-"    directory's parent, update to it, otherwise abort."
-msgstr ""
-
-msgid ""
 "    The following rules apply when the working directory contains\n"
 "    uncommitted changes:"
 msgstr ""
 
 msgid ""
 "    1. If neither -c/--check nor -C/--clean is specified, and if\n"
 "       the requested changeset is an ancestor or descendant of\n"
 "       the working directory's parent, the uncommitted changes\n"
@@ -8678,89 +8834,87 @@ msgid ""
 msgstr ""
 
 msgid ""
 "    Use null as the changeset to remove the working directory (like\n"
 "    :hg:`clone -U`)."
 msgstr ""
 
 msgid ""
-"    If you want to update just one file to an older changeset, use :hg:"
-"`revert`."
+"    If you want to update just one file to an older changeset, use\n"
+"    :hg:`revert`."
 msgstr ""
 "    Se si desidera aggiornare solo un file ad una revisione più\n"
-"    vecchia, usare :hg: `revert`."
+"    vecchia, usare :hg:`revert`."
 
 msgid "cannot specify both -c/--check and -C/--clean"
 msgstr "non è possibile specificare sia -c/--check sia -C/--clean"
 
-#, fuzzy
 msgid "uncommitted local changes"
-msgstr "modifiche locale sovrascrivi ogni "
+msgstr "modifiche locali di cui non si è effettuato il commit"
 
 msgid "verify the integrity of the repository"
 msgstr "verifica l'integrità del repository"
 
 msgid "    Verify the integrity of the current repository."
 msgstr "    Verifica l'integrità del repository corrente."
 
-#, fuzzy
 msgid ""
 "    This will perform an extensive check of the repository's\n"
 "    integrity, validating the hashes and checksums of each entry in\n"
 "    the changelog, manifest, and tracked files, as well as the\n"
 "    integrity of their crosslinks and indices."
 msgstr ""
 "    Questo comando eseguirà un controllo estensivo dell'integrità del\n"
 "    repository validando gli hash e i checksum di ogni voce nel\n"
 "    changelog, manifesto, e file tracciati, così come l'integrità dei\n"
-"    loro link incrociati e indici.\n"
-"    "
+"    loro link incrociati e indici.    "
 
 msgid "output version and copyright information"
 msgstr "stampa la versione e le informazioni di copyright"
 
 #, python-format
 msgid "Mercurial Distributed SCM (version %s)\n"
 msgstr "Mercurial SCM Distribuito (versione %s)\n"
 
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr ""
+
+msgid ""
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> e altri\n"
+"Copyright (C) 2005-2011 Matt Mackall 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"
+"Non c'è ALCUNA garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n"
 "SCOPO PARTICOLARE.\n"
 
-#, fuzzy
 msgid "repository root directory or name of overlay bundle file"
-msgstr "directory radice del repository o nome del percorso simbolico"
+msgstr "directory radice del repository o nome del file bundle"
 
 msgid "DIR"
 msgstr ""
 
 msgid "change working directory"
 msgstr "cambia la directory di lavoro"
 
 msgid "do not prompt, assume 'yes' for any required answers"
 msgstr "non chiedere conferma, assume 'yes' per ogni risposta richiesta"
 
 msgid "suppress output"
 msgstr "sopprime l'output"
 
 msgid "enable additional output"
 msgstr "abilita output aggiuntivo"
 
-#, fuzzy
 msgid "set/override config option (use 'section.name=value')"
-msgstr "imposta/sovrascrive l'opzione di configurazione"
+msgstr ""
+"imposta/sovrascrive l'opzione di configurazione  (usare 'sezione."
+"nome=valore')"
 
 msgid "CONFIG"
 msgstr ""
 
 msgid "enable debugging output"
 msgstr "abilita output di debug"
 
 msgid "start debugger"
@@ -8773,19 +8927,18 @@ msgid "ENCODE"
 msgstr ""
 
 msgid "MODE"
 msgstr ""
 
 msgid "set the charset encoding mode"
 msgstr "imposta la modalità di codifica dei caratteri"
 
-#, fuzzy
 msgid "always print a traceback on exception"
-msgstr "stampa un traceback in seguito ad eccezioni"
+msgstr "stampa sempre 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"
@@ -8798,39 +8951,39 @@ msgid "do not perform actions, just prin
 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 "do not verify server certificate (ignoring web.cacerts config)"
+msgstr ""
+
 msgid "PATTERN"
 msgstr ""
 
 msgid "include names matching the given patterns"
 msgstr "include nomi che corrispondono ai pattern dati"
 
 msgid "exclude names matching the given patterns"
 msgstr "esclude nomi che corrispondono ai pattern dati"
 
-#, fuzzy
 msgid "use text as commit message"
-msgstr "usa <text> come messaggio di commit"
-
-#, fuzzy
+msgstr "usa text come messaggio di commit"
+
 msgid "read commit message from file"
-msgstr "legge il messaggio di commit da <file>"
+msgstr "legge il messaggio di commit dal file"
 
 msgid "record datecode as commit date"
 msgstr "registra il datecode come data del commit"
 
-#, fuzzy
 msgid "record the specified user as committer"
-msgstr "registra l'utente come committente"
+msgstr "registra l'utente specificato come autore del commit"
 
 msgid "STYLE"
 msgstr ""
 
 msgid "display using template map file"
 msgstr "mostra usando un file mappa template"
 
 msgid "display with template"
@@ -8840,17 +8993,16 @@ msgid "do not show merges"
 msgstr "non mostrare i merge"
 
 msgid "output diffstat-style summary of changes"
 msgstr ""
 
 msgid "treat all files as text"
 msgstr "tratta tutti i file come testo"
 
-#, fuzzy
 msgid "omit dates from diff headers"
 msgstr "non includere le date nelle intestazioni dei diff"
 
 msgid "show which function each change is in"
 msgstr "mostra in quale funzione si trova ogni modifica"
 
 msgid "produce a diff that undoes the changes"
 msgstr ""
@@ -8868,35 +9020,36 @@ msgid "number of lines of context to sho
 msgstr "numero di righe di contesto da mostrare"
 
 msgid "SIMILARITY"
 msgstr ""
 
 msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr "stima i file rinominati per similarità (0<=s<=100)"
 
+msgid "recurse into subrepositories"
+msgstr "ricorre nei subrepository"
+
 msgid "[OPTION]... [FILE]..."
 msgstr "[OPZIONE]... [FILE]..."
 
 msgid "annotate the specified revision"
 msgstr "annota la revisione specificata"
 
 msgid "follow copies/renames and list the filename (DEPRECATED)"
 msgstr ""
 
-#, fuzzy
 msgid "don't follow copies and renames"
-msgstr "segue le copie e le rinomine dei file"
+msgstr "non seguire le copie e le rinomine"
 
 msgid "list the author (long with -v)"
 msgstr "elenca l'autore (verboso con -v)"
 
-#, fuzzy
 msgid "list the filename"
-msgstr "elenca il changeset"
+msgstr "elenca il nome del file"
 
 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"
@@ -8927,16 +9080,19 @@ msgid "[OPTION]... DEST"
 msgstr "[OPZIONE]... 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 "specify merge tool"
+msgstr "specifica lo strumento da usare per i merge"
+
 msgid "revision to backout"
 msgstr "revisione di cui effettuare il backout"
 
 msgid "[OPTION]... [-r] REV"
 msgstr "[OPZIONE]... [-r] REV"
 
 msgid "reset bisect state"
 msgstr "resetta lo stato di bisect"
@@ -8951,19 +9107,30 @@ 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"
 
-#, fuzzy
 msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c CMD] [REV]"
+
+msgid "force"
+msgstr "forza"
+
+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 "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]"
@@ -8971,73 +9138,63 @@ 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 ""
 
-#, fuzzy
 msgid "[-ac]"
-msgstr "[-a]"
-
-#, fuzzy
+msgstr "[-ac]"
+
 msgid "run even when the destination is unrelated"
-msgstr "esegui anche quando il repository remoto non è collegato"
-
-#, fuzzy
+msgstr "esegui anche quando la destinazione non è correlata"
+
 msgid "a changeset intended to be added to the destination"
-msgstr "un changeset base da specificare invece di una destinazione"
-
-#, fuzzy
+msgstr "un changeset inteso per l'aggiunta alla destinazione"
+
 msgid "a specific branch you would like to bundle"
-msgstr "una specifica revisione di cui si desidera fare il pull"
-
-#, fuzzy
+msgstr "un branch specifico di cui si desidera creare il bundle"
+
 msgid "a base changeset assumed to be available at the destination"
-msgstr "un changeset base da specificare invece di una destinazione"
+msgstr "un changeset base di cui si assume la disponibilità alla 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"
 
-#, fuzzy
 msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-msgstr "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t TIPO] [-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 "[OPZIONE]... FILE..."
 
-#, fuzzy
 msgid "the clone will include an empty working copy (only a repository)"
-msgstr "il clone conterrà solo un repository (nessuna copia di lavoro)"
-
-#, fuzzy
+msgstr "il clone conterrà una copia di lavoro vuota (solo un repository)"
+
 msgid "revision, tag or branch to check out"
-msgstr "revisione di cui effettuare il backout"
-
-#, fuzzy
+msgstr "revisione, tag o branch da reperire"
+
 msgid "include the specified changeset"
-msgstr "collassa le revisioni di cui si effettua il rebase"
-
-#, fuzzy
+msgstr "include il changeset specificato"
+
 msgid "clone only the specified branch"
-msgstr "restituisce solo le modifiche relative alle branch specificate"
+msgstr "clona solo il branch specificato"
 
 msgid "[OPTION]... SOURCE [DEST]"
 msgstr "[OPZIONE]... 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"
 
@@ -9051,19 +9208,19 @@ msgid "forcibly copy over an existing ma
 msgstr "forza una copia su un file gestito esistente"
 
 msgid "[OPTION]... [SOURCE]... DEST"
 msgstr "[OPZIONI]... [SORGENTE]... DEST"
 
 msgid "[INDEX] REV1 REV2"
 msgstr "[INDICE] REV1 REV2"
 
-#, fuzzy
 msgid "add single file mergeable changes"
-msgstr "sto aggiungendo le modifiche ai file\n"
+msgstr ""
+"aggiunge singole modifiche ai file di cui è possibile effettuare il merge"
 
 msgid "add single file all revs append to"
 msgstr ""
 
 msgid "add single file all revs overwrite"
 msgstr ""
 
 msgid "add new file at each rev"
@@ -9079,23 +9236,21 @@ msgid "show the command options"
 msgstr "mostra le opzioni dei comandi"
 
 msgid "[-o] CMD"
 msgstr "[-o] CMD"
 
 msgid "use tags as labels"
 msgstr ""
 
-#, fuzzy
 msgid "annotate with branch names"
-msgstr "mantiene le branch originali"
-
-#, fuzzy
+msgstr "annota con i nomi dei branch"
+
 msgid "use dots for runs"
-msgstr "stile non trovato: %s"
+msgstr "usa i punti per le esecuzioni"
 
 msgid "separate elements by spaces"
 msgstr ""
 
 msgid "[OPTION]... [FILE [REV]...]"
 msgstr "[OPZIONE]... [FILE [REV]...]"
 
 msgid "try extended date formats"
@@ -9105,16 +9260,19 @@ msgid "[-e] DATE [RANGE]"
 msgstr "[-e] DATA [RANGE]"
 
 msgid "FILE REV"
 msgstr "FILE REV"
 
 msgid "[PATH]"
 msgstr "[PERCORSO]"
 
+msgid "revlog format"
+msgstr ""
+
 msgid "REPO NAMESPACE [KEY OLD NEW]"
 msgstr ""
 
 msgid "revision to rebuild to"
 msgstr "revisione alla quale ricostruire"
 
 msgid "[-r REV] [REV]"
 msgstr "[-r REV] [REV]"
@@ -9129,29 +9287,27 @@ msgid "REV1 [REV2]"
 msgstr "REV1 [REV2]"
 
 msgid "do not display the saved mtime"
 msgstr "non mostrare l'mtime salvato"
 
 msgid "[OPTION]..."
 msgstr "[OPZIONE]..."
 
-#, fuzzy
 msgid "revision to check"
-msgstr "revisione di cui effettuare il backout"
+msgstr "revisione da controllare"
 
 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 msgstr "[OPZIONE]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 
 msgid "diff against the second parent"
 msgstr "effettua il diff con il secondo genitore"
 
-#, fuzzy
 msgid "revisions to export"
-msgstr "revisione di cui fare il merge"
+msgstr "revisioni da esportare"
 
 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
 msgstr "[OPZIONE]... [-o OUTFILESPEC] REV..."
 
 msgid "end fields with NUL"
 msgstr "termina i campi con NUL"
 
 msgid "print all revisions that match"
@@ -9160,171 +9316,162 @@ msgstr "stampa tutte le revisioni che co
 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"
 
-#, 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"
 
-#, fuzzy
 msgid "only search files changed within revision range"
-msgstr "cerca nell'intervallo di revisioni fornito"
+msgstr "cerca solo i file modificati nell'intervallo di revisioni"
 
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr "[OPZIONE]... PATTERN [FILE]..."
 
-#, fuzzy
-msgid "show only heads which are descendants of REV"
-msgstr "mostra solo le head che sono discendenti della revisione"
+msgid "show only heads which are descendants of STARTREV"
+msgstr "mostra solo le head che sono discendenti di REVINIZIALE"
+
+msgid "STARTREV"
+msgstr ""
 
 msgid "show topological heads only"
 msgstr ""
 
-msgid "show active branchheads only [DEPRECATED]"
-msgstr ""
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "mostra solo le teste dei branch attive (DEPRECATO)"
 
 msgid "show normal and closed branch heads"
 msgstr ""
 
-#, fuzzy
-msgid "[-ac] [-r REV] [REV]..."
-msgstr "[-r REV] [REV]"
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r REVINIZIALE] [REV]..."
 
 msgid "[TOPIC]"
 msgstr "[ARGOMENTO]"
 
-#, fuzzy
 msgid "identify the specified revision"
 msgstr "identifica la revisione specificata"
 
 msgid "show local revision number"
 msgstr "mostra il numero locale della revisione"
 
 msgid "show global revision id"
 msgstr "mostra id globale della revisione"
 
 msgid "show branch"
 msgstr "mostra le branch"
 
 msgid "show tags"
 msgstr "mostra le tag"
 
-msgid "[-nibt] [-r REV] [SOURCE]"
-msgstr "[-nibt] [-r REV] [SORGENTE]"
-
-#, fuzzy
+msgid "show bookmarks"
+msgstr "mostra i segnalibri"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r REV] [SORGENTE]"
+
 msgid ""
 "directory strip option for patch. This has the same meaning as the "
 "corresponding patch option"
 msgstr ""
 "opzione di rimozione della directory per patch. Questa ha lo stesso\n"
 "significato dell'opzione corrispondente di patch"
 
-#, fuzzy
 msgid "PATH"
-msgstr "[PERCORSO]"
+msgstr "PERCORSO"
 
 msgid "base path"
 msgstr "percorso base"
 
 msgid "skip check for outstanding uncommitted changes"
 msgstr ""
 "salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
 
 msgid "don't commit, just update the working directory"
 msgstr "non effettuare il commit, aggiorna solo la directory di lavoro"
 
 msgid "apply patch to the nodes from which it was generated"
 msgstr "applica la patch al nodo da cui è stata generata"
 
-#, fuzzy
 msgid "use any branch information in patch (implied by --exact)"
-msgstr ""
-"Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
+msgstr "usa ogni informazione sul branch nella patch (implicato da --exact)"
 
 msgid "[OPTION]... PATCH..."
 msgstr "[OPZIONE]... PATCH..."
 
-#, fuzzy
 msgid "run even if remote repository is unrelated"
-msgstr "esegui anche quando il repository remoto non è collegato"
+msgstr "esegui anche se  il repository remoto non è correlato"
 
 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"
 
-#, fuzzy
 msgid "a remote changeset intended to be added"
-msgstr "mostra il changeset corrente nei rami degli antenati"
-
-#, fuzzy
+msgstr "un changeset remoto inteso per l'aggiunta"
+
+msgid "compare bookmarks"
+msgstr "confronta i segnalibri"
+
 msgid "a specific branch you would like to pull"
-msgstr "una specifica revisione di cui si desidera fare il pull"
+msgstr "un branch specifico di cui si desidera fare il pull"
 
 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
 msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle NOME_FILE] [SORGENTE]"
 
 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
 
-#, fuzzy
 msgid "search the repository as it is in REV"
-msgstr "cerca nel repository per come era alla revisione rev"
+msgstr "cerca nel repository per come era in 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 "[OPZIONE]... [PATTERN]..."
 
 msgid "only follow the first parent of merge changesets"
 msgstr "segui solo il primo genitore di un changeset di merge"
 
-#, fuzzy
 msgid "show revisions matching date spec"
 msgstr "mostra le revisioni che corrispondono ad una data fornita"
 
 msgid "show copied files"
 msgstr "mostra i file copiati"
 
-#, fuzzy
 msgid "do case-insensitive search for a given text"
-msgstr "effettua una ricerca case-insensitive di una parola chiave"
-
-#, fuzzy
+msgstr "effettua una ricerca case-insensitive di un testo specificato"
+
 msgid "include revisions where files were removed"
 msgstr "include le revisioni in cui sono stati rimossi dei file"
 
 msgid "show only merges"
 msgstr "mostra solo i merge"
 
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "commit delle revisioni effettuato dall'utente"
-
-#, fuzzy
+msgstr "revisioni il cui commit è stato effettuato dall'utente"
+
 msgid "show only changesets within the given named branch (DEPRECATED)"
-msgstr "mostra solo i changeset all'interno della data named branch"
-
-#, fuzzy
+msgstr ""
+"mostra solo i changeset all'interno della data named branch (DEPRECATO)"
+
 msgid "show changesets within the given named branch"
-msgstr "mostra solo i changeset all'interno della data named branch"
+msgstr "mostra i changeset all'interno del named branch specificato"
 
 msgid "do not display revision or any of its ancestors"
 msgstr "non mostrare la revisione o qualche suo antenato"
 
 msgid "[OPTION]... [FILE]"
 msgstr "[OPZIONE]... [FILE]"
 
 msgid "revision to display"
@@ -9337,55 +9484,59 @@ msgid "force a merge with outstanding ch
 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 ""
 
-#, fuzzy
 msgid "[-P] [-f] [[-r] REV]"
-msgstr "[-f] [[-r] REV]"
-
-#, fuzzy
+msgstr "[-P] [-f] [[-r] REV]"
+
 msgid "a changeset intended to be included in the destination"
-msgstr "mostra changeset non trovati nella destinazione"
-
-#, fuzzy
+msgstr "un changeset intest per l'inclusione nella destinazione"
+
 msgid "a specific branch you would like to push"
-msgstr "una specifica revisione di cui si desidera fare il pull"
+msgstr "un branch specifico di cui si desidera fare il push"
 
 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 
-#, fuzzy
 msgid "show parents of the specified revision"
 msgstr "mostra i genitori della revisione specificata"
 
-#, fuzzy
 msgid "[-r REV] [FILE]"
-msgstr "[-r REV] FILE"
+msgstr "[-r REV] [FILE]"
 
 msgid "[NAME]"
 msgstr "[NOME]"
 
-#, fuzzy
 msgid "update to new branch head if changesets were pulled"
-msgstr "aggiorna alla nuova tip se si è effettuato il pull di changeset"
+msgstr ""
+"aggiorna alla nuova head del branch se si è effettuato il pull di changeset"
 
 msgid "run even when remote repository is unrelated"
 msgstr "esegui anche quando il repository remoto non è collegato"
 
+msgid "BOOKMARK"
+msgstr ""
+
+msgid "bookmark to pull"
+msgstr "segnalibro da importare"
+
 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 "bookmark to push"
+msgstr "segnalibro da esportare"
+
 msgid "allow pushing a new branch"
 msgstr ""
 
 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 
 msgid "record delete for missing files"
 msgstr "registra cancellazione per i file mancanti"
@@ -9394,39 +9545,37 @@ msgid "remove (and delete) file even if 
 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 "[OPZIONE]... SORGENTE... DEST"
 
-#, fuzzy
 msgid "select all unresolved files"
-msgstr "rieffettua il merge di tutti i file non risolti"
+msgstr "seleziona 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 "mark files as unresolved"
+msgstr "marca i file come non risolti"
 
 msgid "hide status prefix"
 msgstr "nascondi il prefisso di stato"
 
 msgid "revert all changes when no arguments given"
 msgstr "annulla tutte le modifiche quando nessun argomento è stato fornito"
 
 msgid "tipmost revision matching date"
 msgstr "la revisione più vicina a tip corrispondente alla data"
 
-#, fuzzy
 msgid "revert to the specified revision"
 msgstr "ritorna alla revisione specificata"
 
 msgid "do not save backup copies of files"
 msgstr "non salva copie di backup dei file"
 
 msgid "[OPTION]... [-r REV] [NAME]..."
 msgstr "[OPZIONE]... [-r REV] [NOME]..."
@@ -9447,23 +9596,21 @@ msgid "ADDR"
 msgstr ""
 
 msgid "address to listen on (default: all interfaces)"
 msgstr "indirizzo su cui stare in ascolto (default: tutte le interfacce)"
 
 msgid "prefix path to serve from (default: server root)"
 msgstr "prefisso del percorso da cui servire (default: radice del server)"
 
-#, fuzzy
 msgid "name to show in web pages (default: working directory)"
 msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)"
 
-#, fuzzy
-msgid "name of the hgweb config file (serve more than one repository)"
-msgstr "nome del file di configurazione webdir (serve più di un repository)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "nome del file di configurazione hgweb (vedere \"hg help hgweb\")"
 
 msgid "name of the hgweb config file (DEPRECATED)"
 msgstr ""
 
 msgid "for remote clients"
 msgstr "per i client remoti"
 
 msgid "web templates to use"
@@ -9512,70 +9659,71 @@ msgid "show only ignored files"
 msgstr "mostra solo i file ignorati"
 
 msgid "show source of copied files"
 msgstr "mostra la sorgente dei file copiati"
 
 msgid "show difference from revision"
 msgstr "mostra le differenze dalla revisione"
 
-#, fuzzy
 msgid "list the changed files of a revision"
-msgstr "è necessario avere almeno alcune revisioni"
-
-msgid "replace existing tag"
-msgstr "rimpiazza tag esistente"
+msgstr "elenca i file modificati di una revisione"
+
+msgid "force tag"
+msgstr "forza il tag"
 
 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 "use <text> as commit message"
 msgstr "usa <text> come messaggio di commit"
 
-#, fuzzy
 msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr "[-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..."
-
-#, fuzzy
+msgstr "[-f] [-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..."
+
 msgid "[-p] [-g]"
-msgstr "[-p]"
-
-#, fuzzy
+msgstr "[-p] [-g]"
+
 msgid "update to new branch head if changesets were unbundled"
-msgstr "aggiorna alla nuova tip se changeset sono stati estratti da un bundle"
+msgstr ""
+"aggiorna alla nuova head del branch se changeset sono stati estratti da un "
+"bundle"
 
 msgid "[-u] FILE..."
 msgstr "[-u] FILE..."
 
-#, fuzzy
 msgid "discard uncommitted changes (no backup)"
-msgstr "importa nella patch le modifiche di cui non si è effettuato il commit"
-
-#, fuzzy
-msgid "check for uncommitted changes"
-msgstr ""
-"salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
-
-#, fuzzy
+msgstr ""
+"scarta modifiche di cui non è stato effettuato il commit (nessun backup)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr ""
+"aggiorna tra branch se non ci modifiche in sospeso di cui non si è "
+"effettuato il commit"
+
 msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr "[-C] [-d DATA] [[-r] REV]"
-
-#, fuzzy, python-format
+msgstr "[-c] [-C] [-d DATA] [[-r] REV]"
+
+#, python-format
 msgid "cannot include %s (%s)"
-msgstr "impossibile fare push di '%s' - %s\n"
+msgstr "impossibile includere %s (%s)"
 
 msgid "not found in manifest"
 msgstr "non trovato nel manifesto"
 
+#, python-format
+msgid "no such file in rev %s"
+msgstr "nessun file alla revisione %s"
+
 msgid "branch name not in UTF-8!"
 msgstr "il nome della branch non è in UTF-8!"
 
 #, python-format
 msgid "%s does not exist!\n"
 msgstr "%s non esiste!\n"
 
 #, python-format
@@ -9608,19 +9756,31 @@ msgstr "%s non è tracciato!\n"
 #, python-format
 msgid "%s not removed!\n"
 msgstr ""
 
 #, python-format
 msgid "copy failed: %s is not a file or a symbolic link\n"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
+msgid "invalid character in dag description: %s..."
+msgstr "carattere non valido nella descrizione del dag: %s..."
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr ""
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr ""
+
+#, python-format
 msgid "invalid event type in dag: %s"
-msgstr "voce non valida in fncache, linea %s"
+msgstr "tipo di evento invalido nel dag: %s"
 
 msgid "working directory state appears damaged!"
 msgstr "lo stato della directory di lavoro risulta danneggiato!"
 
 #, python-format
 msgid "'\\n' and '\\r' disallowed in filenames: %r"
 msgstr "'\\n' e '\\r' non sono consentiti nei nomi dei file: %r"
 
@@ -9657,70 +9817,76 @@ msgstr "socket"
 
 msgid "directory"
 msgstr "directory"
 
 #, python-format
 msgid "unsupported file type (type is %s)"
 msgstr "tipo di file non supportato (il tipo è %s)"
 
+msgid "searching for changes\n"
+msgstr "sto cercando modifiche\n"
+
 msgid "queries"
 msgstr ""
 
-#, fuzzy
 msgid "searching"
-msgstr "ricerca"
+msgstr "ricerca in corso"
 
 msgid "already have changeset "
 msgstr ""
 
 msgid "warning: repository is unrelated\n"
 msgstr ""
 
 msgid "repository is unrelated"
 msgstr "il repository non è imparentato"
 
-#, fuzzy, python-format
-msgid "abort: push creates new remote heads on branch '%s'!\n"
-msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
-
-msgid "abort: push creates new remote heads!\n"
-msgstr "abortito: push crea nuove head remote!\n"
-
-#, fuzzy
-msgid "(you should pull and merge or use push -f to force)\n"
-msgstr ""
-"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr ""
-"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
-
-#, fuzzy, python-format
-msgid "abort: push creates new remote branches: %s!\n"
-msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
-
-#, fuzzy
-msgid "(use 'hg push --new-branch' to create new remote branches)\n"
-msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+#, python-format
+msgid "push creates new remote branches: %s!"
+msgstr "push crea nuovi branch remoti: %s!"
+
+msgid "use 'hg push --new-branch' to create new remote branches"
+msgstr "usare 'hg push --new-branch' per creare nuovi branch remoti"
+
+#, python-format
+msgid "push creates new remote heads on branch '%s'!"
+msgstr "push crea nuove head remote sul branch '%s'!"
+
+msgid "push creates new remote heads!"
+msgstr "push crea nuove head remote!"
+
+msgid "you should pull and merge or use push -f to force"
+msgstr ""
+"dovresti fare il pull e il merge o usare push -f per forzare l'operazione"
+
+msgid "did you forget to merge? use push -f to force"
+msgstr "ti sei dimenticato di effettuare il merge? usare push -f per forzare"
 
 msgid "note: unsynced remote changes!\n"
 msgstr "nota: modifiche remote non sincronizzate!\n"
 
 #, python-format
 msgid "abort: %s\n"
 msgstr "abortito: %s\n"
 
-#, fuzzy, python-format
+#, python-format
+msgid "(%s)\n"
+msgstr ""
+
+#, python-format
 msgid "hg: parse error at %s: %s\n"
-msgstr "impossibile avviare il server a '%s:%d': %s"
-
-#, fuzzy, python-format
+msgstr "hg: errore di parsing a %s: %s\n"
+
+#, python-format
 msgid "hg: parse error: %s\n"
-msgstr "abortito: errore: %s\n"
+msgstr "hg: errore di parsing: %s\n"
+
+msgid "entering debugger - type c to continue starting hg or h for help\n"
+msgstr ""
 
 #, python-format
 msgid ""
 "hg: command '%s' is ambiguous:\n"
 "    %s\n"
 msgstr ""
 "hg: il comando '%s' è ambiguo:\n"
 "    %s\n"
@@ -9788,25 +9954,22 @@ msgid ""
 "broken pipe\n"
 msgstr ""
 "\n"
 "pipe rotta\n"
 
 msgid "abort: out of memory\n"
 msgstr "abortito: memoria esaurita\n"
 
-msgid "** unknown exception encountered, details follow\n"
-msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n"
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr ""
-"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
-
-msgid "** or mercurial@selenic.com\n"
-msgstr "** o mercurial@selenic.com\n"
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr ""
+"** incontrata eccezione sconosciuta, si prega di segnalarla visitando\n"
+
+msgid "**  http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr "**  http://mercurial.selenic.com/wiki/BugTracker\n"
 
 #, python-format
 msgid "** Python %s\n"
 msgstr ""
 
 #, python-format
 msgid "** Mercurial Distributed SCM (version %s)\n"
 msgstr "** Mercurial SCM Distribuito (versione %s)\n"
@@ -9815,57 +9978,67 @@ msgstr "** Mercurial SCM Distribuito (ve
 msgid "** Extensions loaded: %s\n"
 msgstr "** Estensioni caricate: %s\n"
 
 #, python-format
 msgid "no definition for alias '%s'\n"
 msgstr ""
 
 #, python-format
+msgid ""
+"No argument found for substitution of %i variable in alias '%s' definition."
+msgstr ""
+
+#, python-format
+msgid ""
+"error in definition for alias '%s': %s may only be given on the command "
+"line\n"
+msgstr ""
+
+#, python-format
 msgid "alias '%s' resolves to unknown command '%s'\n"
 msgstr "l'alias '%s' corrisponde al comando sconosciuto '%s'\n"
 
 #, python-format
 msgid "alias '%s' resolves to ambiguous command '%s'\n"
 msgstr "l'alias '%s' corrisponde al comando ambiguo '%s'\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "malformed --config option: %r (use --config section.name=value)"
-msgstr "opzione --config malformata: %s"
-
-#, fuzzy, python-format
+msgstr "opzione --config malformata: %r (usare --config sezione.nome=valore)"
+
+#, python-format
 msgid "error getting current working directory: %s"
-msgstr "stampa la radice (top) della directory di lavoro corrente"
+msgstr "errore nel reperimento della directory di lavoro corrente: %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 --config may not be abbreviated!"
+msgstr "l'opzione --config non può essere abbreviata!"
+
+msgid "option --cwd may not be abbreviated!"
+msgstr "l'opzione --cwd non può essere abbreviata!"
 
 msgid ""
 "Option -R has to be separated from other options (e.g. not -qR) and --"
 "repository may only be abbreviated as --repo!"
 msgstr ""
 
 #, python-format
 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
 msgstr ""
 
 #, python-format
 msgid "repository '%s' is not local"
 msgstr "il repository '%s' non è locale"
 
-#, fuzzy
 msgid "warning: --repository ignored\n"
-msgstr "il repository non è imparentato"
+msgstr "attenzione: --repository ignorata\n"
 
 msgid "invalid arguments"
 msgstr "argomenti non validi"
 
 #, python-format
 msgid "unrecognized profiling format '%s' - Ignored\n"
 msgstr ""
 
@@ -9878,16 +10051,20 @@ msgstr ""
 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 "warning: error finding commands in %s\n"
+msgstr "attenzione: errore nella ricerca di comandi in %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
@@ -9921,35 +10098,32 @@ msgstr "sto effettuando il merge di %s\n
 #, python-format
 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
 msgstr ""
 
 #, python-format
 msgid "was merge of '%s' successful (yn)?"
 msgstr ""
 
-msgid "&No"
-msgstr ""
-
-msgid "&Yes"
-msgstr ""
-
 #, python-format
 msgid ""
 " output file %s appears unchanged\n"
 "was merge successful (yn)?"
 msgstr ""
 
 #, python-format
 msgid "merging %s failed!\n"
 msgstr "merge di %s fallito!\n"
 
-#, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
-msgstr "Stato inconsistente, %s:%s è buona e cattiva"
+msgid "starting revisions are not directly related"
+msgstr "le revisioni di partenza non sono direttamente correlate"
+
+#, python-format
+msgid "inconsistent state, %s:%s is good and bad"
+msgstr "etato inconsistente, %s:%s è sia buona sia errata"
 
 #, python-format
 msgid "unknown bisect kind %s"
 msgstr ""
 
 msgid "disabled extensions:"
 msgstr "estensioni disabilitate:"
 
@@ -9966,32 +10140,37 @@ msgid "Environment Variables"
 msgstr "Variabili d'ambiente"
 
 msgid "Specifying Single Revisions"
 msgstr ""
 
 msgid "Specifying Multiple Revisions"
 msgstr "Specificare Revisioni Multiple"
 
-#, fuzzy
 msgid "Specifying Revision Sets"
-msgstr "Specificare Revisioni Multiple"
+msgstr "Specificare Insiemi di Revisioni"
 
 msgid "Diff Formats"
 msgstr "Formati di diff"
 
+msgid "Merge Tools"
+msgstr ""
+
 msgid "Template Usage"
 msgstr ""
 
 msgid "URL Paths"
 msgstr "Percorsi URL"
 
 msgid "Using additional features"
 msgstr "Uso di funzionalità aggiuntive"
 
+msgid "Subrepositories"
+msgstr "Subrepository"
+
 msgid "Configuring hgweb"
 msgstr ""
 
 msgid "Glossary"
 msgstr ""
 
 msgid ""
 "Mercurial reads configuration data from several files, if they exist.\n"
@@ -10154,35 +10333,35 @@ msgid ""
 "information is lost. Mercurial's internal operations (like push and\n"
 "pull) are not affected by this, because they use an internal binary\n"
 "format for communicating changes."
 msgstr ""
 
 msgid ""
 "To make Mercurial produce the git extended diff format, use the --git\n"
 "option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
 msgstr ""
 
 msgid ""
 "HG\n"
 "    Path to the 'hg' executable, automatically passed when running\n"
 "    hooks, extensions or external tools. If unset or empty, this is\n"
 "    the hg executable's name if it's frozen, or an executable named\n"
 "    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
 "    Windows) is searched."
 msgstr ""
 
 msgid ""
 "HGEDITOR\n"
 "    This is the name of the editor to run when committing. See EDITOR."
 msgstr ""
 
-msgid "    (deprecated, use .hgrc)"
+msgid "    (deprecated, use configuration file)"
 msgstr ""
 
 msgid ""
 "HGENCODING\n"
 "    This overrides the default locale setting detected by Mercurial.\n"
 "    This setting is used to convert data including usernames,\n"
 "    changeset descriptions, tag names, and branches. This setting can\n"
 "    be overridden with the --encoding command-line option."
@@ -10194,43 +10373,52 @@ msgid ""
 "    while transcoding user input. The default is \"strict\", which\n"
 "    causes Mercurial to abort if it can't map a character. Other\n"
 "    settings include \"replace\", which replaces unknown characters, and\n"
 "    \"ignore\", which drops them. This setting can be overridden with\n"
 "    the --encodingmode command-line option."
 msgstr ""
 
 msgid ""
+"HGENCODINGAMBIGUOUS\n"
+"    This sets Mercurial's behavior for handling characters with\n"
+"    \"ambiguous\" widths like accented Latin characters with East Asian\n"
+"    fonts. By default, Mercurial assumes ambiguous characters are\n"
+"    narrow, set this variable to \"wide\" if such characters cause\n"
+"    formatting problems."
+msgstr ""
+
+msgid ""
 "HGMERGE\n"
 "    An executable to use for resolving merge conflicts. The program\n"
 "    will be executed with three arguments: local file, remote file,\n"
 "    ancestor file."
 msgstr ""
 
 msgid ""
 "HGRCPATH\n"
-"    A list of files or directories to search for 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."
+"    A list of files or directories to search for configuration\n"
+"    files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+"    is not set, platform default search path is used. If empty, only\n"
+"    the .hg/hgrc from the current repository is read."
 msgstr ""
 
 msgid "    For each element in HGRCPATH:"
 msgstr ""
 
 msgid ""
 "    - if it's a directory, all files ending with .rc are added\n"
 "    - otherwise, the file itself will be added"
 msgstr ""
 
 msgid ""
 "HGPLAIN\n"
-"    When set, this disables any options in .hgrc that might change\n"
-"    Mercurial's default output. This includes encoding, defaults,\n"
-"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    When set, this disables any configuration settings that might\n"
+"    change Mercurial's default output. This includes encoding,\n"
+"    defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
 "    localization. This can be useful when scripting against Mercurial\n"
 "    in the face of existing user configuration."
 msgstr ""
 
 msgid ""
 "    Equivalent options set via command line flags or environment\n"
 "    variables are not overridden."
 msgstr ""
@@ -10238,17 +10426,17 @@ msgstr ""
 msgid ""
 "HGUSER\n"
 "    This is the string used as the author of a commit. If not set,\n"
 "    available values will be considered in this order:"
 msgstr ""
 
 msgid ""
 "    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
+"    - configuration files from the HGRCPATH\n"
 "    - EMAIL\n"
 "    - interactive prompt\n"
 "    - LOGNAME (with ``@hostname`` appended)"
 msgstr ""
 
 msgid ""
 "EMAIL\n"
 "    May be used as the author of a commit; see HGUSER."
@@ -10293,37 +10481,37 @@ msgid ""
 "usage only; they may provide potentially dangerous abilities (such\n"
 "as letting you destroy or modify history); they might not be ready\n"
 "for prime time; or they may alter some usual behaviors of stock\n"
 "Mercurial. It is thus up to the user to activate extensions as\n"
 "needed."
 msgstr ""
 
 msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
 msgstr ""
 
 msgid ""
 "  [extensions]\n"
 "  foo ="
 msgstr ""
 
 msgid "You may also specify the full path to an extension::"
 msgstr ""
 
 msgid ""
 "  [extensions]\n"
 "  myfeature = ~/.hgext/myfeature.py"
 msgstr ""
 
 msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
 msgstr ""
 
 msgid ""
 "  [extensions]\n"
 "  # disabling extension bar residing in /path/to/extension/bar.py\n"
 "  bar = !/path/to/extension/bar.py\n"
 "  # ditto, but no path was supplied for extension baz\n"
 "  baz = !\n"
@@ -10347,17 +10535,17 @@ msgid ""
 "    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
 msgstr ""
 
 msgid ""
 "    Branches may be created when changes are pulled from or pushed to\n"
 "    a remote repository, since new heads may be created by these\n"
 "    operations. Note that the term branch can also be used informally\n"
 "    to describe a development process in which certain development is\n"
-"    done independently of other development.This is sometimes done\n"
+"    done independently of other development. This is sometimes done\n"
 "    explicitly with a named branch, but it can also be done locally,\n"
 "    using bookmarks or clones and anonymous branches."
 msgstr ""
 
 msgid "    Example: \"The experimental branch\"."
 msgstr ""
 
 msgid ""
@@ -10387,16 +10575,31 @@ msgid ""
 msgstr ""
 
 msgid ""
 "Branch head\n"
 "    See 'Head, branch'."
 msgstr ""
 
 msgid ""
+"Branch, inactive\n"
+"    If a named branch has no topological heads, it is considered to be\n"
+"    inactive. As an example, a feature branch becomes inactive when it\n"
+"    is merged into the default branch. The :hg:`branches` command\n"
+"    shows inactive branches by default, though they can be hidden with\n"
+"    :hg:`branches --active`."
+msgstr ""
+
+msgid ""
+"    NOTE: this concept is deprecated because it is too implicit.\n"
+"    Branches should now be explicitly closed using :hg:`commit\n"
+"    --close-branch` when they are no longer needed."
+msgstr ""
+
+msgid ""
 "Branch, named\n"
 "    A collection of changesets which have the same branch name. By\n"
 "    default, children of a changeset in a named branch belong to the\n"
 "    same named branch. A child can be explicitly assigned to a\n"
 "    different branch. See :hg:`help branch`, :hg:`help branches` and\n"
 "    :hg:`commit --close-branch` for more information on managing\n"
 "    branches."
 msgstr ""
@@ -10442,18 +10645,18 @@ msgid ""
 "    The converse of parent changeset: if P is a parent of C, then C is\n"
 "    a child of P. There is no limit to the number of children that a\n"
 "    changeset may have."
 msgstr ""
 
 msgid ""
 "Changeset id\n"
 "    A SHA-1 hash that uniquely identifies a changeset. It may be\n"
-"    represented as either a \"long\" 40-byte hexadecimal string, or a\n"
-"    \"short\" 12-byte hexadecimal string."
+"    represented as either a \"long\" 40 hexadecimal digit string, or a\n"
+"    \"short\" 12 hexadecimal digit string."
 msgstr ""
 
 msgid ""
 "Changeset, merge\n"
 "    A changeset with two parents. This occurs when a merge is\n"
 "    committed."
 msgstr ""
 
@@ -10676,21 +10879,22 @@ msgid ""
 "Merge\n"
 "    Used to bring together divergent branches of work. When you update\n"
 "    to a changeset and then merge another changeset, you bring the\n"
 "    history of the latter changeset into your working directory. Once\n"
 "    conflicts are resolved (and marked), this merge may be committed\n"
 "    as a merge changeset, bringing two branches together in the DAG."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Named branch\n"
 "    See 'Branch, named'."
-msgstr "resetta il nome della branch al nome della branch genitore"
+msgstr ""
+"Named branch\n"
+"    Vedere 'Branch, named'."
 
 msgid ""
 "Null changeset\n"
 "    The empty changeset. It is the parent state of newly-initialized\n"
 "    repositories and repositories with no checked out revision. It is\n"
 "    thus the parent of root changesets and the effective ancestor when\n"
 "    merging unrelated changesets. Can be specified by the alias 'null'\n"
 "    or by the changeset ID '000000000000'."
@@ -10832,21 +11036,22 @@ msgstr ""
 msgid "    Example: \"You should update\"."
 msgstr ""
 
 msgid ""
 "Working directory\n"
 "    See 'Directory, working'."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Working directory parent\n"
 "    See 'Parent, working directory'.\n"
-msgstr "stampa la radice (top) della directory di lavoro corrente"
+msgstr ""
+"Genitore della directory di lavoro\n"
+"    Vedere 'Genitore, directory di lavoro'.\n"
 
 msgid ""
 "Mercurial's internal web server, hgweb, can serve either a single\n"
 "repository, or a collection of them. In the latter case, a special\n"
 "configuration file can be used to specify the repository paths to use\n"
 "and global web configuration options."
 msgstr ""
 
@@ -10906,16 +11111,192 @@ msgid ""
 msgstr ""
 
 msgid ""
 "Here, the left side will be stripped off all repositories found in the\n"
 "right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
 "``bar`` and ``quux/baz`` respectively.\n"
 msgstr ""
 
+msgid "To merge files Mercurial uses merge tools."
+msgstr ""
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, "
+"some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+
+msgid ""
+"``internal:merge``\n"
+"   Uses the internal non-interactive simple merge algorithm for merging\n"
+"   files. It will fail if there are any conflicts and leave markers in\n"
+"   the partially merged file."
+msgstr ""
+
+msgid ""
+"``internal:fail``\n"
+"   Rather than attempting to merge files that were modified on both\n"
+"   branches, it marks them as unresolved. The resolve command must be\n"
+"   used to resolve these conflicts."
+msgstr ""
+
+msgid ""
+"``internal:local``\n"
+"   Uses the local version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:other``\n"
+"   Uses the other version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:prompt``\n"
+"   Asks the user which of the local or the other version to keep as\n"
+"   the merged version."
+msgstr ""
+
+msgid ""
+"``internal:dump``\n"
+"   Creates three versions of the files to merge, containing the\n"
+"   contents of local, other and base. These files can then be used to\n"
+"   perform a merge manually. If the file to be merged is named\n"
+"   ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+"   ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+"   same directory as ``a.txt``."
+msgstr ""
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by "
+"default\n"
+"not handle symlinks or binary files."
+msgstr ""
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, "
+"it\n"
+"   is used.  If it is the name of a tool in the merge-tools configuration, "
+"its\n"
+"   configuration is used. Otherwise the specified tool must be executable "
+"by\n"
+"   the shell."
+msgstr ""
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used "
+"and\n"
+"   must be executable by the shell."
+msgstr ""
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in "
+"the\n"
+"   merge-patterns configuration section, the first usable merge tool\n"
+"   corresponding to a matching pattern is used. Here, binary capabilities of "
+"the\n"
+"   merge tool are not considered."
+msgstr ""
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the "
+"name\n"
+"   of a configured tool, the specified value is used and must be executable "
+"by\n"
+"   the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+"   section, the one with the highest priority is used."
+msgstr ""
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - "
+"but\n"
+"   it will by default not be used for symlinks and binary files."
+msgstr ""
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+"   ``internal:merge`` is used."
+msgstr ""
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+
+msgid ""
+".. note::\n"
+"   After selecting a merge program, Mercurial will by default attempt\n"
+"   to merge the files using a simple merge algorithm first. Only if it "
+"doesn't\n"
+"   succeed because of conflicting changes Mercurial will actually execute "
+"the\n"
+"   merge program. Whether to use the simple merge algorithm first can be\n"
+"   controlled by the premerge setting of the merge tool. Premerge is enabled "
+"by\n"
+"   default unless the file is binary or a symlink."
+msgstr ""
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+
 msgid ""
 "When Mercurial accepts more than one revision, they may be specified\n"
 "individually, or provided as a topologically continuous range,\n"
 "separated by the \":\" character."
 msgstr ""
 
 msgid ""
 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
@@ -10962,16 +11343,23 @@ msgid ""
 "across path separators and ``{a,b}`` to mean \"a or b\"."
 msgstr ""
 
 msgid ""
 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
 "Regexp pattern matching is anchored at the root of the repository."
 msgstr ""
 
+msgid ""
+"To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n"
+"The latter expects null delimited patterns while the former expects line\n"
+"feeds. Each string read from the file is itself treated as a file\n"
+"pattern."
+msgstr ""
+
 msgid "Plain examples::"
 msgstr ""
 
 msgid ""
 "  path:foo/bar   a name bar in a directory named foo in the root\n"
 "                 of the repository\n"
 "  path:path:name a file or directory named \"path:name\""
 msgstr ""
@@ -10987,18 +11375,25 @@ msgid ""
 "  foo/*.c        any name ending in \".c\" in the directory foo\n"
 "  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
 "                 including itself."
 msgstr ""
 
 msgid "Regexp examples::"
 msgstr ""
 
-msgid ""
-"  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+msgid "  re:.*\\.c$      any name ending in \".c\", anywhere in the repository"
+msgstr ""
+
+msgid "File examples::"
+msgstr ""
+
+msgid ""
+"  listfile:list.txt  read list from list.txt with one file pattern per line\n"
+"  listfile0:list.txt read list from list.txt with null byte delimiters\n"
 msgstr ""
 
 msgid "Mercurial supports several ways to specify individual revisions."
 msgstr ""
 
 msgid ""
 "A plain integer is treated as a revision number. Negative integers are\n"
 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
@@ -11050,18 +11445,23 @@ msgid ""
 "The language supports a number of predicates which are joined by infix\n"
 "operators. Parenthesis can be used for grouping."
 msgstr ""
 
 msgid ""
 "Identifiers such as branch names must be quoted with single or double\n"
 "quotes if they contain characters outside of\n"
 "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
-"predicates. Special characters can be used in quoted identifiers by\n"
-"escaping them, e.g., ``\\n`` is interpreted as a newline."
+"predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
 msgstr ""
 
 msgid "There is a single prefix operator:"
 msgstr ""
 
 msgid ""
 "``not x``\n"
 "  Changesets not in x. Short form is ``! x``."
@@ -11102,208 +11502,263 @@ msgstr ""
 msgid ""
 "``x - y``\n"
 "  Changesets in x but not in y."
 msgstr ""
 
 msgid "The following predicates are supported:"
 msgstr ""
 
-msgid ""
-"``adds(pattern)``\n"
-"  Changesets that add a file matching pattern."
-msgstr ""
-
-msgid ""
-"``all()``\n"
-"  All changesets, the same as ``0:tip``."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-"  Greatest common ancestor of the two changesets."
-msgstr ""
-
-msgid ""
-"``ancestors(set)``\n"
-"  Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``author(string)``\n"
-"  Alias for ``user(string)``."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-"  The branch names are found for changesets in set, and the result is\n"
-"  all changesets belonging to one those branches."
-msgstr ""
-
-msgid ""
-"``children(set)``\n"
-"  Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``closed()``\n"
-"  Changeset is closed."
-msgstr ""
-
-msgid ""
-"``contains(pattern)``\n"
-"  Revision contains pattern."
-msgstr ""
-
-msgid ""
-"``date(interval)``\n"
-"  Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-"  Changesets which are decendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-"  Changesets which manually affected files matching pattern."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-"  An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-msgid ""
-"``grep(regex)``\n"
-"  Like ``keyword(string)`` but accepts a regex."
-msgstr ""
-
-msgid ""
-"``head()``\n"
-"  Changeset is a head."
-msgstr ""
-
-msgid ""
-"``heads(set)``\n"
-"  Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``keyword(string)``\n"
-"  Search commit message, user name, and names of changed files for\n"
-"  string."
-msgstr ""
-
-msgid ""
-"``limit(set, n)``\n"
-"  First n members of set."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-"  Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``merge()``\n"
-"  Changeset is a merge changeset."
-msgstr ""
-
-msgid ""
-"``modifies(pattern)``\n"
-"  Changesets which modify files matching pattern."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-"  Changesets missing in path."
-msgstr ""
-
-msgid ""
-"``p1(set)``\n"
-"  First parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``p2(set)``\n"
-"  Second parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``parents(set)``\n"
-"  The set of all parents for all changesets in set."
-msgstr ""
-
-msgid ""
-"``removes(pattern)``\n"
-"  Changesets which remove files matching pattern."
-msgstr ""
-
-msgid ""
-"``reverse(set)``\n"
-"  Reverse order of set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-"  Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``sort(set[, [-]key...])``\n"
-"  Sort set by keys. The default sort order is ascending, specify a key\n"
-"  as ``-key`` to sort in descending order."
-msgstr ""
-
-msgid "  The keys can be:"
-msgstr ""
-
-msgid ""
-"  - ``rev`` for the revision number,\n"
-"  - ``branch`` for the branch name,\n"
-"  - ``desc`` for the commit message (description),\n"
-"  - ``user`` for user name (``author`` can be used as an alias),\n"
-"  - ``date`` for the commit date"
-msgstr ""
-
-msgid ""
-"``tagged()``\n"
-"  Changeset is tagged."
-msgstr ""
-
-msgid ""
-"``user(string)``\n"
-"  User name is string."
+msgid ".. predicatesmarker"
 msgstr ""
 
 msgid "Command line equivalents for :hg:`log`::"
 msgstr ""
 
 msgid ""
 "  -f    ->  ::.\n"
 "  -d x  ->  date(x)\n"
 "  -k x  ->  keyword(x)\n"
 "  -m    ->  merge()\n"
 "  -u x  ->  user(x)\n"
 "  -b x  ->  branch(x)\n"
 "  -P x  ->  !::x\n"
 "  -l x  ->  limit(expr, x)"
 msgstr ""
 
-msgid "Some sample queries::"
-msgstr ""
-
-msgid ""
-"  hg log -r 'branch(default)'\n"
-"  hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-"  hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-"  hg log -r 'sort(date(\"May 2008\"), user)'\n"
-"  hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgid "Some sample queries:"
+msgstr ""
+
+msgid "- Changesets on the default branch::"
+msgstr "- Changeset sul branch di default::"
+
+msgid "    hg log -r \"branch(default)\""
+msgstr ""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+
+msgid "    hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr ""
+
+msgid "- Open branch heads::"
+msgstr "- Teste di branch aperte::"
+
+msgid "    hg log -r \"head() and not closed()\""
+msgstr ""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+"  ``hgext/*``::"
+msgstr ""
+
+msgid "    hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr ""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr ""
+
+msgid "    hg log -r \"sort(date('May 2008'), user)\""
+msgstr ""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+"  release::"
+msgstr ""
+
+msgid ""
+"    hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
+"())\"\n"
+msgstr ""
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+
+msgid "Subrepositories are made of three components:"
+msgstr ""
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+"   parent working directory, and are Mercurial clones or Subversion\n"
+"   checkouts."
+msgstr ""
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+"   tell where the subrepository checkouts come from. Mercurial\n"
+"   subrepositories are referenced like:"
+msgstr ""
+
+msgid "     path/to/nested = https://example.com/nested/repo/path"
+msgstr ""
+
+msgid ""
+"   where ``path/to/nested`` is the checkout location relatively to the\n"
+"   parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+"   is the source repository path. The source can also reference a\n"
+"   filesystem path. Subversion repositories are defined with:"
+msgstr ""
+
+msgid "     path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr ""
+
+msgid ""
+"   Note that ``.hgsub`` does not exist by default in Mercurial\n"
+"   repositories, you have to create and add it to the parent\n"
+"   repository before using subrepositories."
+msgstr ""
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+"   capture whatever information is required to restore the\n"
+"   subrepositories to the state they were committed in a parent\n"
+"   repository changeset. Mercurial automatically record the nested\n"
+"   repositories states when committing in the parent repository."
+msgstr ""
+
+msgid ""
+"   .. note::\n"
+"      The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+"    specified. Subversion subrepositories are currently silently\n"
+"    ignored."
+msgstr ""
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+"    -S/--subrepos is specified."
+msgstr ""
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+"    entire project and its subrepositories. It does this by first\n"
+"    attempting to commit all modified subrepositories, then recording\n"
+"    their state and finally committing it in the parent\n"
+"    repository. Mercurial can be made to abort if any subrepository\n"
+"    content is modified by setting \"ui.commitsubrepos=no\" in a\n"
+"    configuration file (see :hg:`help config`)."
+msgstr ""
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+"    specified. Changes are displayed as usual, on the subrepositories\n"
+"    elements. Subversion subrepositories are currently silently\n"
+"    ignored."
+msgstr ""
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+"    is specified. Subversion subrepositories are currently silently\n"
+"    ignored."
+msgstr ""
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+"    is specified. Subversion subrepositories are currently silently\n"
+"    ignored."
+msgstr ""
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+"    to running :hg:`update`. Listing and retrieving all\n"
+"    subrepositories changes referenced by the parent repository pulled\n"
+"    changesets is expensive at best, impossible in the Subversion\n"
+"    case."
+msgstr ""
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+"    when the parent repository is being pushed. This ensures new\n"
+"    subrepository changes are available when referenced by top-level\n"
+"    repositories."
+msgstr ""
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+"    -S/--subrepos is specified. Subrepository changes are displayed as\n"
+"    regular Mercurial changes on the subrepository\n"
+"    elements. Subversion subrepositories are currently silently\n"
+"    ignored."
+msgstr ""
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+"    originally committed in target changeset. If the recorded\n"
+"    changeset is not available in the current subrepository, Mercurial\n"
+"    will pull it in first before updating.  This means that updating\n"
+"    can require network access when using subrepositories."
+msgstr ""
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
 msgstr ""
 
 msgid ""
 "Mercurial allows you to customize output of commands through\n"
 "templates. You can either pass in a template from the command\n"
 "line, via the --template option, or select an existing\n"
 "template-style (--style)."
 msgstr ""
@@ -11338,18 +11793,27 @@ msgid ""
 "keywords depends on the exact context of the templater. These\n"
 "keywords are usually available for templating a log-like command:"
 msgstr ""
 
 msgid ":author: String. The unmodified author of the changeset."
 msgstr ""
 
 msgid ""
-":branches: String. The name of the branch on which the changeset was\n"
-"    committed. Will be empty if the branch name was default."
+":branch: String. The name of the branch on which the changeset was\n"
+"    committed."
+msgstr ""
+
+msgid ""
+":branches: List of strings. The name of the branch on which the\n"
+"    changeset was committed. Will be empty if the branch name was\n"
+"    default."
+msgstr ""
+
+msgid ":children: List of strings. The children of the changeset."
 msgstr ""
 
 msgid ":date: Date information. The date when the changeset was committed."
 msgstr ""
 
 msgid ":desc: String. The text of the changeset description."
 msgstr ""
 
@@ -11378,18 +11842,18 @@ msgstr ""
 
 msgid ":file_mods: List of strings. Files modified by this changeset."
 msgstr ""
 
 msgid ":file_dels: List of strings. Files removed by this changeset."
 msgstr ""
 
 msgid ""
-":node: String. The changeset identification hash, as a 40-character\n"
-"    hexadecimal string."
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+"    digit string."
 msgstr ""
 
 msgid ":parents: List of strings. The parents of the changeset."
 msgstr ""
 
 msgid ":rev: Integer. The repository-local changeset revision number."
 msgstr ""
 
@@ -11460,16 +11924,21 @@ msgid ""
 "    ``user@example.com``."
 msgstr ""
 
 msgid ""
 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
 "    and \">\" with XML entities."
 msgstr ""
 
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+"    its long hexadecimal representation."
+msgstr ""
+
 msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
 msgstr ""
 
 msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
 msgstr ""
 
 msgid ":firstline: Any text. Returns the first line of text."
 msgstr ""
@@ -11511,22 +11980,27 @@ msgstr ""
 
 msgid ""
 ":rfc3339date: Date. Returns a date using the Internet date format\n"
 "    specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
 msgstr ""
 
 msgid ""
 ":short: Changeset hash. Returns the short form of a changeset hash,\n"
-"    i.e. a 12-byte hexadecimal string."
+"    i.e. a 12 hexadecimal digit string."
 msgstr ""
 
 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
 msgstr ""
 
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+"    text and concatenating them."
+msgstr ""
+
 msgid ":strip: Any text. Strips all leading and trailing whitespace."
 msgstr ""
 
 msgid ""
 ":tabindent: Any text. Returns the text, with every line except the\n"
 "     first starting with a tab character."
 msgstr ""
 
@@ -11541,37 +12015,42 @@ msgstr ""
 msgid "Valid URLs are of the form::"
 msgstr ""
 
 msgid ""
 "  local/filesystem/path[#revision]\n"
 "  file://local/filesystem/path[#revision]\n"
 "  http://[user[:pass]@]host[:port]/[path][#revision]\n"
 "  https://[user[:pass]@]host[:port]/[path][#revision]\n"
-"  ssh://[user[:pass]@]host[:port]/[path][#revision]"
+"  ssh://[user@]host[:port]/[path][#revision]"
 msgstr ""
 
 msgid ""
 "Paths in the local filesystem can either point to Mercurial\n"
 "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
-"incoming --bundle`)."
+"incoming --bundle`). See also :hg:`help paths`."
 msgstr ""
 
 msgid ""
 "An optional identifier after # indicates a particular branch, tag, or\n"
 "changeset to use from the remote repository. See also :hg:`help\n"
 "revisions`."
 msgstr ""
 
 msgid ""
 "Some features, such as pushing to http:// and https:// URLs are only\n"
 "possible if the feature is explicitly enabled on the remote Mercurial\n"
 "server."
 msgstr ""
 
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+
 msgid "Some notes about using SSH with Mercurial:"
 msgstr ""
 
 msgid ""
 "- SSH requires an accessible shell account on the destination machine\n"
 "  and a copy of hg in the remote path or specified with as remotecmd.\n"
 "- path is relative to the remote user's home directory by default. Use\n"
 "  an extra slash at the start of a path to specify an absolute path::"
@@ -11588,23 +12067,23 @@ msgstr ""
 msgid ""
 "    Host *.mylocalnetwork.example.com\n"
 "      Compression no\n"
 "    Host *\n"
 "      Compression yes"
 msgstr ""
 
 msgid ""
-"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"  with the --ssh command line option."
-msgstr ""
-
-msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+"  Alternatively specify \"ssh -C\" as your ssh command in your\n"
+"  configuration file or with the --ssh command line option."
+msgstr ""
+
+msgid ""
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
 msgstr ""
 
 msgid ""
 "  [paths]\n"
 "  alias1 = URL1\n"
 "  alias2 = URL2\n"
 "  ..."
 msgstr ""
@@ -11628,29 +12107,28 @@ msgid ""
 msgstr ""
 
 msgid ""
 "default-push:\n"
 "  The push command will look for a path named 'default-push', and\n"
 "  prefer it over 'default' if both are defined.\n"
 msgstr ""
 
-#, fuzzy
 msgid "remote branch lookup not supported"
-msgstr "requisito '%s' non supportato"
+msgstr "ricerca di branch remoti non supportata"
 
 msgid "dirstate branch not accessible"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "dirstate del branch non accessibile"
+
+#, python-format
 msgid "unknown branch '%s'"
-msgstr "revisione sconosciuta '%s'"
+msgstr "branch sconosciuto '%s'"
 
 msgid "can only share local repositories"
-msgstr ""
+msgstr "è possibile condividere solo repository locali"
 
 msgid "destination already exists"
 msgstr "la destinazione esiste già"
 
 msgid "updating working directory\n"
 msgstr "sto aggiornando la directory di lavoro\n"
 
 #, python-format
@@ -11681,29 +12159,37 @@ msgstr "sto aggiornando al branch %s\n"
 msgid ""
 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
 msgstr ""
 
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr "usa 'hg resolve' per riprovare i merge sui file non risolti\n"
 
 msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
 "abandon\n"
 msgstr ""
-"usa 'hg resolve' per riprovare i merge sui file non risolti o\n"
-"'hg update -C' per abbandonare\n"
+"usare 'hg resolve' per riprovare i merge sui file non risolti o\n"
+"'hg update -C .' per abbandonare\n"
 
 msgid "(branch merge, don't forget to commit)\n"
 msgstr "(merge su branch, non dimenticare di effettuare il commit)\n"
 
 #, python-format
+msgid "config file %s not found!"
+msgstr "file di configurazione %s non trovato!"
+
+#, python-format
 msgid "error reading %s/.hg/hgrc: %s\n"
 msgstr "errore di lettura di %s/.hg/hgrc: %s\n"
 
+#, python-format
+msgid "error accessing repository at %s\n"
+msgstr "errore nell'accedere al repository in %s\n"
+
 msgid "SSL support is unavailable"
 msgstr "Supporto SSL non disponibile"
 
 msgid "IPv6 is not available on this system"
 msgstr "IPv6 non è disponibile su questo sistema"
 
 #, python-format
 msgid "cannot start server at '%s:%d': %s"
@@ -11720,53 +12206,53 @@ msgstr "l'hook %s non è valido (\"%s\" non in un modulo)"
 msgid "exception from first failed import attempt:\n"
 msgstr ""
 
 msgid "exception from second failed import attempt:\n"
 msgstr ""
 
 #, python-format
 msgid "%s hook is invalid (import of \"%s\" failed)"
-msgstr ""
+msgstr "l'hook %s è invalido (fallito import di \"%s\")"
 
 #, python-format
 msgid "%s hook is invalid (\"%s\" is not defined)"
-msgstr ""
+msgstr "l'hook %s è invalido (\"%s\" non è definito)"
 
 #, python-format
 msgid "%s hook is invalid (\"%s\" is not callable)"
-msgstr ""
+msgstr "l'hook %s è invalido (\"%s\" non è invocabile)"
 
 #, python-format
 msgid "error: %s hook failed: %s\n"
-msgstr ""
+msgstr "errore: %s hook fallito: %s\n"
 
 #, python-format
 msgid "error: %s hook raised an exception: %s\n"
-msgstr ""
+msgstr "errore: l'hook %s ha sollevato un'eccezione: %s\n"
 
 #, python-format
 msgid "%s hook failed"
-msgstr ""
+msgstr "%s hook fallito"
 
 #, python-format
 msgid "warning: %s hook failed\n"
-msgstr ""
+msgstr "attenzione: %s hook fallito\n"
 
 #, python-format
 msgid "running hook %s: %s\n"
-msgstr ""
+msgstr "esecuzione dell'hook %s: %s\n"
 
 #, python-format
 msgid "%s hook %s"
-msgstr ""
+msgstr "%s hook %s"
 
 #, python-format
 msgid "warning: %s hook %s\n"
-msgstr ""
+msgstr "attenzione: %s hook %s\n"
 
 msgid "connection ended unexpectedly"
 msgstr "connessione terminata inaspettatamente"
 
 #, python-format
 msgid "unsupported URL component: \"%s\""
 msgstr "componente URL non supportato: \"%s\""
 
@@ -11778,221 +12264,226 @@ msgstr "autorizzazione fallita"
 
 msgid "http error, possibly caused by proxy setting"
 msgstr "errore http, probabilmente causato dalle impostazioni del proxy"
 
 #, python-format
 msgid "real URL is %s\n"
 msgstr "il vero URL è %s\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "'%s' does not appear to be an hg repository:\n"
 "---%%<--- (%s)\n"
 "%s\n"
 "---%%<---\n"
-msgstr "'%s' non sembra essere un repository hg"
+msgstr ""
+"'%s' non sembra essere un repository hg:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
 
 #, python-format
 msgid "'%s' sent a broken Content-Type header (%s)"
 msgstr "'%s' ha inviato un header Content-Type rotto (%s)"
 
 #, python-format
 msgid "'%s' uses newer protocol %s"
-msgstr ""
-
-msgid "look up remote revision"
-msgstr ""
-
-msgid "unexpected response:"
-msgstr "risposta inattesa: "
-
-msgid "look up remote changes"
-msgstr ""
-
-msgid "push failed (unexpected response):"
-msgstr "push fallito (risposta inattesa):"
-
-msgid "remote: "
-msgstr "remoto: "
+msgstr "'%s' usa il protocollo più nuovo %s"
 
 #, python-format
 msgid "push failed: %s"
 msgstr "push fallito: %s"
 
 msgid "Python support for SSL and HTTPS is not installed"
 msgstr "Supporto per Python per SSL e HTTPS non installato"
 
 msgid "cannot create new http repository"
 msgstr "impossibile creare un nuovo repository http"
 
 #, python-format
 msgid "ignoring invalid syntax '%s'"
-msgstr ""
+msgstr "ignoro sintassi invalida '%s'"
 
 #, 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 ""
+msgstr "il repository %s esiste già"
 
 #, 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 "warning: ignoring unknown working parent %s!\n"
+msgstr "attenzione: ignoro genitore sconosciuto della copia di lavoro %s!\n"
+
+#, python-format
 msgid "%r cannot be used in a tag name"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "%r non può essere usato nel nome di un tag"
+
+#, python-format
 msgid "warning: tag %s conflicts with existing branch name\n"
-msgstr "attenzione: conflitti durante il merge.\n"
+msgstr "attenzione: tag %s in conflitto con un branch esistente\n"
 
 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
 msgstr ""
 "la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit "
 "manuale di .hgtags)"
 
 #, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "la directory di lavoro ha il genitore sconosciuto '%s'"
 
 #, python-format
 msgid "unknown revision '%s'"
 msgstr "revisione sconosciuta '%s'"
 
 msgid "abandoned transaction found - run hg recover"
-msgstr ""
+msgstr "trovata transazione abbandonata - 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"
 
 #, python-format
-msgid "rolling back to revision %s (undo %s: %s)\n"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "rolling back to revision %s (undo %s)\n"
-msgstr "Trovata revisione %s da %s\n"
-
-#, fuzzy
+msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
+msgstr "tip del repository riportata alla revisione %s (annulla %s: %s)\n"
+
+#, python-format
+msgid "repository tip rolled back to revision %s (undo %s)\n"
+msgstr "tip del repository riportata alla revisione %s (annulla %s)\n"
+
 msgid "rolling back unknown transaction\n"
-msgstr "sto effettuando il rollback dell'ultima transazione\n"
+msgstr "sto effettuando il rollback di una transazione sconosciuta\n"
 
 #, python-format
 msgid "Named branch could not be reset, current branch still is: %s\n"
 msgstr ""
 
+#, python-format
+msgid "working directory now based on revisions %d and %d\n"
+msgstr "directory di lavoro basata ora sulle revisioni %d e %d\n"
+
+#, python-format
+msgid "working directory now based on revision %d\n"
+msgstr "directory di lavoro ora basata sulla revisione %d\n"
+
 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 "warning: can't find ancestor for '%s' copied from '%s'!\n"
+msgstr ""
+
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr ""
-
-#, fuzzy
+"impossibile fare il commit parziale di un merge (non specificare file o "
+"pattern)"
+
 msgid "can't commit subrepos without .hgsub"
-msgstr "commit del subrepository %s\n"
+msgstr "impossibile effettuare il commit di subrepository senza .hgsub"
+
+#, python-format
+msgid "uncommitted changes in subrepo %s"
+msgstr "modifiche nel subrepository di cui non è stato effettuato il commit %s"
 
 msgid "file not found!"
 msgstr "file non trovato!"
 
 msgid "no match under directory!"
 msgstr "nessuna corrispondenza sotto la directory!"
 
 msgid "file not tracked!"
 msgstr "file non tracciato!"
 
-msgid "unresolved merge conflicts (see hg resolve)"
+msgid "unresolved merge conflicts (see hg help resolve)"
 msgstr ""
 
 #, python-format
 msgid "committing subrepository %s\n"
 msgstr "commit del subrepository %s\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "note: commit message saved in %s\n"
-msgstr "modifica il messaggio di commit"
+msgstr "nota: messaggio di commit salvato in %s\n"
 
 #, python-format
 msgid "trouble committing %s!\n"
-msgstr ""
+msgstr "problemi nell'effettuare il commit di %s!\n"
 
 msgid "requesting all changes\n"
 msgstr "sto richiedendo tutte le modifiche\n"
 
 msgid ""
-"Partial pull cannot be done because other repository doesn't support "
+"partial pull cannot be done because other repository doesn't support "
 "changegroupsubset."
 msgstr ""
+"il pull parziale non può essere eseguito perchè l'altro repository non "
+"supporta changegroupsubset."
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "sto aggiornando il segnalibro %s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr "non aggiorno il segnalibro divergente %s\n"
 
 #, python-format
 msgid "%d changesets found\n"
 msgstr "%d changeset trovati\n"
 
-#, fuzzy
-msgid "bundling changes"
-msgstr "sto aggiungendo i changeset\n"
-
-msgid "chunks"
-msgstr ""
-
-#, fuzzy
-msgid "bundling manifests"
-msgstr "sto aggiungendo i manifesti\n"
+msgid "bundling"
+msgstr "sto creando il bundle"
+
+msgid "manifests"
+msgstr "manifesti"
 
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "revlog vuoto o mancante per %s"
 
-#, fuzzy
-msgid "bundling files"
-msgstr "sto annullando la rimozione di %s\n"
-
 msgid "adding changesets\n"
 msgstr "sto aggiungendo i changeset\n"
 
-#, fuzzy
-msgid "changesets"
-msgstr "sto aggiungendo i changeset\n"
+msgid "chunks"
+msgstr "chunk"
 
 msgid "received changelog group is empty"
 msgstr "il gruppo di changelog ricevuto è vuoto"
 
 msgid "adding manifests\n"
 msgstr "sto aggiungendo i manifesti\n"
 
-#, fuzzy
-msgid "manifests"
-msgstr "sto aggiungendo i manifesti\n"
-
 msgid "adding file changes\n"
 msgstr "sto aggiungendo le modifiche ai file\n"
 
 msgid "received file revlog group is empty"
 msgstr "il gruppo di file revlog ricevuto è vuoto"
 
 #, python-format
 msgid "missing file data for %s:%s - run hg verify"
@@ -12024,59 +12515,73 @@ msgstr "sto effettuando lo streaming di 
 #, python-format
 msgid "%d files to transfer, %s of data\n"
 msgstr "%d file da trasferire, %s di dati\n"
 
 #, python-format
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "trasferiti %s in %.1f secondi (%s/sec)\n"
 
-msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr ""
+msgid "can't use TLS: Python SSL support not installed"
+msgstr "impossibile usare TLS: supporto a Python SSL non installato"
+
+msgid "(using smtps)\n"
+msgstr "(sto usando smtps)\n"
+
+msgid "smtp.host not configured - cannot send mail"
+msgstr "smtp.host non configurato - impossibile inviare mail"
 
 #, 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"
+msgstr "invio mail in corso: host smtp %s, porta %s\n"
+
+msgid "(using starttls)\n"
+msgstr "(sto usando starttls)\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 ""
+msgstr "%r selezionato come trasporto email, non è nel PATH"
 
 #, python-format
 msgid "ignoring invalid sendcharset: %s\n"
 msgstr ""
 
 #, python-format
 msgid "invalid email address: %s"
-msgstr ""
+msgstr "indirizzo e-mail errato: %s"
 
 #, python-format
 msgid "invalid local address: %s"
-msgstr ""
+msgstr "indirizzo locale errato: %s"
 
 #, python-format
 msgid "failed to remove %s from manifest"
-msgstr ""
+msgstr "fallita la rimozione di %s dal manifest"
+
+#, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "pattern non valido (%s): %s"
+
+msgid "invalid pattern"
+msgstr "pattern non valido"
+
+#, python-format
+msgid "unable to read file list (%s)"
+msgstr "impossibile leggere l'elenco dei file (%s)"
 
 #, 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: "
@@ -12089,91 +12594,122 @@ msgstr ""
 
 #, python-format
 msgid ""
 " conflicting flags for %s\n"
 "(n)one, e(x)ec or sym(l)ink?"
 msgstr ""
 
 msgid "&None"
-msgstr ""
+msgstr "&Nessuno"
 
 msgid "E&xec"
-msgstr ""
+msgstr "E&segui"
 
 msgid "Sym&link"
-msgstr ""
+msgstr "&Link simbolico"
 
 msgid "resolving manifests\n"
 msgstr "sto risolvendo i manifesti\n"
 
 #, python-format
 msgid ""
 " local changed %s which remote deleted\n"
 "use (c)hanged version or (d)elete?"
 msgstr ""
 
 msgid "&Changed"
-msgstr ""
+msgstr "&Modificato"
 
 msgid "&Delete"
-msgstr ""
+msgstr "&Elimina"
 
 #, python-format
 msgid ""
 "remote changed %s which local deleted\n"
 "use (c)hanged version or leave (d)eleted?"
 msgstr ""
 
 msgid "&Deleted"
-msgstr ""
-
-#, fuzzy
+msgstr "&Eliminato"
+
 msgid "updating"
-msgstr "sto aggiornando le tag\n"
+msgstr "aggiornamento in corso"
 
 #, python-format
 msgid "update failed to remove %s: %s!\n"
-msgstr ""
+msgstr "l'aggiornamento ha fallito la rimozione di %s: %s!\n"
 
 #, 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"
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
 msgstr ""
 
 #, python-format
 msgid "branch %s not found"
 msgstr "branch %s non trovata"
 
 msgid "merging with a working directory ancestor has no effect"
 msgstr ""
+"effettuare il merge con un antenato della copia di lavoro non ha effetti"
 
 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
 msgstr ""
 "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
 
 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
 msgstr ""
 "ci sono modifiche in sospeso di cui non si è effettuato il commit (usa'hg "
 "status' per elencarle)"
 
-msgid ""
-"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
-"changes)"
-msgstr ""
-
-msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
-msgstr ""
+#, python-format
+msgid "outstanding uncommitted changes in subrepository '%s'"
+msgstr ""
+"modifiche in sospeso di cui non si è effettuato il commit nel subrepository "
+"'%s'"
+
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr ""
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr ""
+
+msgid "Attention:"
+msgstr "Attenzione:"
+
+msgid "Caution:"
+msgstr "Prudenza:"
+
+msgid "!Danger!"
+msgstr "!Pericolo!"
+
+msgid "Error:"
+msgstr "Errore:"
+
+msgid "Hint:"
+msgstr "Suggerimento:"
+
+msgid "Important:"
+msgstr "Importante:"
+
+msgid "Note:"
+msgstr "Nota:"
+
+msgid "Tip:"
+msgstr ""
+
+msgid "Warning!"
+msgstr "Attenzione!"
 
 #, 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"
@@ -12187,313 +12723,595 @@ 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 ""
+msgstr "hunk errato #%d %s (%d %d %d %d)"
 
 #, python-format
 msgid "file %s already exists\n"
-msgstr ""
+msgstr "il file %s esiste già\n"
 
 #, python-format
 msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
-msgstr ""
+msgstr "Hunk #%d con successo a %d con variazioni %d (offset %d linee).\n"
 
 #, python-format
 msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
-msgstr ""
+msgstr "Hunk #%d con successo a %d (offset %d linee).\n"
 
 #, python-format
 msgid "Hunk #%d FAILED at %d\n"
-msgstr ""
+msgstr "Hunk #%d FALLITO a %d\n"
 
 #, python-format
 msgid "bad hunk #%d"
-msgstr ""
+msgstr "hunk errato #%d"
 
 #, python-format
 msgid "bad hunk #%d old text line %d"
-msgstr ""
+msgstr "hunk errato #%d vecchia linea di testo %d"
 
 msgid "could not extract binary patch"
-msgstr ""
+msgstr "impossibile estrarre patch binaria"
 
 #, python-format
 msgid "binary patch is %d bytes, not %d"
-msgstr ""
+msgstr "la patch binaria è di %d byte, non %d"
 
 #, python-format
 msgid "unable to strip away %d of %d dirs from %s"
-msgstr ""
+msgstr "impossibile eliminare %d directory di %d da %s"
 
 msgid "undefined source and destination files"
-msgstr ""
+msgstr "file sorgente e destinazione non definiti"
 
 #, python-format
 msgid "malformed patch %s %s"
-msgstr ""
+msgstr "patch malformata %s %s"
 
 #, python-format
 msgid "unsupported parser state: %s"
-msgstr ""
+msgstr "stato del parser non supportato: %s"
 
 #, python-format
 msgid "patch command failed: %s"
 msgstr "comando patch fallito: %s"
 
 #, python-format
-msgid "Unsupported line endings type: %s"
-msgstr "Tipo di fine linea non supportato: %s"
-
-#, fuzzy
-msgid ""
-"internal patcher failed\n"
-"please report details to http://mercurial.selenic.com/bts/\n"
-"or mercurial@selenic.com\n"
-msgstr ""
-"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
+msgid "unsupported line endings type: %s"
+msgstr "tipo di fine linea non supportato: %s"
+
+msgid "patch failed to apply"
+msgstr "fallita l'applicazione della patch"
 
 #, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
 msgstr "%d file modificati, %d inserimenti(+), %d cancellazioni(-)\n"
 
 #, python-format
 msgid "exited with status %d"
 msgstr "uscito con status %d"
 
 #, python-format
 msgid "killed by signal %d"
 msgstr "ucciso dal segnale %d"
 
-#, fuzzy, python-format
+#, python-format
 msgid "saved backup bundle to %s\n"
-msgstr "sto salvando il bundle in %s\n"
+msgstr "salvato bundle di backup in %s\n"
 
 msgid "adding branch\n"
-msgstr ""
+msgstr "aggiungo il branch\n"
 
 #, python-format
 msgid "strip failed, full bundle stored in '%s'\n"
-msgstr ""
+msgstr "strip fallito, il bundle completo è stato salvato in '%s'\n"
 
 #, python-format
 msgid "strip failed, partial bundle stored in '%s'\n"
-msgstr ""
+msgstr "strip fallito, bundle parziale salvato in '%s'\n"
 
 #, 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 ""
+msgstr "tipo di compressione sconosciuto %r"
 
 msgid "index entry flags need RevlogNG"
 msgstr ""
 
 #, python-format
 msgid "index %s unknown flags %#04x for format v0"
 msgstr ""
 
 #, python-format
 msgid "index %s unknown flags %#04x for revlogng"
-msgstr ""
+msgstr "indice %s flag sconosciute %#04x per revlogng"
 
 #, python-format
 msgid "index %s unknown format %d"
-msgstr ""
+msgstr "indice %s formato sconosciuto %d"
 
 #, python-format
 msgid "index %s is corrupted"
 msgstr "l'indice %s è corrotto"
 
<