#
#
# patch "po/it.po"
#  from [ffba57c9e85b61e7fd9c546ffbffc53d08ce2d06]
#    to [3d2b5df5cd26b54c2ef639ba13078d0811461626]
#
============================================================
--- po/it.po	ffba57c9e85b61e7fd9c546ffbffc53d08ce2d06
+++ po/it.po	3d2b5df5cd26b54c2ef639ba13078d0811461626
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: monotone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 15:07+0100\n"
-"PO-Revision-Date: 2006-03-28 22:56+0100\n"
+"POT-Creation-Date: 2006-03-29 08:20+0200\n"
+"PO-Revision-Date: 2006-03-29 08:27+0100\n"
 "Last-Translator: Lapo Luchini <address@hidden>\n"
 "Language-Team: Lapo Luchini <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@
 msgstr "ignoro la firma sconosciuta di ‘%s’ su ‘%s’\n"

 #: cert.cc:129
-#, fuzzy, c-format
+#, c-format
 msgid "trust function disliked %d signers of %s cert on manifest %s\n"
 msgstr ""

@@ -117,6 +117,8 @@
 "you have no private key to make signatures with\n"
 "perhaps you need to 'genkey <your email>'"
 msgstr ""
+"non hai una chiave privata con cui firmare\n"
+"puoi crearla con ‘genkey <tua e-mail>’"

 #: cert.cc:427
 #, c-format
@@ -154,49 +156,50 @@
 msgid "unknown command '%s'\n"
 msgstr "comando ‘%s’ sconosciuto\n"

-#: commands.cc:324
+#: commands.cc:326
 #, c-format
 msgid "pid file '%s' already exists"
 msgstr "il file pid ‘%s’ esiste già"

-#: commands.cc:348
-#: commands.cc:1357
-#: commands.cc:1427
-#: commands.cc:1863
-#: commands.cc:2709
-#: commands.cc:3361
-#: commands.cc:3596
-#: commands.cc:3635
-#: commands.cc:3980
+#: commands.cc:350
+#: commands.cc:1359
+#: commands.cc:1429
+#: commands.cc:1865
+#: commands.cc:2711
+#: commands.cc:3363
+#: commands.cc:3598
+#: commands.cc:3637
+#: commands.cc:3982
 msgid "informative"
 msgstr "informativo"

-#: commands.cc:348
+#: commands.cc:350
 msgid "command [ARGS...]"
 msgstr "comando [ARGOMENTI…]"

-#: commands.cc:348
+#: commands.cc:350
 msgid "display command help"
 msgstr "mostra l'aiuto sui comandi"

-#: commands.cc:427
+#: commands.cc:429
+#, fuzzy
 msgid ""
 "Enter a description of this change.\n"
-"Lines beginning with `MT:' are removed automatically.\n"
+"Lines beginning with `MTN:' are removed automatically.\n"
 msgstr ""
 "Inserisci una descrizione di questo cambiamento.\n"
 "Le linee che iniziano con ‘MT:’ vengono rimosse automaticamente.\n"

-#: commands.cc:434
+#: commands.cc:436
 #, fuzzy, c-format
 msgid "edit of log message failed"
 msgstr "Il messaggio precedente ha priorità sconosciuta"

-#: commands.cc:443
+#: commands.cc:445
 msgid "note: "
 msgstr "nota: "

-#: commands.cc:444
+#: commands.cc:446
 #, c-format
 msgid ""
 "branch '%s' has multiple heads\n"
@@ -205,66 +208,66 @@
 "il ramo ‘%s’ ha più teste\n"
 "valuta l'uso di ‘%s merge’"

-#: commands.cc:505
-#: commands.cc:781
-#: commands.cc:1445
-#: commands.cc:1529
-#: commands.cc:2759
-#: commands.cc:2787
-#: commands.cc:2790
-#: commands.cc:2926
-#: commands.cc:3618
+#: commands.cc:507
+#: commands.cc:783
+#: commands.cc:1447
+#: commands.cc:1531
+#: commands.cc:2761
+#: commands.cc:2789
+#: commands.cc:2792
+#: commands.cc:2928
+#: commands.cc:3620
 #, c-format
 msgid "no such revision '%s'"
 msgstr "questa revisione ‘%s’ non esiste"

-#: commands.cc:512
+#: commands.cc:514
 #, c-format
 msgid "expanding selection '%s'\n"
 msgstr "espando la selezione ‘%s’\n"

-#: commands.cc:520
+#: commands.cc:522
 #, c-format
 msgid "no match for selection '%s'"
 msgstr "nessuna corrispondenza per la selezione ‘%s’"

-#: commands.cc:526
+#: commands.cc:528
 #, c-format
 msgid "expanded to '%s'\n"
 msgstr "espanso in ‘%s’\n"

-#: commands.cc:543
+#: commands.cc:545
 #, c-format
 msgid "selection '%s' has multiple ambiguous expansions: \n"
 msgstr "la selezione ‘%s’ ha espansioni multiple ambigue: \n"

-#: commands.cc:561
+#: commands.cc:563
 #, c-format
 msgid "non-hex digits in id"
 msgstr "id con cifre non esadecimali"

-#: commands.cc:570
+#: commands.cc:572
 #, c-format
 msgid "partial id '%s' does not have an expansion"
 msgstr "l'id parziale ‘%s’ non può essere espanso"

-#: commands.cc:573
+#: commands.cc:575
 #, c-format
 msgid "partial id '%s' has multiple ambiguous expansions:\n"
 msgstr "id parziale ‘%s’ ha espansioni multiple ambigue: \n"

-#: commands.cc:580
+#: commands.cc:582
 #, c-format
 msgid "expanded partial id '%s' to '%s'\n"
 msgstr "id parziale ‘%s’ espanso in ‘%s’\n"

-#: commands.cc:607
+#: commands.cc:609
 #: netsync.cc:1749
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "la chiave pubblica ‘%s’ non è nel database"

-#: commands.cc:617
+#: commands.cc:619
 #, c-format
 msgid ""
 "Key   : %s\n"
@@ -277,122 +280,122 @@
 "Nome  : %s\n"
 "Valore : %s\n"

-#: commands.cc:651
+#: commands.cc:653
 msgid "ok"
 msgstr "ok"

-#: commands.cc:654
+#: commands.cc:656
 msgid "bad"
 msgstr "invalido"

-#: commands.cc:657
+#: commands.cc:659
 msgid "unknown"
 msgstr "sconosciuto"

-#: commands.cc:744
+#: commands.cc:746
 #, c-format
 msgid "(*) - only in %s/"
 msgstr "(*) - solo in ‘%s/’"

-#: commands.cc:767
+#: commands.cc:769
 #, c-format
 msgid "no keys found\n"
 msgstr "nessuna chiave trovata\n"

