From 00c4e36357cb218a46e201c17b4374c4baf28113 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 12 Jun 2007 10:17:11 +0000 Subject: [PATCH] Command /away allowed when not connected to server (internally stored and AWAY command is sent when connecting to server) (task #7003) --- ChangeLog | 4 +- po/cs.po | 48 ++++++++----- po/de.po | 48 ++++++++----- po/es.po | 48 ++++++++----- po/fr.po | 50 ++++++++------ po/hu.po | 48 ++++++++----- po/ru.po | 48 ++++++++----- po/weechat.pot | 46 ++++++++----- src/irc/irc-send.c | 137 ++++++++++++++++++++++--------------- weechat/ChangeLog | 4 +- weechat/po/cs.po | 48 ++++++++----- weechat/po/de.po | 48 ++++++++----- weechat/po/es.po | 48 ++++++++----- weechat/po/fr.po | 50 ++++++++------ weechat/po/hu.po | 48 ++++++++----- weechat/po/ru.po | 48 ++++++++----- weechat/po/weechat.pot | 46 ++++++++----- weechat/src/irc/irc-send.c | 137 ++++++++++++++++++++++--------------- 18 files changed, 576 insertions(+), 378 deletions(-) diff --git a/ChangeLog b/ChangeLog index c841451f8..e0ad92328 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-06-11 +ChangeLog - 2007-06-12 Version 0.2.6 (under dev!): + * command /away allowed when not connected to server (internally stored + and AWAY command is sent when connecting to server) (task #7003) * added argument for /upgrade command (path to binary), check that binary file is found and has execution permissions before upgrading * fixed bug with /topic when channel not open and topic not defined diff --git a/po/cs.po b/po/cs.po index f5eb40efd..77261e0db 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1383,54 +1383,59 @@ msgstr "(skrytý)" msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "ignorování bylo odebrán\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1438,12 +1443,17 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" diff --git a/po/de.po b/po/de.po index a73d7b60c..b38fd1a01 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1386,54 +1386,59 @@ msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "/ignore-Regel entfernt.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1441,12 +1446,17 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" diff --git a/po/es.po b/po/es.po index 1294b3013..75a5c5527 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1403,54 +1403,59 @@ msgstr "(oculto)" msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "el ignore fue eliminado.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" no es una expresin regular vlida (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para la expresin regular\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1458,12 +1463,17 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" diff --git a/po/fr.po b/po/fr.po index 3bd554d6c..048cecb94 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" -"PO-Revision-Date: 2007-06-11 15:42+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" +"PO-Revision-Date: 2007-06-12 12:13+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1388,56 +1388,61 @@ msgstr "(caché)" msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "Future absence sur %s%s%s: %s\n" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "Future absence sur %s%s%s supprimée.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans un tampon canal\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans un tampon serveur\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression régulière valide (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mémoire pour l'expression régulière\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans un tampon canal ou " "privé\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1445,12 +1450,17 @@ msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de créer le tampon privé \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" diff --git a/po/hu.po b/po/hu.po index 9db32ec01..54bc00738 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1397,52 +1397,57 @@ msgstr "(rejtett)" msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "mellőzés eltávolítva.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a reguláris kifejezéshez\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1450,12 +1455,17 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" diff --git a/po/ru.po b/po/ru.po index aca028f3b..12145d1fe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1382,53 +1382,58 @@ msgstr "(скрытый)" msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "игнорирование удалено.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1436,12 +1441,17 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" diff --git a/po/weechat.pot b/po/weechat.pot index 36487d1ca..28e94c241 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1279,52 +1279,57 @@ msgstr "" msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" +msgid "Future away on %s%s%s: %s\n" msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1332,12 +1337,17 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c index c2c4c0bd3..f577aa485 100644 --- a/src/irc/irc-send.c +++ b/src/irc/irc-send.c @@ -230,76 +230,114 @@ irc_send_away (t_irc_server *server, char *arguments) t_gui_window *ptr_window; time_t time_now, elapsed; + if (!server) + return; + if (arguments) { - server->is_away = 1; if (server->away_message) free (server->away_message); server->away_message = (char *) malloc (strlen (arguments) + 1); if (server->away_message) strcpy (server->away_message, arguments); - server->away_time = time (NULL); - irc_server_sendf (server, "AWAY :%s", arguments); - if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) + + /* if server is connected, send away command now */ + if (server->is_connected) { - string = (char *)gui_color_decode ((unsigned char *)arguments, 1); - if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) - irc_display_away (server, "away", (string) ? string : arguments); - else + server->is_away = 1; + server->away_time = time (NULL); + irc_server_sendf (server, "AWAY :%s", arguments); + if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) { - snprintf (buffer, sizeof (buffer), "is away: %s", (string) ? string : arguments); - irc_send_me_all_channels (server, buffer); + string = (char *)gui_color_decode ((unsigned char *)arguments, 1); + if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + irc_display_away (server, "away", (string) ? string : arguments); + else + { + snprintf (buffer, sizeof (buffer), "is away: %s", (string) ? string : arguments); + irc_send_me_all_channels (server, buffer); + } + if (string) + free (string); } + irc_server_set_away (server, server->nick, 1); + for (ptr_window = gui_windows; ptr_window; + ptr_window = ptr_window->next_window) + { + if (SERVER(ptr_window->buffer) == server) + ptr_window->buffer->last_read_line = + ptr_window->buffer->last_line; + } + } + else + { + /* server not connected, store away for future usage + (when connecting to server) */ + string = (char *)gui_color_decode ((unsigned char *)arguments, 1); + irc_display_prefix (NULL, server->buffer, PREFIX_INFO); + gui_printf_nolog (server->buffer, + _("Future away on %s%s%s: %s\n"), + GUI_COLOR(COLOR_WIN_CHAT_SERVER), + server->name, + GUI_COLOR(COLOR_WIN_CHAT), + (string) ? string : arguments); if (string) free (string); } - irc_server_set_away (server, server->nick, 1); - for (ptr_window = gui_windows; ptr_window; - ptr_window = ptr_window->next_window) - { - if (SERVER(ptr_window->buffer) == server) - ptr_window->buffer->last_read_line = - ptr_window->buffer->last_line; - } } else { - irc_server_sendf (server, "AWAY"); - server->is_away = 0; if (server->away_message) { free (server->away_message); server->away_message = NULL; } - if (server->away_time != 0) + + /* if server is connected, send away command now */ + if (server->is_connected) { - time_now = time (NULL); - elapsed = (time_now >= server->away_time) ? - time_now - server->away_time : 0; - server->away_time = 0; - if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) + irc_server_sendf (server, "AWAY"); + server->is_away = 0; + if (server->away_time != 0) { - if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + time_now = time (NULL); + elapsed = (time_now >= server->away_time) ? + time_now - server->away_time : 0; + server->away_time = 0; + if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) { - snprintf (buffer, sizeof (buffer), - "gone %.2ld:%.2ld:%.2ld", - (long int)(elapsed / 3600), - (long int)((elapsed / 60) % 60), - (long int)(elapsed % 60)); - irc_display_away (server, "back", buffer); - } - else - { - snprintf (buffer, sizeof (buffer), - "is back (gone %.2ld:%.2ld:%.2ld)", - (long int)(elapsed / 3600), - (long int)((elapsed / 60) % 60), - (long int)(elapsed % 60)); - irc_send_me_all_channels (server, buffer); + if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + { + snprintf (buffer, sizeof (buffer), + "gone %.2ld:%.2ld:%.2ld", + (long int)(elapsed / 3600), + (long int)((elapsed / 60) % 60), + (long int)(elapsed % 60)); + irc_display_away (server, "back", buffer); + } + else + { + snprintf (buffer, sizeof (buffer), + "is back (gone %.2ld:%.2ld:%.2ld)", + (long int)(elapsed / 3600), + (long int)((elapsed / 60) % 60), + (long int)(elapsed % 60)); + irc_send_me_all_channels (server, buffer); + } } } + irc_server_set_away (server, server->nick, 0); + } + else + { + /* server not connected, remove away message but do not send anything */ + irc_display_prefix (NULL, server->buffer, PREFIX_INFO); + gui_printf_nolog (server->buffer, + _("Future away on %s%s%s removed.\n"), + GUI_COLOR(COLOR_WIN_CHAT_SERVER), + server->name, + GUI_COLOR(COLOR_WIN_CHAT)); } - irc_server_set_away (server, server->nick, 0); } } @@ -337,18 +375,7 @@ irc_send_cmd_away (t_irc_server *server, t_irc_channel *channel, } } else - { - if (server && server->is_connected) - irc_send_away (server, arguments); - else - { - irc_display_prefix (NULL, NULL, PREFIX_ERROR); - gui_printf_nolog (NULL, - _("%s command \"%s\" needs a server connection!\n"), - WEECHAT_ERROR, "away"); - return -1; - } - } + irc_send_away (server, arguments); gui_status_draw (buffer, 1); gui_add_hotlist = 1; diff --git a/weechat/ChangeLog b/weechat/ChangeLog index c841451f8..e0ad92328 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-06-11 +ChangeLog - 2007-06-12 Version 0.2.6 (under dev!): + * command /away allowed when not connected to server (internally stored + and AWAY command is sent when connecting to server) (task #7003) * added argument for /upgrade command (path to binary), check that binary file is found and has execution permissions before upgrading * fixed bug with /topic when channel not open and topic not defined diff --git a/weechat/po/cs.po b/weechat/po/cs.po index f5eb40efd..77261e0db 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1383,54 +1383,59 @@ msgstr "(skrytý)" msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "ignorování bylo odebrán\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1438,12 +1443,17 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" diff --git a/weechat/po/de.po b/weechat/po/de.po index a73d7b60c..b38fd1a01 100644 --- a/weechat/po/de.po +++ b/weechat/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1386,54 +1386,59 @@ msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "/ignore-Regel entfernt.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1441,12 +1446,17 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" diff --git a/weechat/po/es.po b/weechat/po/es.po index 1294b3013..75a5c5527 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1403,54 +1403,59 @@ msgstr "(oculto)" msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "el ignore fue eliminado.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" no es una expresin regular vlida (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para la expresin regular\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1458,12 +1463,17 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 3bd554d6c..048cecb94 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" -"PO-Revision-Date: 2007-06-11 15:42+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" +"PO-Revision-Date: 2007-06-12 12:13+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1388,56 +1388,61 @@ msgstr "(caché)" msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "Future absence sur %s%s%s: %s\n" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "Future absence sur %s%s%s supprimée.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans un tampon canal\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans un tampon serveur\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression régulière valide (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mémoire pour l'expression régulière\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans un tampon canal ou " "privé\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1445,12 +1450,17 @@ msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de créer le tampon privé \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" diff --git a/weechat/po/hu.po b/weechat/po/hu.po index 9db32ec01..54bc00738 100644 --- a/weechat/po/hu.po +++ b/weechat/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1397,52 +1397,57 @@ msgstr "(rejtett)" msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "mellőzés eltávolítva.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a reguláris kifejezéshez\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1450,12 +1455,17 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" diff --git a/weechat/po/ru.po b/weechat/po/ru.po index aca028f3b..12145d1fe 100644 --- a/weechat/po/ru.po +++ b/weechat/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1382,53 +1382,58 @@ msgstr "(скрытый)" msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" -msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" +msgid "Future away on %s%s%s: %s\n" +msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, fuzzy, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "игнорирование удалено.\n" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1436,12 +1441,17 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 36487d1ca..28e94c241 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-06-11 15:36+0200\n" +"POT-Creation-Date: 2007-06-12 12:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1279,52 +1279,57 @@ msgstr "" msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:347 src/irc/irc-send.c:1767 src/common/command.c:622 +#: src/irc/irc-send.c:279 #, c-format -msgid "%s command \"%s\" needs a server connection!\n" +msgid "Future away on %s%s%s: %s\n" msgstr "" -#: src/irc/irc-send.c:402 src/irc/irc-send.c:430 src/irc/irc-send.c:646 -#: src/irc/irc-send.c:678 src/irc/irc-send.c:710 src/irc/irc-send.c:759 -#: src/irc/irc-send.c:804 src/irc/irc-send.c:883 src/irc/irc-send.c:944 -#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1492 src/irc/irc-send.c:2061 -#: src/irc/irc-send.c:2186 +#: src/irc/irc-send.c:336 +#, c-format +msgid "Future away on %s%s%s removed.\n" +msgstr "" + +#: src/irc/irc-send.c:429 src/irc/irc-send.c:457 src/irc/irc-send.c:673 +#: src/irc/irc-send.c:705 src/irc/irc-send.c:737 src/irc/irc-send.c:786 +#: src/irc/irc-send.c:831 src/irc/irc-send.c:910 src/irc/irc-send.c:971 +#: src/irc/irc-send.c:1375 src/irc/irc-send.c:1519 src/irc/irc-send.c:2088 +#: src/irc/irc-send.c:2213 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:568 src/irc/irc-send.c:588 src/irc/irc-send.c:1098 -#: src/irc/irc-send.c:1979 +#: src/irc/irc-send.c:595 src/irc/irc-send.c:615 src/irc/irc-send.c:1125 +#: src/irc/irc-send.c:2006 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:868 src/irc/irc-send.c:929 src/common/command.c:1712 +#: src/irc/irc-send.c:895 src/irc/irc-send.c:956 src/common/command.c:1712 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1045 +#: src/irc/irc-send.c:1072 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1054 +#: src/irc/irc-send.c:1081 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1211 src/irc/irc-send.c:1548 src/irc/irc-send.c:1562 +#: src/irc/irc-send.c:1238 src/irc/irc-send.c:1575 src/irc/irc-send.c:1589 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1253 src/irc/irc-recv.c:589 +#: src/irc/irc-send.c:1280 src/irc/irc-recv.c:589 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1321 src/irc/irc-send.c:1459 src/irc/irc-send.c:2087 +#: src/irc/irc-send.c:1348 src/irc/irc-send.c:1486 src/irc/irc-send.c:2114 #: src/common/command.c:1657 src/common/command.c:1669 #: src/common/command.c:1688 src/common/command.c:1777 #: src/common/command.c:2736 @@ -1332,12 +1337,17 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1663 +#: src/irc/irc-send.c:1690 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2152 +#: src/irc/irc-send.c:1794 src/common/command.c:622 +#, c-format +msgid "%s command \"%s\" needs a server connection!\n" +msgstr "" + +#: src/irc/irc-send.c:2179 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c index c2c4c0bd3..f577aa485 100644 --- a/weechat/src/irc/irc-send.c +++ b/weechat/src/irc/irc-send.c @@ -230,76 +230,114 @@ irc_send_away (t_irc_server *server, char *arguments) t_gui_window *ptr_window; time_t time_now, elapsed; + if (!server) + return; + if (arguments) { - server->is_away = 1; if (server->away_message) free (server->away_message); server->away_message = (char *) malloc (strlen (arguments) + 1); if (server->away_message) strcpy (server->away_message, arguments); - server->away_time = time (NULL); - irc_server_sendf (server, "AWAY :%s", arguments); - if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) + + /* if server is connected, send away command now */ + if (server->is_connected) { - string = (char *)gui_color_decode ((unsigned char *)arguments, 1); - if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) - irc_display_away (server, "away", (string) ? string : arguments); - else + server->is_away = 1; + server->away_time = time (NULL); + irc_server_sendf (server, "AWAY :%s", arguments); + if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) { - snprintf (buffer, sizeof (buffer), "is away: %s", (string) ? string : arguments); - irc_send_me_all_channels (server, buffer); + string = (char *)gui_color_decode ((unsigned char *)arguments, 1); + if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + irc_display_away (server, "away", (string) ? string : arguments); + else + { + snprintf (buffer, sizeof (buffer), "is away: %s", (string) ? string : arguments); + irc_send_me_all_channels (server, buffer); + } + if (string) + free (string); } + irc_server_set_away (server, server->nick, 1); + for (ptr_window = gui_windows; ptr_window; + ptr_window = ptr_window->next_window) + { + if (SERVER(ptr_window->buffer) == server) + ptr_window->buffer->last_read_line = + ptr_window->buffer->last_line; + } + } + else + { + /* server not connected, store away for future usage + (when connecting to server) */ + string = (char *)gui_color_decode ((unsigned char *)arguments, 1); + irc_display_prefix (NULL, server->buffer, PREFIX_INFO); + gui_printf_nolog (server->buffer, + _("Future away on %s%s%s: %s\n"), + GUI_COLOR(COLOR_WIN_CHAT_SERVER), + server->name, + GUI_COLOR(COLOR_WIN_CHAT), + (string) ? string : arguments); if (string) free (string); } - irc_server_set_away (server, server->nick, 1); - for (ptr_window = gui_windows; ptr_window; - ptr_window = ptr_window->next_window) - { - if (SERVER(ptr_window->buffer) == server) - ptr_window->buffer->last_read_line = - ptr_window->buffer->last_line; - } } else { - irc_server_sendf (server, "AWAY"); - server->is_away = 0; if (server->away_message) { free (server->away_message); server->away_message = NULL; } - if (server->away_time != 0) + + /* if server is connected, send away command now */ + if (server->is_connected) { - time_now = time (NULL); - elapsed = (time_now >= server->away_time) ? - time_now - server->away_time : 0; - server->away_time = 0; - if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) + irc_server_sendf (server, "AWAY"); + server->is_away = 0; + if (server->away_time != 0) { - if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + time_now = time (NULL); + elapsed = (time_now >= server->away_time) ? + time_now - server->away_time : 0; + server->away_time = 0; + if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF) { - snprintf (buffer, sizeof (buffer), - "gone %.2ld:%.2ld:%.2ld", - (long int)(elapsed / 3600), - (long int)((elapsed / 60) % 60), - (long int)(elapsed % 60)); - irc_display_away (server, "back", buffer); - } - else - { - snprintf (buffer, sizeof (buffer), - "is back (gone %.2ld:%.2ld:%.2ld)", - (long int)(elapsed / 3600), - (long int)((elapsed / 60) % 60), - (long int)(elapsed % 60)); - irc_send_me_all_channels (server, buffer); + if (cfg_irc_display_away == CFG_IRC_DISPLAY_AWAY_LOCAL) + { + snprintf (buffer, sizeof (buffer), + "gone %.2ld:%.2ld:%.2ld", + (long int)(elapsed / 3600), + (long int)((elapsed / 60) % 60), + (long int)(elapsed % 60)); + irc_display_away (server, "back", buffer); + } + else + { + snprintf (buffer, sizeof (buffer), + "is back (gone %.2ld:%.2ld:%.2ld)", + (long int)(elapsed / 3600), + (long int)((elapsed / 60) % 60), + (long int)(elapsed % 60)); + irc_send_me_all_channels (server, buffer); + } } } + irc_server_set_away (server, server->nick, 0); + } + else + { + /* server not connected, remove away message but do not send anything */ + irc_display_prefix (NULL, server->buffer, PREFIX_INFO); + gui_printf_nolog (server->buffer, + _("Future away on %s%s%s removed.\n"), + GUI_COLOR(COLOR_WIN_CHAT_SERVER), + server->name, + GUI_COLOR(COLOR_WIN_CHAT)); } - irc_server_set_away (server, server->nick, 0); } } @@ -337,18 +375,7 @@ irc_send_cmd_away (t_irc_server *server, t_irc_channel *channel, } } else - { - if (server && server->is_connected) - irc_send_away (server, arguments); - else - { - irc_display_prefix (NULL, NULL, PREFIX_ERROR); - gui_printf_nolog (NULL, - _("%s command \"%s\" needs a server connection!\n"), - WEECHAT_ERROR, "away"); - return -1; - } - } + irc_send_away (server, arguments); gui_status_draw (buffer, 1); gui_add_hotlist = 1;