#
#
# patch "ChangeLog"
#  from [63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c]
#    to [95899e7fff269067c04eb43d8ce30f6cac9dd828]
#
# patch "app_state.cc"
#  from [a941f16101beb709145100ba58cc9726c7dacbf2]
#    to [39ee6b031773ef782d71f16687987918c7d1a41e]
#
# patch "po/it.po"
#  from [708f3151a5bdb43c2b647df47dad43cddc24853d]
#    to [fe1d316fad5a63d8d35795c75732894c14ca07a1]
#
============================================================
--- ChangeLog	63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c
+++ ChangeLog	95899e7fff269067c04eb43d8ce30f6cac9dd828
@@ -1,3 +1,8 @@
+2006-06-24  Lapo Luchini  <address@hidden>
+
+	* po/it.po: Updated and translated a few more strings (65 to go).
+	* app_state.cc: removed a newline.
+
 2006-06-24  Marcel van der Boom  <address@hidden>

 	* roster.cc (update_current_roster_from_filesystem): Change
============================================================
--- app_state.cc	a941f16101beb709145100ba58cc9726c7dacbf2
+++ app_state.cc	39ee6b031773ef782d71f16687987918c7d1a41e
@@ -152,7 +152,7 @@
   go_to_workspace(new_dir);

   N(!directory_exists(bookkeeping_root),
-    F("monotone bookkeeping directory '%s' already exists in '%s'\n")
+    F("monotone bookkeeping directory '%s' already exists in '%s'")
     % bookkeeping_root % new_dir);

   L(FL("creating bookkeeping directory '%s' for workspace in '%s'")
============================================================
--- po/it.po	708f3151a5bdb43c2b647df47dad43cddc24853d
+++ po/it.po	fe1d316fad5a63d8d35795c75732894c14ca07a1
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: monotone\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-06-10 13:57+0200\n"
-"PO-Revision-Date: 2006-06-23 23:13+0100\n"
+"PO-Revision-Date: 2006-06-24 12:11+0100\n"
 "Last-Translator: Lapo Luchini <address@hidden>\n"
 "Language-Team: Lapo Luchini <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -25,9 +25,9 @@
 msgstr "directory non valida ‘’"

 #: app_state.cc:155
-#, fuzzy, c-format
-msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
-msgstr "la directory monotone contabilità ‘%s’ già esiste in ‘%s’\n"
+#, c-format
+msgid "monotone bookkeeping directory '%s' already exists in '%s'"
+msgstr "la directory di servizio di monotone ‘%s’ esiste già in ‘%s’"

 # TODO: radice di ricerca?
 #: app_state.cc:236
@@ -1787,6 +1787,10 @@
 "try '%s db migrate' to upgrade\n"
 "(this is irreversible; you may want to make a backup copy first)"
 msgstr ""
+"il layout del database ‘%s’ non corrisponde a questa versione di monotone\n"
+"mi aspettavo lo schema ‘%s’, ho trovato ‘%s’\n"
+"prova ‘%s db migrate’ per aggiornarlo\n"
+"(operazione irreversibile; potresti voler prima fare una copia di backup)"

 #: database.cc:170
 #, c-format
@@ -2134,7 +2138,7 @@
 #: keys.cc:99
 #, c-format
 msgid "got empty passphrase from get_passphrase() hook"
-msgstr ""
+msgstr "ricevuta passphrase vuota dall'hook ‘get_passphrase()’"

 #: keys.cc:115
 #, c-format
@@ -2289,11 +2293,11 @@

 #: monotone.cc:82
 msgid "use external diff hook for generating diffs"
-msgstr ""
+msgstr "utilizza l'hook per generare le diff esternamente"

 #: monotone.cc:83
 msgid "argument to pass external diff hook"
-msgstr ""
+msgstr "argomenti da passare all'hook per le diff esterne"

 #: monotone.cc:84
 msgid "perform the associated file operation"
@@ -2348,8 +2352,9 @@
 msgstr "file su cui scrivere il registro"

 #: monotone.cc:105
+#, fuzzy
 msgid "suppress verbose, informational and progress messages"
-msgstr ""
+msgstr "evita i messaggi informativi e sul progresso"

 #: monotone.cc:106
 msgid "suppress warning, verbose, informational and progress messages"
@@ -2381,7 +2386,7 @@

 #: monotone.cc:113
 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
-msgstr "non caricare i file LUA ‘~/.monotone/monotonerc’ or ‘_MTN/monotonerc’"
+msgstr "non caricare i file LUA ‘~/.monotone/monotonerc’ o ‘_MTN/monotonerc’"

 #: monotone.cc:114
 msgid "load extra rc file"