-#: commands.cc:769
+#: commands.cc:771
 #, c-format
 msgid "no keys found matching '%s'\n"
 msgstr "nessuna chiave corrispondente a ‘%s’ trovata\n"

-#: commands.cc:787
+#: commands.cc:789
 #, c-format
 msgid "revision %s already has children. We cannot kill it."
 msgstr "la revisione ‘%s’ ha già dei figli, non possiamo eliminarla."

-#: commands.cc:927
-#: commands.cc:951
-#: commands.cc:988
-#: commands.cc:1009
-#: commands.cc:1045
+#: commands.cc:929
+#: commands.cc:953
+#: commands.cc:990
+#: commands.cc:1011
+#: commands.cc:1047
 msgid "key and cert"
 msgstr "chiavi e cert"

-#: commands.cc:927
-#: commands.cc:951
-#: commands.cc:988
+#: commands.cc:929
+#: commands.cc:953
+#: commands.cc:990
 msgid "KEYID"
 msgstr "IDCHIAVE"

-#: commands.cc:927
+#: commands.cc:929
 msgid "generate an RSA key-pair"
 msgstr "genera una coppia di chiavi RSA"

-#: commands.cc:942
+#: commands.cc:944
 #, c-format
 msgid "key '%s' already exists"
 msgstr "chiave ‘%s’ già esistente"

-#: commands.cc:945
+#: commands.cc:947
 #, c-format
 msgid "generating key-pair '%s'"
 msgstr "genero la coppia di chiavi ‘%s’"

-#: commands.cc:947
+#: commands.cc:949
 #, c-format
 msgid "storing key-pair '%s' in %s/"
 msgstr "immagazzino la coppia di chiavi ‘%s’ in ‘%s/’"

-#: commands.cc:951
+#: commands.cc:953
 msgid "drop a public and private key"
 msgstr "cancella una coppia di chiavi"

-#: commands.cc:965
+#: commands.cc:967
 #, c-format
 msgid "dropping public key '%s' from database\n"
 msgstr "sto cancellando la chiave pubblica ‘%s’ dal database\n"

-#: commands.cc:975
+#: commands.cc:977
 #, c-format
 msgid "dropping key pair '%s' from keystore\n"
 msgstr "cancello la coppia di chiavi ‘%s’ dal portachiavi\n"

-#: commands.cc:982
+#: commands.cc:984
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
 msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi o nel database"

-#: commands.cc:984
+#: commands.cc:986
 #, c-format
 msgid "public or private key '%s' does not exist in keystore, and no database was specified"
 msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi, e nessun database è stato specificato"

-#: commands.cc:989
+#: commands.cc:991
 msgid "change passphrase of a private RSA key"
 msgstr "cambia la passphrase di una chiave privata RSA"

-#: commands.cc:999
+#: commands.cc:1001
 #, c-format
 msgid "key '%s' does not exist in the keystore"
 msgstr "la chiave ‘%s’ non è nel portachiavi"

-#: commands.cc:1006
+#: commands.cc:1008
 #, c-format
 msgid "passphrase changed\n"
 msgstr "passphrase cambiata\n"

-#: commands.cc:1009
+#: commands.cc:1011
 msgid "REVISION CERTNAME [CERTVAL]"
 msgstr "REVISIONE NOME_CERT VALORE_CERT"

-#: commands.cc:1010
+#: commands.cc:1012
 msgid "create a cert for a revision"
 msgstr "crea un certificato per una revisione"

-#: commands.cc:1045
+#: commands.cc:1047
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
 msgstr "REVISIONE NOME VALORE FIRMATARIO1 [FIRMATARIO2 […]]"

-#: commands.cc:1046
+#: commands.cc:1048
 #, fuzzy
 msgid ""
 "test whether a hypothetical cert would be trusted\n"
@@ -401,7 +404,7 @@
 "controlla se un ipotetico certificato sarebbe fidato\n"
 " dai settaggi correnti"

-#: commands.cc:1079
+#: commands.cc:1081
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -416,113 +419,113 @@
 "è stato firmato da: %s\n"
 "sarà: %s\n"

-#: commands.cc:1088
+#: commands.cc:1090
 msgid "trusted"
 msgstr "fidato"

-#: commands.cc:1088
+#: commands.cc:1090
 msgid "UNtrusted"
 msgstr "NON fidato"

-#: commands.cc:1091
-#: commands.cc:1104
-#: commands.cc:1117
-#: commands.cc:1134
-#: commands.cc:1185
+#: commands.cc:1093
+#: commands.cc:1106
+#: commands.cc:1119
+#: commands.cc:1136
+#: commands.cc:1187
 msgid "review"
 msgstr "verifica"

-#: commands.cc:1091
+#: commands.cc:1093
 msgid "REVISION TAGNAME"
 msgstr "REVISIONE NOME_ETICHETTA"

-#: commands.cc:1092
+#: commands.cc:1094
 msgid "put a symbolic tag cert on a revision"
 msgstr ""

-#: commands.cc:1104
+#: commands.cc:1106
 msgid "ID (pass|fail|true|false|yes|no|1|0)"
 msgstr ""

-#: commands.cc:1105
+#: commands.cc:1107
 msgid "note the results of running a test on a revision"
 msgstr "annota i risultati dell'esecuzione di un test su una revisione"

-#: commands.cc:1117
-#: commands.cc:1134
+#: commands.cc:1119
+#: commands.cc:1136
 msgid "REVISION"
 msgstr "REVISIONE"

-#: commands.cc:1118
+#: commands.cc:1120
 msgid "approve of a particular revision"
 msgstr "approva una particolare revisione"

-#: commands.cc:1129
+#: commands.cc:1131
 #, fuzzy, c-format
 msgid "need --branch argument for approval"
 msgstr "per il ‘setup’ è necessario un argomento --branch"

-#: commands.cc:1135
+#: commands.cc:1137
 msgid "disapprove of a particular revision"
 msgstr "disapprova una particolare revisione"

-#: commands.cc:1148
+#: commands.cc:1150
 #, c-format
 msgid "revision '%s' has %d changesets, cannot invert\n"
 msgstr ""

-#: commands.cc:1152
+#: commands.cc:1154
 #, fuzzy, c-format
 msgid "need --branch argument for disapproval"
 msgstr "per il ‘setup’ è necessario un argomento --branch"

-#: commands.cc:1185
+#: commands.cc:1187
 msgid "REVISION [COMMENT]"
 msgstr "REVISIONE [COMMENTO]"

-#: commands.cc:1186
+#: commands.cc:1188
 msgid "comment on a particular revision"
 msgstr "commento su una specifica revisione"

-#: commands.cc:1196
+#: commands.cc:1198
 #, c-format
 msgid "edit comment failed"
 msgstr "modifica del commento fallita"

-#: commands.cc:1199
+#: commands.cc:1201
 #, c-format
 msgid "empty comment"
 msgstr "commento vuoto"

