Update italian translations

1 files changed, 29 insertions, 15 deletions

diff --git a/po/it.po b/po/it.po
index 05cd23e19..0f299348c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weechat 0.31-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2009-11-20 15:30+0100\n"
 "PO-Revision-Date: 2009-11-21 17:09+0100\n"
+=======
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
+"PO-Revision-Date: 2009-11-18 21:26+0100\n"
+>>>>>>> f8921025f6a285c9dc4003b0a500b7bd18e64a6a
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2776,10 +2781,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
 msgstr "%s%s: la connessione al server \"%s\" è già in corso!"
 
 #, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: argomento mancante per l'opzione \"%s\""
-
-#, c-format
 msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
 msgstr "%s: server %s%s%s creato (server temporaneo, NON SALVATO!)"
 
@@ -3022,7 +3023,7 @@ msgstr "connette ad uno o più server IRC"
 
 msgid ""
 "[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
 msgstr ""
 "[-all [-nojoin] | nome_server [nome_server ...] [-nojoin] | nome_host"
 "[/porta] [-ipv6] [-ssl]]"
@@ -3034,8 +3035,16 @@ msgid ""
 "   -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
 "  hostname: hostname (or IP) of a server\n"
 "      port: port for server (6667 by default)\n"
-"      ipv6: use IPv6 protocol\n"
-"       ssl: use SSL protocol"
+"    option: set option for server (for boolean option, value can be "
+"omitted)\n"
+"  nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+"  /connect freenode\n"
+"  /connect irc.oftc.net/6667\n"
+"  /connect irc6.oftc.net/6667 -ipv6\n"
+"  /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+"  /connect my.server.org/6697 -ssl -password=test"
 msgstr ""
 "               -all: connette a tutti i server\n"
 "nome_server: nome interno del server a cui connettersi (il server deve "
@@ -3582,17 +3591,19 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "elenca, aggiunge o rimuove server IRC"
 
+#, fuzzy
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
 msgstr ""
 "[list [nome_server]] | [listfull [nome_server]] | [add nome_server host"
 "[porta][-auto | -noauto] [-ipv6] [-ssl] | [copy nome_server "
 "nuovo_nome_server] | [rename nome_server nuovo_nome_server] | [keep "
 "nome_server] | [del nome_server ] | [deloutq] | [jump] | [raw]"
 
+#, fuzzy
 msgid ""
 "      list: list servers (no parameter implies this list)\n"
 "  listfull: list servers with detailed info for each server\n"
@@ -3600,10 +3611,10 @@ msgid ""
 "servername: server name, for internal and display use\n"
 "  hostname: name or IP address of server, with optional port (default: "
 "6667)\n"
-"      auto: automatically connect to server when WeeChat starts\n"
-"    noauto: do not connect to server when WeeChat starts (default)\n"
-"      ipv6: use IPv6 protocol\n"
-"       ssl: use SSL protocol\n"
+"      temp: create temporary server (not saved)\n"
+"    option: set option for server (for boolean option, value can be "
+"omitted)\n"
+"  nooption: set boolean option to 'off' (for example: -nossl)\n"
 "      copy: duplicate a server\n"
 "    rename: rename a server\n"
 "      keep: keep server in config file (for temporary servers only)\n"
@@ -3615,7 +3626,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl\n"
+"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
 "  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
 "  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
 "  /server copy oftc oftcbis\n"
@@ -5876,6 +5887,9 @@ msgstr "%s%s: impossibile impostare l'opzione \"nonblock\" per il socket"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s%s: timeout per \"%s\" con %s"
 
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: argomento mancante per l'opzione \"%s\""
+
 #~ msgid "%s%s unable to run function \"%s\""
 #~ msgstr "%s%s: impossibile eseguire la funzione \"%s\""