-#: commands.cc:1212
-#: commands.cc:1241
-#: commands.cc:1266
-#: commands.cc:1291
-#: commands.cc:2210
-#: commands.cc:2328
-#: commands.cc:2862
-#: commands.cc:3409
+#: commands.cc:1214
+#: commands.cc:1243
+#: commands.cc:1268
+#: commands.cc:1293
+#: commands.cc:2212
+#: commands.cc:2330
+#: commands.cc:2864
+#: commands.cc:3411
 msgid "workspace"
 msgstr "spazio di lavoro"

-#: commands.cc:1212
-#: commands.cc:1241
-#: commands.cc:1357
-#: commands.cc:2328
-#: commands.cc:2709
-#: commands.cc:3409
+#: commands.cc:1214
+#: commands.cc:1243
+#: commands.cc:1359
+#: commands.cc:2330
+#: commands.cc:2711
+#: commands.cc:3411
 msgid "[PATH]..."
 msgstr "[PERCORSO…]"

-#: commands.cc:1213
+#: commands.cc:1215
 msgid "add files to workspace"
 msgstr "aggiunge file allo spazio di lavoro"

-#: commands.cc:1242
+#: commands.cc:1244
 msgid "drop files from workspace"
 msgstr "toglie file dallo spazio di lavoro"

-#: commands.cc:1267
+#: commands.cc:1269
 msgid ""
 "SRC DEST\n"
 "SRC1 [SRC2 [...]] DEST_DIR"
@@ -530,15 +533,15 @@
 "SORG DEST\n"
 "SORG1 [SORG2 […]] CART_DEST"

-#: commands.cc:1269
+#: commands.cc:1271
 msgid "rename entries in the workspace"
 msgstr "rinomina elementi dello spazio di lavoro"

-#: commands.cc:1291
+#: commands.cc:1293
 msgid "NEW_ROOT PUT_OLD"
 msgstr ""

-#: commands.cc:1292
+#: commands.cc:1294
 msgid ""
 "rename the root directory\n"
 "after this command, the directory that currently has the name NEW_ROOT\n"
@@ -552,89 +555,89 @@
 "avrà il nome PUT_OLD.\n"
 "Usare --execute è raccomandato fortemente."

-#: commands.cc:1311
-#: commands.cc:1324
-#: commands.cc:1404
-#: commands.cc:3516
-#: commands.cc:3961
+#: commands.cc:1313
+#: commands.cc:1326
+#: commands.cc:1406
+#: commands.cc:3518
+#: commands.cc:3963
 msgid "debug"
 msgstr "debug"

-#: commands.cc:1311
+#: commands.cc:1313
 msgid "load file contents into db"
 msgstr "carica il contenuto di un file in db"

-#: commands.cc:1324
+#: commands.cc:1326
 msgid "<parent> <left> <right>"
 msgstr "<genitore> <sinistra> <destra>"

-#: commands.cc:1325
+#: commands.cc:1327
 msgid "merge 3 files and output result"
 msgstr "unisce 3 file e stampa il risultato"

-#: commands.cc:1335
+#: commands.cc:1337
 #, c-format
 msgid "ancestor file id does not exist"
 msgstr "id del file antenato inesistente"

-#: commands.cc:1338
+#: commands.cc:1340
 #, c-format
 msgid "left file id does not exist"
 msgstr "id del file di sinistra inesistente"

-#: commands.cc:1341
+#: commands.cc:1343
 #, c-format
 msgid "right file id does not exist"
 msgstr "id del file di destra inesistente"

-#: commands.cc:1352
+#: commands.cc:1354
 #, c-format
 msgid "merge failed"
 msgstr "merge fallito"

-#: commands.cc:1357
+#: commands.cc:1359
 msgid "show status of workspace"
 msgstr "mostra stato dello spazio di lavoro"

-#: commands.cc:1404
+#: commands.cc:1406
 msgid "[PATH]"
 msgstr "[PERCORSO]"

-#: commands.cc:1405
+#: commands.cc:1407
 msgid "calculate identity of PATH or stdin"
 msgstr "calcola l'identità di un percorso o di stdin"

-#: commands.cc:1428
+#: commands.cc:1430
 msgid "FILENAME"
 msgstr "NOMEFILE"

-#: commands.cc:1429
+#: commands.cc:1431
 msgid "write file from database to stdout"
 msgstr "copia un file dal database a stdout"

-#: commands.cc:1457
 #: commands.cc:1459
-#: commands.cc:3627
+#: commands.cc:1461
+#: commands.cc:3629
 #, c-format
 msgid "no file '%s' found in revision '%s'\n"
 msgstr "nessun file ‘%s’ trovato nella revisione ‘%s’\n"

-#: commands.cc:1471
-#: commands.cc:1600
-#: commands.cc:3094
-#: commands.cc:3147
-#: commands.cc:3158
-#: commands.cc:3308
-#: commands.cc:3316
-#: commands.cc:3870
+#: commands.cc:1473
+#: commands.cc:1602
+#: commands.cc:3096
+#: commands.cc:3149
+#: commands.cc:3160
+#: commands.cc:3310
+#: commands.cc:3318
+#: commands.cc:3872
 msgid "tree"
 msgstr "albero"

-#: commands.cc:1471
+#: commands.cc:1473
 msgid "[DIRECTORY]\n"
 msgstr "[CARTELLA]\n"

-#: commands.cc:1472
+#: commands.cc:1474
 msgid ""
 "check out a revision from database into directory.\n"
 "If a revision is given, that's the one that will be checked out.\n"
@@ -642,81 +645,81 @@
 "If no directory is given, the branch name will be used as directory"
 msgstr ""

-#: commands.cc:1491
-#: commands.cc:1510
+#: commands.cc:1493
+#: commands.cc:1512
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr "c'è bisogno di un parametro --branch per estrarre un ramo specifico"

-#: commands.cc:1504
+#: commands.cc:1506
 #, fuzzy, c-format
 msgid "checkout directory '%s' already exists"
 msgstr "Un file di nome '%s' esiste già."

-#: commands.cc:1513
+#: commands.cc:1515
 #, c-format
 msgid "branch '%s' is empty"
 msgstr "il ramo ‘%s’ è vuoto"

-#: commands.cc:1516
+#: commands.cc:1518
 #, c-format
 msgid "branch %s has multiple heads:"
 msgstr "il ramo ‘%s’ ha più teste:"

-#: commands.cc:1519
+#: commands.cc:1521
 #, c-format
 msgid "choose one with '%s checkout -r<id>'"
 msgstr "scegline una con ‘%s checkout -r<id>’"

-#: commands.cc:1520
+#: commands.cc:1522
 #, c-format
 msgid "branch %s has multiple heads"
 msgstr "il ramo ‘%s’ ha più teste"

-#: commands.cc:1547
+#: commands.cc:1549
 #, c-format
 msgid "revision %s is not a member of branch %s\n"
 msgstr "la revisione ‘%s’ non fa parte del ramo ‘%s’\n"

-#: commands.cc:1581
+#: commands.cc:1583
 #, fuzzy, c-format
 msgid "no file %s found in database for %s"
 msgstr "nessuna revisione in database per il file ‘%s’"

-#: commands.cc:1600
+#: commands.cc:1602
 msgid "show unmerged head revisions of branch"
 msgstr "mostra le revisioni delle teste separate di un ramo"

-#: commands.cc:1608
-#: commands.cc:3103
+#: commands.cc:1610
+#: commands.cc:3105
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "specifica un ramo, con --branch=BRANCH"

-#: commands.cc:1613
-#: commands.cc:3107
-#: commands.cc:3196
-#: commands.cc:3199
+#: commands.cc:1615
+#: commands.cc:3109
+#: commands.cc:3198
+#: commands.cc:3201
 #, c-format
 msgid "branch '%s' is empty\n"
 msgstr "il ramo ‘%s’ è vuoto\n"

-#: commands.cc:1615
+#: commands.cc:1617
 #, c-format
 msgid "branch '%s' is currently merged:\n"
 msgstr "il ramo ‘%s’ è attualmente unito:\n"

-#: commands.cc:1617
+#: commands.cc:1619
 #, c-format
 msgid "branch '%s' is currently unmerged:\n"
 msgstr "il ramo ‘%s’ è attualmente separato:\n"

-#: commands.cc:1656
+#: commands.cc:1658
 #, c-format
 msgid "no epoch for branch %s\n"
 msgstr "nessuna epoca trovata per il ramo ‘%s’\n"

-#: commands.cc:1864
+#: commands.cc:1866
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
@@ -742,149 +745,149 @@
 "perso\n"
 "cambiato"

-#: commands.cc:1875
+#: commands.cc:1877
 msgid ""
 "show database objects, or the current workspace manifest, or known,\n"
 "unknown, intentionally ignored, missing, or changed state files"
 msgstr ""

-#: commands.cc:1913
-#: commands.cc:1941
-#: commands.cc:1959
+#: commands.cc:1915
+#: commands.cc:1943
+#: commands.cc:1961
 msgid "packet i/o"
 msgstr "i/o pacchetti"

-#: commands.cc:1913
-#: commands.cc:1941
+#: commands.cc:1915
+#: commands.cc:1943
 msgid "ID"
 msgstr "ID"

-#: commands.cc:1913
+#: commands.cc:1915
 msgid "write public key packet to stdout"
 msgstr "scrive la chiave pubblica su stdout"

-#: commands.cc:1935
+#: commands.cc:1937
 #, c-format
 msgid "public key '%s' does not exist"
 msgstr "la chiave pubblica ‘%s’ non è conosciuta"

-#: commands.cc:1941
+#: commands.cc:1943
 msgid "write private key packet to stdout"
 msgstr "scrive la chiave privata su stdout"

-#: commands.cc:1949
+#: commands.cc:1951
 #, c-format
 msgid "public and private key '%s' do not exist in keystore"
 msgstr "la coppia di chiavi ‘%s’ non è nel portachiavi"

-#: commands.cc:1960
+#: commands.cc:1962
 msgid "read packets from files or stdin"
 msgstr "legge pacchetti da file o da stdin"

-#: commands.cc:1968
+#: commands.cc:1970
 #, c-format
 msgid "no packets found on stdin"
 msgstr "nessun pacchetto trovato in stdin"

-#: commands.cc:1979
+#: commands.cc:1981
 #, c-format
 msgid "no packets found in given file"
 msgid_plural "no packets found in given files"
 msgstr[0] "nessun pacchetto trovato nel file dato"
 msgstr[1] "nessun pacchetto trovato nei file dati"

-#: commands.cc:1983
+#: commands.cc:1985
 #, c-format
 msgid "read %d packet"
 msgid_plural "read %d packets"
 msgstr[0] "letto %d pacchetto"
 msgstr[1] "letti %d pacchetto"

-#: commands.cc:2012
+#: commands.cc:2014
 #, fuzzy, c-format
 msgid "setting default server to %s\n"
 msgstr "Identificazione automatica (DOS per default)"

-#: commands.cc:2018
+#: commands.cc:2020
 #, c-format
 msgid "no hostname given"
 msgstr "nessun nome di host dato"

-#: commands.cc:2020
+#: commands.cc:2022
 #, c-format
 msgid "no server given and no default server set"
 msgstr "nessun server specificato e nessun server di default impostato"

-#: commands.cc:2038
+#: commands.cc:2040
 #, c-format
 msgid "setting default branch include pattern to '%s'\n"
 msgstr ""

-#: commands.cc:2044
+#: commands.cc:2046
 #, c-format
 msgid "setting default branch exclude pattern to '%s'\n"
 msgstr ""

-#: commands.cc:2050
+#: commands.cc:2052
 #, fuzzy, c-format
 msgid "no branch pattern given"
 msgstr "non è specificato nessun file d'ingresso"

-#: commands.cc:2052
+#: commands.cc:2054
 #, c-format
 msgid "no branch pattern given and no default pattern set"
 msgstr ""

-#: commands.cc:2068
-#: commands.cc:2083
-#: commands.cc:2097
-#: commands.cc:2112
+#: commands.cc:2070
+#: commands.cc:2085
+#: commands.cc:2099
+#: commands.cc:2114
 msgid "network"
 msgstr "rete"

-#: commands.cc:2068
-#: commands.cc:2083
-#: commands.cc:2097
+#: commands.cc:2070
+#: commands.cc:2085
+#: commands.cc:2099
 #, fuzzy
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "Usa sovrapposizione motivo"

-#: commands.cc:2069
+#: commands.cc:2071
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
 msgstr ""

-#: commands.cc:2084
+#: commands.cc:2086
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
 msgstr ""

-#: commands.cc:2091
-#, c-format
+#: commands.cc:2093
+#, fuzzy, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
-msgstr ""
+msgstr "eseguo ‘pull’ anonimo; utilizza ‘-k NOMECHIAVE’ se è necessario autenticarsi\n"

-#: commands.cc:2098
+#: commands.cc:2100
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr ""

-#: commands.cc:2112
+#: commands.cc:2114
 #, fuzzy
 msgid "PATTERN ..."
 msgstr "Motivo"

-#: commands.cc:2113
+#: commands.cc:2115
 msgid "serve the branches specified by PATTERNs to connecting clients"
 msgstr ""

-#: commands.cc:2126
+#: commands.cc:2128
 #, c-format
 msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
 msgstr ""

-#: commands.cc:2138
+#: commands.cc:2140
 msgid "database"
 msgstr "database"

-#: commands.cc:2139
+#: commands.cc:2141
 msgid ""
 "init\n"
 "info\n"
@@ -902,92 +905,92 @@
 "set_epoch BRANCH EPOCH\n"
 msgstr ""

-#: commands.cc:2153
+#: commands.cc:2155
 msgid "manipulate database state"
 msgstr "manipola lo stato del database"

-#: commands.cc:2200
+#: commands.cc:2202
 #, fuzzy, c-format
 msgid "The epoch must be %s characters"
 msgstr "La #define %s deve essere un intero."

-#: commands.cc:2210
+#: commands.cc:2212
 msgid ""
 "set PATH ATTR VALUE\n"
 "get PATH [ATTR]\n"
 "drop PATH [ATTR]"
 msgstr ""

-#: commands.cc:2211
+#: commands.cc:2213
 msgid "set, get or drop file attributes"
 msgstr ""

-#: commands.cc:2227
+#: commands.cc:2229
 #, c-format
 msgid "Unknown path '%s'"
 msgstr "Percorso sconosciuto ‘%s’"

-#: commands.cc:2256
+#: commands.cc:2258
 #, c-format
 msgid "Path '%s' does not have attribute '%s'\n"
 msgstr "Il percorso ‘%s’ non ha l'attributo ‘%s’\n"

-#: commands.cc:2310
+#: commands.cc:2312
 #, c-format
 msgid "--message and --message-file are mutually exclusive"
 msgstr "--message e --message-file sono mutuamente esclusivi"

-#: commands.cc:2329
+#: commands.cc:2331
 #, fuzzy
 msgid "commit workspace to database"
 msgstr "aggiunge file allo spazio di lavoro"

-#: commands.cc:2347
+#: commands.cc:2349
 #, c-format
 msgid "no changes to commit\n"
 msgstr "nessuna modifica che necessita di commit\n"

-#: commands.cc:2361
+#: commands.cc:2363
 #, c-format
 msgid "beginning commit on branch '%s'\n"
 msgstr "inizio il commit sul ramo ‘%s’\n"

-#: commands.cc:2370
-#, c-format
+#: commands.cc:2372
+#, fuzzy, c-format
 msgid ""
-"MT/log is non-empty and log message was specified on command line\n"
-"perhaps move or delete MT/log,\n"
+"_MTN/log is non-empty and log message was specified on command line\n"
+"perhaps move or delete _MTN/log,\n"
 "or remove --message/--message-file from the command line?"
-msgstr ""
+msgstr "‘_MTN/log’ non è vuoto e un messaggio di log è stato specificato sulla riga di comando\n"

-#: commands.cc:2382
+#: commands.cc:2384
 #, c-format
 msgid "empty log message; commit canceled"
 msgstr ""

-#: commands.cc:2401
+#: commands.cc:2403
 #, fuzzy, c-format
 msgid "log message rejected: %s\n"
 msgstr "definizione del messaggio duplicata"

-#: commands.cc:2409
+#: commands.cc:2411
 #, c-format
 msgid "revision %s already in database\n"
 msgstr "la revisione ‘%s’ è già nel database\n"

-#: commands.cc:2447
-#: commands.cc:2464
-#: commands.cc:2483
+#: commands.cc:2449
+#: commands.cc:2466
+#: commands.cc:2485
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "file ‘%s’ modificato durante il commit, abbandono"

-#: commands.cc:2509
+#: commands.cc:2511
 #, fuzzy, c-format
 msgid "committed revision %s\n"
 msgstr "CVS Revisione"

-#: commands.cc:2515
+#: commands.cc:2517
 #, c-format
 msgid ""
 "note: this revision creates divergence\n"
@@ -996,7 +999,7 @@
 "nota: questa revisione crea una divergenza\n"
 "nota: potresti voler (o non voler) eseguire ‘%s merge’"

-#: commands.cc:2710
+#: commands.cc:2712
 #, fuzzy
 msgid ""
 "show current diffs on stdout.\n"
@@ -1009,23 +1012,23 @@
 " la revisione. Se sono date due revisioni, viene data la differenza tra\n"
 " loro. Se non è specificato nessun formato, viene usato unificato per default."

-#: commands.cc:2726
+#: commands.cc:2728
 #, c-format
 msgid ""
 "--diff-args requires --external\n"
 "try adding --external or removing --diff-args?"
 msgstr ""

-#: commands.cc:2768
+#: commands.cc:2770
 #, c-format
 msgid "current revision has no ancestor"
 msgstr "la revisione attuale non ha antenati"

-#: commands.cc:2831
+#: commands.cc:2833
 msgid "no changes"
 msgstr "nessun cambiamento"

-#: commands.cc:2863
+#: commands.cc:2865
 msgid ""
 "update workspace.\n"
 "This command modifies your workspace to be based off of a\n"
@@ -1034,12 +1037,12 @@
 "If not, update the workspace to the head of the branch."
 msgstr ""

-#: commands.cc:2901
+#: commands.cc:2903
 #, c-format
 msgid "this workspace is a new project; cannot update"
 msgstr ""

-#: commands.cc:2908
+#: commands.cc:2910
 #, c-format
 msgid ""
 "your request matches no descendents of the current revision\n"
@@ -1047,32 +1050,32 @@
 "maybe you want --revision=<rev on other branch>"
 msgstr ""

-#: commands.cc:2913
+#: commands.cc:2915
 #, c-format
 msgid "multiple update candidates:"
 msgstr "candidati multipli per l'update:"

-#: commands.cc:2917
+#: commands.cc:2919
 #, c-format
 msgid "choose one with '%s update -r<id>'"
 msgstr "selezionane uno con ‘%s checkout -r<id>’"

-#: commands.cc:2918
+#: commands.cc:2920
 #, c-format
 msgid "multiple update candidates remain after selection"
 msgstr ""

-#: commands.cc:2933
+#: commands.cc:2935
 #, c-format
 msgid "already up to date at %s\n"
 msgstr "già aggiornato a ‘%s’\n"

-#: commands.cc:2941
+#: commands.cc:2943
 #, c-format
 msgid "selected update target %s\n"
 msgstr "selezionata revisione ‘%s’ per l'update\n"

-#: commands.cc:2971
+#: commands.cc:2973
 #, c-format
 msgid ""
 "revision %s is a member of multiple branches:\n"
@@ -1081,247 +1084,248 @@
 "try again with explicit --branch"
 msgstr ""

-#: commands.cc:2977
+#: commands.cc:2979
 #, c-format
 msgid ""
 "revision %s is a member of\n"
 "%s, updating workspace branch"
 msgstr ""

-#: commands.cc:2983
+#: commands.cc:2985
 #, c-format
 msgid ""
 "revision %s is a member of no branches,\n"
 "using branch %s for workspace"
 msgstr ""

-#: commands.cc:3084
+#: commands.cc:3086
 #, c-format
 msgid "updated to base revision %s\n"
 msgstr "aggiorno alla revisione base ‘%s’\n"

-#: commands.cc:3094
+#: commands.cc:3096
 msgid "merge unmerged heads of branch"
 msgstr "fa il merge delle teste di un ramo"

-#: commands.cc:3110
+#: commands.cc:3112
 #, c-format
 msgid "branch '%s' is already merged\n"
 msgstr "il ramo ‘%s’ è già unito\n"

-#: commands.cc:3118
+#: commands.cc:3120
 #, fuzzy, c-format
 msgid "starting with revision 1 / %d\n"
 msgstr "&Annota questa revisione"

-#: commands.cc:3122
+#: commands.cc:3124
 #, fuzzy, c-format
 msgid "merging with revision %d / %d\n"
 msgstr "&Annota questa revisione"

-#: commands.cc:3123
-#: commands.cc:3124
-#: commands.cc:3206
-#: commands.cc:3339
-#: commands.cc:3340
+#: commands.cc:3125
+#: commands.cc:3126
+#: commands.cc:3208
+#: commands.cc:3341
+#: commands.cc:3342
 #, c-format
 msgid "[source] %s\n"
 msgstr "[sorgente] %s\n"

-#: commands.cc:3141
-#: commands.cc:3304
-#: commands.cc:3358
+#: commands.cc:3143
+#: commands.cc:3306
+#: commands.cc:3360
 #, c-format
 msgid "[merged] %s\n"
 msgstr "[unione] %s\n"

-#: commands.cc:3144
+#: commands.cc:3146
 #, c-format
 msgid "note: your workspaces have not been updated\n"
 msgstr "nota: lo spazio di lavoro non è stato aggiornato\n"

-#: commands.cc:3147
+#: commands.cc:3149
 #, fuzzy
 msgid "SOURCE-BRANCH DEST-BRANCH"
 msgstr "&Crea nuovo ramo"

-#: commands.cc:3148
+#: commands.cc:3150
 msgid "merge from one branch to another asymmetrically"
 msgstr ""

-#: commands.cc:3158
+#: commands.cc:3160
 msgid "SOURCE-BRANCH DEST-BRANCH DIR"
 msgstr "RAMO_SORG RAMO_DEST CARTELLA"

-#: commands.cc:3159
+#: commands.cc:3161
 msgid "merge one branch into a subdirectory in another branch"
 msgstr ""

-#: commands.cc:3197
-#: commands.cc:3200
+#: commands.cc:3199
+#: commands.cc:3202
 #, c-format
 msgid "branch '%s' is not merged\n"
 msgstr "il ramo ‘%s’ è separato\n"

-#: commands.cc:3205
+#: commands.cc:3207
 #, c-format
 msgid "propagating %s -> %s\n"
 msgstr "propago ‘%s’ → ‘%s’\n"

-#: commands.cc:3207
+#: commands.cc:3209
 #, c-format
 msgid "[target] %s\n"
 msgstr "[obiettivo] %s\n"

-#: commands.cc:3212
+#: commands.cc:3214
 #, c-format
 msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
 msgstr "il ramo ‘%s’ è aggiornato rispetto al ramo ‘%s’\n"

-#: commands.cc:3214
+#: commands.cc:3216
 #, c-format
 msgid "no action taken\n"
 msgstr "nessuna azione svolta\n"

-#: commands.cc:3218
+#: commands.cc:3220
 #, c-format
 msgid "no merge necessary; putting %s in branch '%s'\n"
 msgstr "merge non necessario; metto ‘%s’ nel ramo ‘%s’\n"

-#: commands.cc:3254
+#: commands.cc:3256
 #, c-format
 msgid "Path %s not found in destination tree."
 msgstr "Percorso ‘%s’ non trovato nell'albero di destinazione."

-#: commands.cc:3308
+#: commands.cc:3310
 msgid "refresh the inodeprint cache"
 msgstr "aggiorna la cache degli inodeprint"

-#: commands.cc:3317
+#: commands.cc:3319
 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
 msgstr "REV_SINISTRA REV_DESTRA RAMO_DESTINAZIONE"

-#: commands.cc:3318
+#: commands.cc:3320
 msgid "merge two explicitly given revisions, placing result in given branch"
 msgstr "unisce due revisioni specificate, mettendo il risultato in un ramo specificato"

-#: commands.cc:3332
+#: commands.cc:3334
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "‘%s’ e ‘%s’ sono la stessa revisione, annullo"

-#: commands.cc:3334
 #: commands.cc:3336
+#: commands.cc:3338
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s è già antenato di %s"

-#: commands.cc:3361
+#: commands.cc:3363
 msgid "(revision|file|key) PARTIAL-ID"
 msgstr ""

-#: commands.cc:3362
+#: commands.cc:3364
 #, fuzzy
 msgid "complete partial id"
 msgstr "id parziale ‘%s’ espanso in ‘%s’\n"

-#: commands.cc:3371
+#: commands.cc:3373
 #, c-format
 msgid "non-hex digits in partial id"
 msgstr "cifre non decimali nell'ID parziale"

-#: commands.cc:3410
+#: commands.cc:3412
 msgid "revert file(s), dir(s) or entire workspace (\".\")"
 msgstr ""

-#: commands.cc:3487
+#: commands.cc:3489
 #, c-format
 msgid "reverting %s"
 msgstr "recupero ‘%s’"

-#: commands.cc:3491
+#: commands.cc:3493
 #, c-format
 msgid "no file version %s found in database for %s"
 msgstr ""

-#: commands.cc:3504
+#: commands.cc:3506
 #, c-format
 msgid "recreating %s/"
 msgstr "ri-creo ‘%s/’"

-#: commands.cc:3516
+#: commands.cc:3518
 msgid "RCSFILE..."
 msgstr ""

-#: commands.cc:3517
+#: commands.cc:3519
 msgid ""
 "parse versions in RCS files\n"
 "this command doesn't reconstruct or import revisions.you probably want cvs_import"
 msgstr ""

-#: commands.cc:3533
+#: commands.cc:3535
 msgid "rcs"
 msgstr "rcs"

-#: commands.cc:3533
+#: commands.cc:3535
 msgid "CVSROOT"
 msgstr "CVSROOT"

-#: commands.cc:3533
+#: commands.cc:3535
 msgid "import all versions in CVS repository"
 msgstr "importa tutte le versioni di un repository CVS"

-#: commands.cc:3596
+#: commands.cc:3598
 msgid "PATH"
 msgstr "PERCORSO"

-#: commands.cc:3597
+#: commands.cc:3599
 msgid "print annotated copy of the file from REVISION"
 msgstr ""

-#: commands.cc:3617
+#: commands.cc:3619
 #, c-format
 msgid "no revision for file '%s' in database"
 msgstr "nessuna revisione nel database per il file ‘%s’"

-#: commands.cc:3635
+#: commands.cc:3637
 msgid "[FILE] ..."
 msgstr "[FILE…]"

-#: commands.cc:3636
+#: commands.cc:3638
 msgid ""
 "print history in reverse order (filtering by 'FILE'). If one or more\n"
 "revisions are given, use them as a starting point."
 msgstr ""

-#: commands.cc:3684
+#: commands.cc:3686
 #, fuzzy, c-format
 msgid "Unknown file '%s' for log command"
 msgstr "Spiacente, formato del file sconosciuto."

-#: commands.cc:3702
+#: commands.cc:3704
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr ""

-#: commands.cc:3870
+#: commands.cc:3872
 msgid "[DIRECTORY]"
 msgstr "[CARTELLA]"

-#: commands.cc:3870
+#: commands.cc:3872
+#, fuzzy
 msgid "setup a new workspace directory, default to current"
-msgstr ""
+msgstr "imposta una nuova cartella come spazio di lavoro, per default quella corrente"

-#: commands.cc:3876
+#: commands.cc:3878
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "per il ‘setup’ è necessario un argomento --branch"

-#: commands.cc:3890
+#: commands.cc:3892
 msgid "automation"
 msgstr "automazione"

-#: commands.cc:3891
+#: commands.cc:3893
 msgid ""
 "interface_version\n"
 "heads [BRANCH]\n"
@@ -1349,84 +1353,84 @@
 "keys\n"
 msgstr ""

-#: commands.cc:3915
+#: commands.cc:3917
 msgid "automation interface"
 msgstr "interfaccia di automazione"

-#: commands.cc:3929
-#: commands.cc:3945
+#: commands.cc:3931
+#: commands.cc:3947
 msgid "vars"
 msgstr "variabili"

-#: commands.cc:3929
+#: commands.cc:3931
 msgid "DOMAIN NAME VALUE"
 msgstr "DOMINIO NOME VALORE"

-#: commands.cc:3930
+#: commands.cc:3932
 msgid "set the database variable NAME to VALUE, in domain DOMAIN"
 msgstr ""

-#: commands.cc:3945
+#: commands.cc:3947
 msgid "DOMAIN NAME"
 msgstr "DOMINIO NOME"

-#: commands.cc:3946
+#: commands.cc:3948
 msgid "remove the database variable NAME in domain DOMAIN"
 msgstr ""

-#: commands.cc:3957
+#: commands.cc:3959
 #, c-format
 msgid "no var with name %s in domain %s"
 msgstr "nessuna variabile ha nome ‘%s’ nel dominio ‘%s’"

-#: commands.cc:3961
+#: commands.cc:3963
 msgid "REVID"
 msgstr "ID_REV"

-#: commands.cc:3962
+#: commands.cc:3964
 msgid "dump the roster associated with the given REVID"
 msgstr ""

-#: commands.cc:3980
+#: commands.cc:3982
 msgid "REV REV"
 msgstr "REV REV"

-#: commands.cc:3980
+#: commands.cc:3982
 msgid "Show what conflicts would need to be resolved to merge the given revisions."
 msgstr ""

-#: commands.cc:3989
 #: commands.cc:3991
+#: commands.cc:3993
 #, c-format
 msgid "%s in an ancestor of %s; no merge is needed."
 msgstr "‘%s’ è un antenato di ‘%s’: il merge non è necessario."

-#: commands.cc:4005
+#: commands.cc:4007
 #, fuzzy, c-format
 msgid "There are %s node_name_conflicts."
 msgstr "Non ci sono conflitti da risolvere"

-#: commands.cc:4006
+#: commands.cc:4008
 #, fuzzy, c-format
 msgid "There are %s file_content_conflicts."
 msgstr "Non ci sono conflitti da risolvere"

-#: commands.cc:4007
+#: commands.cc:4009
 #, fuzzy, c-format
 msgid "There are %s node_attr_conflicts."
 msgstr "Non ci sono conflitti da risolvere"

-#: commands.cc:4008
+#: commands.cc:4010
 #, fuzzy, c-format
 msgid "There are %s orphaned_node_conflicts."
 msgstr "Non ci sono conflitti da risolvere"

-#: commands.cc:4009
+#: commands.cc:4011
 #, fuzzy, c-format
 msgid "There are %s rename_target_conflicts."
 msgstr "Non ci sono conflitti da risolvere"

-#: commands.cc:4010
+#: commands.cc:4012
 #, fuzzy, c-format
 msgid "There are %s directory_loop_conflicts."
 msgstr "Non ci sono conflitti da risolvere"
@@ -1589,9 +1593,9 @@
 msgstr "%d file mancanti\n"

 #: database_check.cc:876
-#, fuzzy, c-format
+#, c-format
 msgid "%d unreferenced files\n"
-msgstr "Sfoglia"
+msgstr ""

 #: database_check.cc:879
 #, fuzzy, c-format
@@ -1717,8 +1721,13 @@
 "(this is irreversible; you may want to make a backup copy first)"
 msgstr ""

-#: database.cc:165
+#: database.cc:155
 #, c-format
+msgid "this database already contains rosters"
+msgstr ""
+
+#: database.cc:175
+#, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
 "if you are a project leader or doing local testing:\n"
@@ -1729,7 +1738,7 @@
 "sorry about the inconvenience."
 msgstr ""

-#: database.cc:184
+#: database.cc:194
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -1737,24 +1746,24 @@
 "please see README.changesets for details"
 msgstr ""

-#: database.cc:220
+#: database.cc:230
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr ""

-#: database.cc:227
+#: database.cc:237
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr "il database ‘%s’ non è un file SQLite versione 3, prova ‘dump’ e ‘reload’"

-#: database.cc:256
+#: database.cc:266
 #: schema_migration.cc:187
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
 msgstr ""

-#: database.cc:262
+#: database.cc:272
 #: schema_migration.cc:192
 #, c-format
 msgid ""
@@ -1764,24 +1773,24 @@
 "errore sqlite: %s\n"
 "%s"

-#: database.cc:308
+#: database.cc:318
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "non riesco ad inizializzare il database ‘%s’: esiste già"

-#: database.cc:313
+#: database.cc:323
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%s'\n"
 "cancelling database creation"
 msgstr ""

-#: database.cc:456
+#: database.cc:466
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "non posso creare ‘%s’: esiste già"

-#: database.cc:520
+#: database.cc:530
 #, c-format
 msgid ""
 "schema version    : %s\n"
@@ -1807,52 +1816,52 @@
 "  cache size      : %u\n"
 msgstr ""

-#: database.cc:580
+#: database.cc:590
 #, c-format
 msgid "database schema version: %s"
 msgstr "versione dello schema del database: %s"

-#: database.cc:657
+#: database.cc:667
 #, fuzzy, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "risultato nullo nella query: %s\n"

-#: database.cc:663
+#: database.cc:673
 #, c-format
 msgid "wanted %d columns got %d in query: %s\n"
 msgstr ""

-#: database.cc:722
+#: database.cc:732
 #, c-format
 msgid "null result in query: %s\n"
 msgstr "risultato nullo nella query: %s\n"

-#: database.cc:740
+#: database.cc:750
 #, c-format
 msgid "wanted %d rows got %s in query: %s\n"
 msgstr ""

-#: database.cc:1760
-#, c-format
+#: database.cc:1770
+#, fuzzy, c-format
 msgid "another key with name '%s' already exists"
-msgstr ""
+msgstr "una chiave con nome ‘%s’ esiste già"

-#: database.cc:2816
+#: database.cc:2826
 #, c-format
 msgid "no database specified"
 msgstr "nessuna database specificato"

-#: database.cc:2824
+#: database.cc:2834
 #, c-format
 msgid "database %s does not exist"
 msgstr "il database ‘%s’ non esiste"

-#: database.cc:2825
+#: database.cc:2835
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "‘%s’ è una cartella, non un database"

-#: database.cc:2850
+#: database.cc:2860
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "non riesco ad aprire il database ‘%s’: %s"
@@ -1873,7 +1882,7 @@
 msgstr ""

 #: diff_patch.cc:716
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "help required for 3-way merge\n"
 "[ancestor] %s\n"
@@ -1881,6 +1890,11 @@
 "[   right] %s\n"
 "[  merged] %s\n"
 msgstr ""
+"richiesto aiuto per merge a 3 vie\n"
+"[antenato] %s\n"
+"[sinistra] %s\n"
+"[  destra] %s\n"
+"[  unione] %s\n"

 #: file_io.cc:116
 #, fuzzy, c-format
@@ -2002,9 +2016,9 @@
 msgstr "il file ‘%s’ non può essere letto: è una cartella"

 #: file_io.cc:312
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open file %s for reading"
-msgstr "non riesco ad aprire file `%s' in lettura (%s)"
+msgstr "non riesco ad aprire file ‘%s’ in lettura"

 #: file_io.cc:381
 #, fuzzy, c-format
@@ -2027,11 +2041,9 @@
 msgstr ""

 #: file_io.cc:569
-#, fuzzy, c-format
+#, c-format
 msgid "no such file or directory: '%s'"
-msgstr ""
-"Il file o la directory \"%s\" non esiste.\n"
-"\n"
+msgstr "nessun file o cartella con nome ‘%s’"

 #: keys.cc:77
 #, c-format
@@ -2051,7 +2063,7 @@
 #: keys.cc:105
 #, fuzzy, c-format
 msgid "empty passphrases not allowed, try again\n"
-msgstr "le passphrase non corrispondono, riprova\n"
+msgstr "le passphrase vuote non sono accettate, riprova\n"

 #: keys.cc:106
 #: keys.cc:113
@@ -2135,7 +2147,7 @@
 #: monotone.cc:51
 #, fuzzy
 msgid "select branch cert for operation"
-msgstr "seleziona id di revisione per l'operazione"
+msgstr "seleziona il ramo per l'operazione"

 #: monotone.cc:52
 msgid "select revision id for operation"
@@ -2186,8 +2198,9 @@
 msgstr ""

 #: monotone.cc:64
+#, fuzzy
 msgid "use the current arguments as the future default"
-msgstr ""
+msgstr "usa gli argomenti attuali come default futuro"

 #: monotone.cc:65
 msgid "leave out anything described by its argument"
@@ -2269,7 +2282,7 @@
 #: monotone.cc:92
 #, fuzzy
 msgid "print version number, then exit"
-msgstr "Stampa informazioni sulla versione ed esci"
+msgstr "stampa il numero di versione versione ed esce"

 #: monotone.cc:93
 msgid "print detailed version number, then exit"
@@ -2288,13 +2301,12 @@
 msgstr ""

 #: monotone.cc:97
-msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
+msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
 msgstr ""

 #: monotone.cc:98
-#, fuzzy
 msgid "load extra rc file"
-msgstr "Sc_rivi file maschera extra"
+msgstr "carica un file rc in più"

 #: monotone.cc:99
 #, fuzzy
@@ -2512,7 +2524,7 @@
 #: netsync.cc:1237
 #, c-format
 msgid "saving public key for %s to database\n"
-msgstr ""
+msgstr "salvo la chiave pubblica per ‘%s’ nel database\n"

 #: netsync.cc:1325
 #, c-format
@@ -2561,9 +2573,9 @@
 msgstr ""

 #: netsync.cc:1453
-#, c-format
+#, fuzzy, c-format
 msgid "access to branch '%s' denied by server"
-msgstr ""
+msgstr "accesso al ramo ‘%s’ negato dal server"

 #: netsync.cc:1463
 #, c-format
@@ -2596,9 +2608,9 @@
 msgstr ""

 #: netsync.cc:1639
-#, c-format
+#, fuzzy, c-format
 msgid "unknown bye phase %d received"
-msgstr ""
+msgstr "ricevuta fase di saluto %d sconosciuta"

 #: netsync.cc:1654
 #, c-format
@@ -2606,9 +2618,9 @@
 msgstr ""

 #: netsync.cc:1734
-#, c-format
+#, fuzzy, c-format
 msgid "epoch with hash '%s' does not exist in our database"
-msgstr ""
+msgstr "l'epoca con hash ‘%s’ non è presente nel database"

 #: netsync.cc:1763
 #, c-format
@@ -2989,17 +3001,17 @@
 "seriously, if you'd like to keep it, we're happy to figure out how)"
 msgstr ""

-#: revision.cc:1375
+#: revision.cc:1376
 #, c-format
 msgid "converting existing revision graph to new roster-style revisions\n"
 msgstr ""

-#: revision.cc:1429
+#: revision.cc:1431
 #, c-format
 msgid "rebuilding revision graph from manifest certs\n"
 msgstr ""

-#: revision.cc:1532
+#: revision.cc:1534
 #, c-format
 msgid ""
 "encountered a revision with unknown format, version '%s'\n"
@@ -3036,9 +3048,9 @@
 msgstr "Spazio di lavoro attuale: %i elementi\n"

 #: schema_migration.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "calculating necessary migration steps"
-msgstr ""
+msgstr "calcolo i passi necessari per la migrazione"

 #: schema_migration.cc:238
 #, c-format
@@ -3091,9 +3103,9 @@
 msgstr "schema del database ‘%s’ sconosciuto: non posso eseguire la migrazione"

 #: schema_migration.cc:303
-#, c-format
+#, fuzzy, c-format
 msgid "no migration performed; database schema already up-to-date at %s\n"
-msgstr ""
+msgstr "nessuna migrazione effettuata: lo schema del database era già aggiornato a ‘%s’\n"

 #: schema_migration.cc:853
 #, c-format
@@ -3180,9 +3192,9 @@
 msgstr "carattere non ammesso ‘%c’ nel nome dell'id ‘%s’"

 #: vocab.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "bad character '%c' in ace string '%s'"
-msgstr ""
+msgstr "carattere %s non valido nella stringa di modo %s"

 #: vocab.cc:99
 #, c-format