1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00

Replaced options nick1/nick2/nick3 by nicks in IRC servers

This commit is contained in:
Sebastien Helleu
2008-02-03 00:09:35 +01:00
parent 28e811c09c
commit cb657254bb
15 changed files with 429 additions and 539 deletions
-1
View File
@@ -103,7 +103,6 @@
./src/plugins/irc/irc.h
./src/plugins/irc/irc-input.c
./src/plugins/irc/irc-input.h
./src/plugins/irc/irc-log.c
./src/plugins/irc/irc-mode.c
./src/plugins/irc/irc-mode.h
./src/plugins/irc/irc-nick.c
+46 -48
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2597,10 +2597,11 @@ msgstr ""
msgid "list, add or remove servers"
msgstr "vypíše, přídá nebo odebere servery"
#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -3039,21 +3040,10 @@ msgstr "použít SSL pro komunikaci se serverem"
msgid "password for IRC server"
msgstr "heslo pro IRC server"
msgid "nickname to use on IRC server"
#, fuzzy
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "přezdívka použitá na IRC serveru"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
"alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
"použita)"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
"druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
"přezdívka je již použita)"
msgid "user name to use on IRC server"
msgstr "uživatelské jméno použité na IRC serveru"
@@ -3321,10 +3311,6 @@ msgstr "%s nepřipojen k serveru\n"
msgid "%s: this buffer is not a channel!"
msgstr "Tohe není okno kanálu!\n"
#, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr "Nedostatek paměti pro zapsání log sourobru \"%s\"\n"
msgid "error received from IRC server"
msgstr "přijata chyba z IRC serveru"
@@ -3902,55 +3888,31 @@ msgstr "%s[%s%s%s] %s%s%s zakázal "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s[%s%s%s] %s%s%s takázaný\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
"%s: všechny deklarované přezdívky jsou již používány nebo nevalidní, zavírám "
"spojení se serverem!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr ""
"%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr ""
"%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
"serverem!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr ""
"%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: error when allocating new server"
@@ -4366,6 +4328,42 @@ msgstr ""
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s špatné parametry pro příkaz \"%s\"\n"
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr ""
#~ "alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
#~ "použita)"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr ""
#~ "druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
#~ "přezdívka je již použita)"
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr "Nedostatek paměti pro zapsání log sourobru \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
#~ msgid "[file]"
#~ msgstr "[soubor]"
+47 -49
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2599,7 +2599,7 @@ msgstr "Auflisten, Hinzufügen oder Entfernen von Servern"
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -3027,21 +3027,10 @@ msgstr "Server über SSL ansprechen"
msgid "password for IRC server"
msgstr "Passwort für den IRC-Server"
msgid "nickname to use on IRC server"
#, fuzzy
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "eigener Nickname, der auf dem IRC-Server benutzt werden soll"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
"alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn der "
"erste Kandidat bereits benutzt wird"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
"2. alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn "
"der erste alternative Nickname bereits benutzt wird"
msgid "user name to use on IRC server"
msgstr "Benutzername, der an den Server übermittelt werden soll"
@@ -3311,11 +3300,6 @@ msgstr "%s keine Verbindung zum Server \"%s\"!\n"
msgid "%s: this buffer is not a channel!"
msgstr "Dieses Fenster ist kein Channel!\n"
#, fuzzy, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr ""
"Nicht genügend Speicher, um das Logfile für einen Puffer zu schreiben\n"
msgid "error received from IRC server"
msgstr "Fehlermeldung vom IRC-Server empfangen"
@@ -3896,55 +3880,31 @@ msgstr "%s[%s%s%s] %s%s%s wurde gebannt von "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s[%s%s%s] %s%s%s gebannt\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
"%s: alle eingestellten Nicknames sind bereits in Verwendung, Verbindung wird "
"getrennt!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr ""
"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
"getrennt!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: error when allocating new server"
@@ -4362,6 +4322,44 @@ msgstr ""
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr ""
#~ "alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn "
#~ "der erste Kandidat bereits benutzt wird"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr ""
#~ "2. alternativer Nickname, der auf dem IRC-Server benutzt werden soll, "
#~ "wenn der erste alternative Nickname bereits benutzt wird"
#, fuzzy
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr ""
#~ "Nicht genügend Speicher, um das Logfile für einen Puffer zu schreiben\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
#~ msgid "[file]"
#~ msgstr "[Datei]"
+61 -62
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2007-09-19 12:09+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -909,8 +909,8 @@ msgstr "marca de tiempo para la fecha mostrada cuando el día cambió"
msgid "use a marker on servers/channels to show first unread line"
msgstr ""
"usar un marcador en los servidores/canales para mostrar la primera línea sin "
"leer"
"usar un marcador en los servidores/canales para mostrar la primera línea "
"sin leer"
#, c-format
msgid ""
@@ -1433,8 +1433,8 @@ msgid ""
"support.\n"
"Be careful, private info may be in these files.\n"
msgstr ""
"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los desarrolladores "
"de Weechat para el soporte.\n"
"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los "
"desarrolladores de Weechat para el soporte.\n"
"Sé cuidadoso, puede que haya información privada en estos ficheros.\n"
#, c-format
@@ -2597,7 +2597,7 @@ msgstr "lista, añde o elimina servidores"
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -3032,21 +3032,10 @@ msgstr "usar SSL para la comunicación del servidor"
msgid "password for IRC server"
msgstr "contraseña para el servidor IRC"
msgid "nickname to use on IRC server"
#, fuzzy
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "nombre de usuario a utilizar en el servidor IRC"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
"nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
"ya está en uso)"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
"segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
"nombre de usuario alternativo ya está en uso)"
msgid "user name to use on IRC server"
msgstr "nombre de usuario para el servidor IRC"
@@ -3316,11 +3305,6 @@ msgstr "%s ¡no conectado al servidor \"%s\"!\n"
msgid "%s: this buffer is not a channel!"
msgstr "¡Esta ventana no es un canal!\n"
#, fuzzy, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr ""
"No hay suficiente memoria para escribir un fichero de log para un búfer\n"
msgid "error received from IRC server"
msgstr "error recibido del servidor IRC"
@@ -3905,62 +3889,34 @@ msgstr "%s[%s%s%s] %s%s%s baneado por "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s[%s%s%s] %s%s%s baneado\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
"usuario \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
"%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
"conexión con el servidor!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
"usuario \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
"usuario \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr ""
"%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
"conexión con el servidor!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr ""
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgstr ""
#, fuzzy, c-format
msgid "%s%s: error when allocating new server"
msgstr "%s no ha sido posible crear un nuevo servidor\n"
@@ -4378,6 +4334,48 @@ msgstr ""
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr ""
#~ "nombre de usuario alternativo para el servidor IRC (si el nombre de "
#~ "usuario ya está en uso)"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr ""
#~ "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si "
#~ "el nombre de usuario alternativo ya está en uso)"
#, fuzzy
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr ""
#~ "No hay suficiente memoria para escribir un fichero de log para un búfer\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre "
#~ "de usuario \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre "
#~ "de usuario \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre "
#~ "de usuario \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre "
#~ "de usuario \"%s\"\n"
#~ msgid "[file]"
#~ msgstr "[archivo]"
@@ -4663,8 +4661,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
#~ "maximum number of lines in history for one server/channel/private window "
#~ "(0 = unlimited)"
#~ msgstr ""
#~ "número máximo de líneas en el histórico para un servidor/canal/privado "
#~ "(0 = ilimitado)"
#~ "número máximo de líneas en el histórico para un servidor/canal/"
#~ "privado (0 = ilimitado)"
#, fuzzy
#~ msgid "log messages from plugins"
@@ -4865,8 +4863,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
#~ "max size for aligning nick and other messages (should be >= to "
#~ "look_align_size)"
#~ msgstr ""
#~ "tamaño máximo para la alineación de nick y otros mensajes (debería ser "
#~ ">= a look_align_size)"
#~ "tamaño máximo para la alineación de nick y otros mensajes (debería "
#~ "ser >= a look_align_size)"
#~ msgid "server name not found"
#~ msgstr "nombre de servidor no encontrado"
@@ -5711,7 +5709,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
#~ msgid "color for chan owner symbol (specific to unrealircd)"
#~ msgstr ""
#~ "color para el símbolo de propietario de canal (especificado en unrealircd)"
#~ "color para el símbolo de propietario de canal (especificado en "
#~ "unrealircd)"
#~ msgid "color for chan admin symbol"
#~ msgstr "color para el símbolo de administrador de canal"
+52 -70
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"PO-Revision-Date: 2008-01-29 15:20+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2008-02-02 23:28+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -2515,16 +2515,10 @@ msgstr "liste, ajoute ou retire des serveurs"
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
"[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom/IP [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-"
"nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname "
"nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [copy "
"nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] "
"| [keep nom_serveur] | [del nom_serveur]"
msgstr "[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom/IP [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1,pseudo2,pseudo3,...] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur]"
msgid ""
" list: list servers (no parameter implies this list)\n"
@@ -2965,18 +2959,8 @@ msgstr "utiliser SSL pour la communication avec le serveur"
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
"2ème pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "pseudos à utiliser sur le serveur IRC (séparés par des virgules)"
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
@@ -3245,10 +3229,6 @@ msgstr "%s%s: vous n'êtes pas connecté au serveur"
msgid "%s: this buffer is not a channel!"
msgstr "%s: ce tampon n'est pas un canal !"
#, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr "Pas assez de mémoire pour écrire le fichier log \"%s\"\n"
msgid "error received from IRC server"
msgstr "erreur reçue du serveur IRC"
@@ -3827,61 +3807,25 @@ msgstr "%s[%s%s%s] %s%s%s banni par "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s%s[%s%s%s] %s%s%s banni"
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
"pseudo \"%s\""
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
"pseudo \"%s\""
#, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
msgstr ""
"%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou "
"invalides, fermeture de la connexion avec le serveur !"
"connection with server"
msgstr "%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou invalides, fermeture de la connexion avec le serveur"
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
"pseudo \"%s\""
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
"pseudo \"%s\""
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
"pseudo \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr "%s%s: le pseudo \"%s\" est invalide, essai avec le pseudo n°%d (\"%s\")"
#, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
msgstr ""
"%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture "
"de la connexion avec le serveur !"
"server"
msgstr "%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture de la connexion avec le serveur"
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr ""
"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
"pseudo \"%s\""
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgstr "%s%s: erreur de lecture du nom de l'utilisateur: %s"
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le pseudo n°%d (\"%s\")"
#, c-format
msgid "%s%s: error when allocating new server"
@@ -4313,3 +4257,41 @@ msgstr ""
#, c-format
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s%s: paramètres invalides pour la fonction \"%s\""
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr ""
#~ "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr ""
#~ "2ème pseudo alternatif pour le serveur IRC (si le pseudo alternatif est "
#~ "déjà utilisé)"
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr "Pas assez de mémoire pour écrire le fichier log \"%s\"\n"
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le "
#~ "3ème pseudo \"%s\""
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
#~ "pseudo \"%s\""
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le "
#~ "3ème pseudo \"%s\""
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr ""
#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
#~ "pseudo \"%s\""
#~ msgid "%s%s: error retrieving user's name: %s"
#~ msgstr "%s%s: erreur de lecture du nom de l'utilisateur: %s"
+41 -40
View File
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2007-10-10 18:07+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2607,10 +2607,11 @@ msgstr ""
msgid "list, add or remove servers"
msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -3041,17 +3042,10 @@ msgstr "SSL használata a a kapcsolathoz"
msgid "password for IRC server"
msgstr "jelszó az IRC szerveren"
msgid "nickname to use on IRC server"
#, fuzzy
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "felhasználónév az IRC szerveren"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "alternatív név az IRC szerveren (ha a név már foglalt)"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr "második alternatív név az IRC szerveren (ha az alternatív név foglalt)"
msgid "user name to use on IRC server"
msgstr "használni kívánt felhasználónév az IRC szerveren"
@@ -3323,10 +3317,6 @@ msgstr "%s nincs csatlakozva szerverhez!\n"
msgid "%s: this buffer is not a channel!"
msgstr "Ez az ablak nem egy szoba!\n"
#, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr "Nincs elegendő memória a(z) \"%s\" naplófájl írásához\n"
msgid "error received from IRC server"
msgstr "az IRC szerver hibát jelzett"
@@ -3904,47 +3894,27 @@ msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s[%s%s%s] %s%s%s kitiltva\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
"%s: minden megadott név foglalt vagy érvénytelen, kapcsolat bontása a "
"szerverrel!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgstr ""
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: error when allocating new server"
@@ -4366,6 +4336,37 @@ msgstr ""
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr "alternatív név az IRC szerveren (ha a név már foglalt)"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr ""
#~ "második alternatív név az IRC szerveren (ha az alternatív név foglalt)"
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr "Nincs elegendő memória a(z) \"%s\" naplófájl írásához\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr ""
#~ "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
#~ msgid "[file]"
#~ msgstr "[fájl]"
+38 -40
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2605,10 +2605,11 @@ msgstr ""
msgid "list, add or remove servers"
msgstr "перечислить, добавить или удалить серверы"
#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -3036,17 +3037,10 @@ msgstr "использовать SSL при связи с сервером"
msgid "password for IRC server"
msgstr "пароль, используемый при подключении к IRC серверу"
msgid "nickname to use on IRC server"
#, fuzzy
msgid "nicknames to use on IRC server (separated by comma)"
msgstr "ник, используемый на IRC сервере"
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "альтернативный ник, используемый на IRC сервере"
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr "второй альтернативный ник, используемый на IRC сервере"
msgid "user name to use on IRC server"
msgstr "имя пользователя, используемое на IRC сервере"
@@ -3311,10 +3305,6 @@ msgstr "%s вы не подключены к серверу\n"
msgid "%s: this buffer is not a channel!"
msgstr "Это окно не является каналом!\n"
#, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr "Недостаточно памяти для записи лог-файла \"%s\"\n"
msgid "error received from IRC server"
msgstr "получена ошибка от IRC сервера"
@@ -3892,46 +3882,26 @@ msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr "%s[%s%s%s] %s%s%s забанен\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
"%s: все предложенные ники заняты или непригодны, отключаюсь от сервера!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
#, fuzzy, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
#, fuzzy, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgstr ""
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: error when allocating new server"
@@ -4348,6 +4318,34 @@ msgstr ""
msgid "%s%s: wrong arguments for function \"%s\""
msgstr "%s некорректные аргументы команды \"%s\"\n"
#~ msgid ""
#~ "alternate nickname to use on IRC server (if nickname is already used)"
#~ msgstr "альтернативный ник, используемый на IRC сервере"
#~ msgid ""
#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
#~ "already used)"
#~ msgstr "второй альтернативный ник, используемый на IRC сервере"
#~ msgid "Not enough memory to write log file \"%s\"\n"
#~ msgstr "Недостаточно памяти для записи лог-файла \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
#~ msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
#~ msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
#~ msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
#, fuzzy
#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
#~ msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
#~ msgid "[file]"
#~ msgstr "[файл]"
-1
View File
@@ -104,7 +104,6 @@ SET(WEECHAT_SOURCES
./src/plugins/irc/irc.h
./src/plugins/irc/irc-input.c
./src/plugins/irc/irc-input.h
./src/plugins/irc/irc-log.c
./src/plugins/irc/irc-mode.c
./src/plugins/irc/irc-mode.h
./src/plugins/irc/irc-nick.c
+7 -39
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-01-29 15:15+0100\n"
"POT-Creation-Date: 2008-02-02 23:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2188,7 +2188,7 @@ msgstr ""
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername]"
msgstr ""
@@ -2538,15 +2538,7 @@ msgstr ""
msgid "password for IRC server"
msgstr ""
msgid "nickname to use on IRC server"
msgstr ""
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgid "nicknames to use on IRC server (separated by comma)"
msgstr ""
msgid "user name to use on IRC server"
@@ -2794,10 +2786,6 @@ msgstr ""
msgid "%s: this buffer is not a channel!"
msgstr ""
#, c-format
msgid "Not enough memory to write log file \"%s\"\n"
msgstr ""
msgid "error received from IRC server"
msgstr ""
@@ -3372,44 +3360,24 @@ msgstr ""
msgid "%s%s[%s%s%s] %s%s%s banned"
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
msgstr ""
#, c-format
msgid ""
"%s%s: all declared nicknames are already in use or invalid, closing "
"connection with server!"
"connection with server"
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
msgstr ""
#, c-format
msgid ""
"%s%s: all declared nicknames are already in use, closing connection with "
"server!"
"server"
msgstr ""
#, c-format
msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
msgstr ""
#, c-format
msgid "%s%s: error retrieving user's name: %s"
msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
msgstr ""
#, c-format
+9 -14
View File
@@ -617,9 +617,7 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
server_tmp.ipv6,
server_tmp.ssl,
server_tmp.password,
server_tmp.nick1,
server_tmp.nick2,
server_tmp.nick3,
server_tmp.nicks,
server_tmp.username,
server_tmp.realname,
server_tmp.hostname,
@@ -2640,7 +2638,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
}
if (weechat_strcasecmp (argv[i], "-nicks") == 0)
{
if (i >= (argc - 3))
if (i == (argc - 1))
{
weechat_printf (NULL,
_("%s%s: missing argument for "
@@ -2650,9 +2648,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
irc_server_free_data (&server_tmp);
return WEECHAT_RC_ERROR;
}
server_tmp.nick1 = strdup (argv[++i]);
server_tmp.nick2 = strdup (argv[++i]);
server_tmp.nick3 = strdup (argv[++i]);
server_tmp.nicks = strdup (argv[++i]);
}
if (weechat_strcasecmp (argv[i], "-username") == 0)
{
@@ -2724,9 +2720,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
server_tmp.ipv6,
server_tmp.ssl,
server_tmp.password,
server_tmp.nick1,
server_tmp.nick2,
server_tmp.nick3,
server_tmp.nicks,
server_tmp.username,
server_tmp.realname,
server_tmp.hostname,
@@ -3854,10 +3848,11 @@ irc_command_init ()
N_("[list [servername]] | [listfull [servername]] | "
"[add servername hostname [-port port] [-temp] "
"[-auto | -noauto] [-ipv6] [-ssl] [-pwd password] "
"[-nicks nick1 nick2 nick3] [-username username] "
"[-realname realname] [-command command] "
"[-autojoin channel[,channel]] ] | [copy "
"servername newservername] | [rename servername "
"[-nicks nick1,nick2,nick3,...] "
"[-username username] [-realname realname] "
"[-command command] [-autojoin "
"channel[,channel]] ] | [copy servername "
"newservername] | [rename servername "
"newservername] | [keep servername] | [del "
"servername]"),
N_(" list: list servers (no parameter implies "
+13 -29
View File
@@ -94,9 +94,7 @@ struct t_config_option *irc_config_server_port;
struct t_config_option *irc_config_server_ipv6;
struct t_config_option *irc_config_server_ssl;
struct t_config_option *irc_config_server_password;
struct t_config_option *irc_config_server_nick1;
struct t_config_option *irc_config_server_nick2;
struct t_config_option *irc_config_server_nick3;
struct t_config_option *irc_config_server_nicks;
struct t_config_option *irc_config_server_username;
struct t_config_option *irc_config_server_realname;
struct t_config_option *irc_config_server_hostname;
@@ -371,12 +369,8 @@ irc_config_write_servers (void *data, struct t_config_file *config_file,
(ptr_server->ssl) ? "on" : "off");
weechat_config_write_line (config_file, "server_password", "\"%s\"",
(ptr_server->password) ? ptr_server->password : "");
weechat_config_write_line (config_file, "server_nick1", "\"%s\"",
ptr_server->nick1);
weechat_config_write_line (config_file, "server_nick2", "\"%s\"",
ptr_server->nick2);
weechat_config_write_line (config_file, "server_nick3", "\"%s\"",
ptr_server->nick3);
weechat_config_write_line (config_file, "server_nicks", "\"%s\"",
ptr_server->nicks);
weechat_config_write_line (config_file, "server_username", "\"%s\"",
ptr_server->username);
weechat_config_write_line (config_file, "server_realname", "\"%s\"",
@@ -426,9 +420,11 @@ irc_config_write_server_default (void *data, struct t_config_file *config_file,
/* Get the user's name from /etc/passwd */
if ((my_passwd = getpwuid (geteuid ())) != NULL)
{
weechat_config_write_line (config_file, "server_nick1", "\"%s\"", my_passwd->pw_name);
weechat_config_write_line (config_file, "server_nick2", "\"%s1\"", my_passwd->pw_name);
weechat_config_write_line (config_file, "server_nick3", "\"%s2\"", my_passwd->pw_name);
weechat_config_write_line (config_file,
"server_nicks", "\"%s,%s1,%s2\"",
my_passwd->pw_name,
my_passwd->pw_name,
my_passwd->pw_name);
weechat_config_write_line (config_file, "server_username", "\"%s\"", my_passwd->pw_name);
if ((!my_passwd->pw_gecos)
|| (my_passwd->pw_gecos[0] == '\0')
@@ -451,9 +447,8 @@ irc_config_write_server_default (void *data, struct t_config_file *config_file,
else
{
/* default values if /etc/passwd can't be read */
weechat_config_write_line (config_file, "server_nick1", "%s", "\"weechat1\"");
weechat_config_write_line (config_file, "server_nick2", "%s", "\"weechat2\"");
weechat_config_write_line (config_file, "server_nick3", "%s", "\"weechat3\"");
weechat_config_write_line (config_file, "server_nicks", "%s",
"\"" IRC_SERVER_DEFAULT_NICKS "\"");
weechat_config_write_line (config_file, "server_username", "%s", "\"weechat\"");
weechat_config_write_line (config_file, "server_realname", "%s", "\"weechat\"");
}
@@ -764,21 +759,10 @@ irc_config_init ()
"server_password", "string",
N_("password for IRC server"),
NULL, 0, 0, "", NULL, NULL);
irc_config_server_nick1 = weechat_config_new_option (
irc_config_server_nicks = weechat_config_new_option (
irc_config_file, ptr_section,
"server_nick1", "string",
N_("nickname to use on IRC server"),
NULL, 0, 0, "", NULL, NULL);
irc_config_server_nick2 = weechat_config_new_option (
irc_config_file, ptr_section,
"server_nick2", "string",
N_("alternate nickname to use on IRC server (if nickname is already "
"used)"),
NULL, 0, 0, "", NULL, NULL);
irc_config_server_nick3 = weechat_config_new_option (
irc_config_file, ptr_section, "server_nick3", "string",
N_("2nd alternate nickname to use on IRC server (if alternate "
"nickname is already used)"),
"server_nicks", "string",
N_("nicknames to use on IRC server (separated by comma)"),
NULL, 0, 0, "", NULL, NULL);
irc_config_server_username = weechat_config_new_option (
irc_config_file, ptr_section, "server_username", "string",
+2 -9
View File
@@ -368,15 +368,8 @@ irc_display_server (struct t_irc_server *server, int with_detail)
weechat_printf (NULL, " server_password . . . . . : %s",
(server->password && server->password[0]) ?
_("(hidden)") : "");
weechat_printf (NULL,
" server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s",
server->nick1,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT,
server->nick2,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT,
server->nick3);
weechat_printf (NULL, " server_nicks . . . . . . . : %s",
server->nicks);
weechat_printf (NULL, " server_username . . . . . : %s",
server->username);
weechat_printf (NULL, " server_realname . . . . . : %s",
+64 -82
View File
@@ -5265,56 +5265,47 @@ irc_protocol_cmd_432 (struct t_irc_server *server, int argc, char **argv,
{
/* Note: this IRC command can not be ignored */
int i, nick_found, nick_to_use;
irc_protocol_cmd_error (server, argc, argv, argv_eol, ignore, highlight);
if (!server->is_connected)
{
if (strcmp (server->nick, server->nick1) == 0)
nick_found = -1;
nick_to_use = -1;
for (i = 0; i < server->nicks_count; i++)
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is invalid, "
"trying 2nd nickname \"%s\""),
weechat_prefix ("info"), "irc", server->nick,
server->nick2);
free (server->nick);
server->nick = strdup (server->nick2);
if (strcmp (server->nick, server->nicks_array[i]) == 0)
{
nick_found = i;
break;
}
}
if (nick_found < 0)
nick_to_use = 0;
else
{
if (strcmp (server->nick, server->nick2) == 0)
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is invalid, "
"trying 3rd nickname \"%s\""),
weechat_prefix ("info"), "irc", server->nick,
server->nick3);
free (server->nick);
server->nick = strdup (server->nick3);
}
else
{
if (strcmp (server->nick, server->nick3) == 0)
{
weechat_printf (server->buffer,
_("%s%s: all declared nicknames are "
"already in use or invalid, closing "
"connection with server!"),
weechat_prefix ("error"), "irc");
irc_server_disconnect (server, 1);
return WEECHAT_RC_OK;
}
else
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is invalid, "
"trying 1st nickname \"%s\""),
weechat_prefix ("info"), "irc",
server->nick, server->nick1);
free (server->nick);
server->nick = strdup (server->nick1);
}
}
if (nick_found < server->nicks_count - 1)
nick_to_use = nick_found + 1;
}
if (nick_to_use < 0)
{
weechat_printf (server->buffer,
_("%s%s: all declared nicknames are "
"already in use or invalid, closing "
"connection with server"),
weechat_prefix ("error"), "irc");
irc_server_disconnect (server, 1);
return WEECHAT_RC_OK;
}
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is invalid, "
"trying nickname #%d (\"%s\")"),
weechat_prefix ("info"), "irc", server->nick,
nick_to_use + 1, server->nicks_array[nick_to_use]);
free (server->nick);
server->nick = strdup (server->nicks_array[nick_to_use]);
irc_server_sendf (server, "NICK %s", server->nick);
}
@@ -5331,54 +5322,45 @@ irc_protocol_cmd_433 (struct t_irc_server *server, int argc, char **argv,
{
/* Note: this IRC command can not be ignored */
int i, nick_found, nick_to_use;
if (!server->is_connected)
{
if (strcmp (server->nick, server->nick1) == 0)
nick_found = -1;
nick_to_use = -1;
for (i = 0; i < server->nicks_count; i++)
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is already in use, "
"trying 2nd nickname \"%s\""),
weechat_prefix ("info"), "irc", server->nick,
server->nick2);
free (server->nick);
server->nick = strdup (server->nick2);
if (strcmp (server->nick, server->nicks_array[i]) == 0)
{
nick_found = i;
break;
}
}
if (nick_found < 0)
nick_to_use = 0;
else
{
if (strcmp (server->nick, server->nick2) == 0)
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is already in use, "
"trying 3rd nickname \"%s\""),
weechat_prefix ("info"), "irc", server->nick,
server->nick3);
free (server->nick);
server->nick = strdup (server->nick3);
}
else
{
if (strcmp (server->nick, server->nick3) == 0)
{
weechat_printf (server->buffer,
_("%s%s: all declared nicknames are "
"already in use, closing connection "
"with server!"),
weechat_prefix ("error"), "irc");
irc_server_disconnect (server, 1);
return WEECHAT_RC_OK;
}
else
{
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is already in use, "
"trying 1st nickname \"%s\""),
weechat_prefix ("info"), "irc",
server->nick, server->nick1);
free (server->nick);
server->nick = strdup (server->nick1);
}
}
if (nick_found < server->nicks_count - 1)
nick_to_use = nick_found + 1;
}
if (nick_to_use < 0)
{
weechat_printf (server->buffer,
_("%s%s: all declared nicknames are "
"already in use, closing "
"connection with server"),
weechat_prefix ("error"), "irc");
irc_server_disconnect (server, 1);
return WEECHAT_RC_OK;
}
weechat_printf (server->buffer,
_("%s%s: nickname \"%s\" is already in use, "
"trying nickname #%d (\"%s\")"),
weechat_prefix ("info"), "irc", server->nick,
nick_to_use + 1, server->nicks_array[nick_to_use]);
free (server->nick);
server->nick = strdup (server->nicks_array[nick_to_use]);
irc_server_sendf (server, "NICK %s", server->nick);
}
else
+43 -49
View File
@@ -91,9 +91,9 @@ irc_server_init (struct t_irc_server *server)
server->ipv6 = 0;
server->ssl = 0;
server->password = NULL;
server->nick1 = NULL;
server->nick2 = NULL;
server->nick3 = NULL;
server->nicks = NULL;
server->nicks_count = 0;
server->nicks_array = NULL;
server->username = NULL;
server->realname = NULL;
server->hostname = NULL;
@@ -145,6 +145,7 @@ irc_server_init (struct t_irc_server *server)
* -1 = invalid syntax
*/
/*
int
irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
{
@@ -249,7 +250,7 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
server->ipv6 = ipv6;
server->ssl = ssl;
/* some default values */
// some default values
if (server->port < 0)
server->port = IRC_SERVER_DEFAULT_PORT;
server->nick2 = (char *)malloc ((strlen (server->nick1) + 2) * sizeof (char));
@@ -261,6 +262,7 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
return 0;
}
*/
/*
* irc_server_init_with_config_options: init a server with config options
@@ -342,27 +344,23 @@ irc_server_init_with_config_options (struct t_irc_server *server,
if (ptr_option)
ptr_server->password = strdup (weechat_config_string (ptr_option));
if (ptr_server->nick1)
free (ptr_server->nick1);
ptr_server->nick1 = NULL;
ptr_option = weechat_config_search_option (NULL, section, "server_nick1");
if (ptr_server->nicks)
{
free (ptr_server->nicks);
ptr_server->nicks = NULL;
weechat_string_free_exploded (ptr_server->nicks_array);
ptr_server->nicks_array = NULL;
}
ptr_server->nicks_count = 0;
ptr_option = weechat_config_search_option (NULL, section, "server_nicks");
if (ptr_option)
ptr_server->nick1 = strdup (weechat_config_string (ptr_option));
if (ptr_server->nick2)
free (ptr_server->nick2);
ptr_server->nick2 = NULL;
ptr_option = weechat_config_search_option (NULL, section, "server_nick2");
if (ptr_option)
ptr_server->nick2 = strdup (weechat_config_string (ptr_option));
{
ptr_server->nicks = strdup (weechat_config_string (ptr_option));
ptr_server->nicks_array = weechat_string_explode (weechat_config_string (ptr_option),
",", 0, 0,
&ptr_server->nicks_count);
}
if (ptr_server->nick3)
free (ptr_server->nick3);
ptr_server->nick3 = NULL;
ptr_option = weechat_config_search_option (NULL, section, "server_nick3");
if (ptr_option)
ptr_server->nick3 = strdup (weechat_config_string (ptr_option));
if (ptr_server->username)
free (ptr_server->username);
ptr_server->username = NULL;
@@ -537,12 +535,10 @@ irc_server_free_data (struct t_irc_server *server)
free (server->address);
if (server->password)
free (server->password);
if (server->nick1)
free (server->nick1);
if (server->nick2)
free (server->nick2);
if (server->nick3)
free (server->nick3);
if (server->nicks)
free (server->nicks);
if (server->nicks_array)
weechat_string_free_exploded (server->nicks_array);
if (server->username)
free (server->username);
if (server->realname)
@@ -626,9 +622,9 @@ struct t_irc_server *
irc_server_new (char *name, int autoconnect, int autoreconnect,
int autoreconnect_delay, int temp_server, char *address,
int port, int ipv6, int ssl, char *password,
char *nick1, char *nick2, char *nick3, char *username,
char *realname, char *hostname, char *command, int command_delay,
char *autojoin, int autorejoin, char *notify_levels)
char *nicks, char *username, char *realname, char *hostname,
char *command, int command_delay, char *autojoin,
int autorejoin, char *notify_levels)
{
struct t_irc_server *new_server;
@@ -638,13 +634,11 @@ irc_server_new (char *name, int autoconnect, int autoreconnect,
if (irc_debug)
{
weechat_log_printf ("Creating new server (name:%s, address:%s, "
"port:%d, pwd:%s, nick1:%s, nick2:%s, nick3:%s, "
"username:%s, realname:%s, hostname: %s, "
"command:%s, autojoin:%s, autorejoin:%s, "
"notify_levels:%s)",
"port:%d, pwd:%s, nicks:%s, username:%s, "
"realname:%s, hostname: %s, command:%s, "
"autojoin:%s, autorejoin:%s, notify_levels:%s)",
name, address, port, (password) ? password : "",
(nick1) ? nick1 : "", (nick2) ? nick2 : "",
(nick3) ? nick3 : "", (username) ? username : "",
(nicks) ? nicks : "", (username) ? username : "",
(realname) ? realname : "",
(hostname) ? hostname : "",
(command) ? command : "",
@@ -665,9 +659,12 @@ irc_server_new (char *name, int autoconnect, int autoreconnect,
new_server->ipv6 = ipv6;
new_server->ssl = ssl;
new_server->password = (password) ? strdup (password) : strdup ("");
new_server->nick1 = (nick1) ? strdup (nick1) : strdup ("weechat_user");
new_server->nick2 = (nick2) ? strdup (nick2) : strdup ("weechat2");
new_server->nick3 = (nick3) ? strdup (nick3) : strdup ("weechat3");
new_server->nicks = (nicks) ?
strdup (nicks) : strdup (IRC_SERVER_DEFAULT_NICKS);
new_server->nicks_array = weechat_string_explode ((nicks) ?
nicks : IRC_SERVER_DEFAULT_NICKS,
",", 0, 0,
&new_server->nicks_count);
new_server->username =
(username) ? strdup (username) : strdup ("weechat");
new_server->realname =
@@ -713,9 +710,7 @@ irc_server_duplicate (struct t_irc_server *server, char *new_name)
server->ipv6,
server->ssl,
server->password,
server->nick1,
server->nick2,
server->nick3,
server->nicks,
server->username,
server->realname,
server->hostname,
@@ -1599,13 +1594,12 @@ irc_server_login (struct t_irc_server *server)
irc_server_sendf (server, "PASS %s", server->password);
if (!server->nick)
server->nick = strdup (server->nick1);
server->nick = strdup (server->nicks_array[0]);
irc_server_sendf (server,
"NICK %s\n"
"USER %s %s %s :%s",
server->nick, server->username, server->username,
server->address, server->realname);
//gui_input_draw (weechat_current_buffer, 1);
}
/*
@@ -2828,9 +2822,9 @@ irc_server_print_log ()
weechat_log_printf (" password. . . . . . : '%s'",
(ptr_server->password && ptr_server->password[0]) ?
"(hidden)" : ptr_server->password);
weechat_log_printf (" nick1 . . . . . . . : '%s'", ptr_server->nick1);
weechat_log_printf (" nick2 . . . . . . . : '%s'", ptr_server->nick2);
weechat_log_printf (" nick3 . . . . . . . : '%s'", ptr_server->nick3);
weechat_log_printf (" nicks . . . . . . . : '%s'", ptr_server->nicks);
weechat_log_printf (" nicks_count . . . . : %d", ptr_server->nicks_count);
weechat_log_printf (" nicks_array . . . . : 0x%x", ptr_server->nicks_array);
weechat_log_printf (" username. . . . . . : '%s'", ptr_server->username);
weechat_log_printf (" realname. . . . . . : '%s'", ptr_server->realname);
weechat_log_printf (" command . . . . . . : '%s'",
+6 -6
View File
@@ -30,8 +30,9 @@
#define NI_MAXHOST 256
#endif
#define IRC_SERVER_DEFAULT_PORT 6667
#define IRC_SERVER_DEFAULT_PORT 6667
#define IRC_SERVER_DEFAULT_PREFIXES_LIST "@%+~&!-"
#define IRC_SERVER_DEFAULT_NICKS "weechat1,weechat2,weechat3"
#define irc_server_sendf_queued(server, fmt, argz...) \
if (server) \
@@ -65,9 +66,9 @@ struct t_irc_server
int ipv6; /* use IPv6 protocol */
int ssl; /* SSL protocol */
char *password; /* password for server */
char *nick1; /* first nickname for the server */
char *nick2; /* alternate nickname */
char *nick3; /* 2nd alternate nickname */
char *nicks; /* nicknames as one string */
int nicks_count; /* number of nicknames */
char **nicks_array; /* exploded nicknames */
char *username; /* user name */
char *realname; /* real name */
char *hostname; /* custom hostname */
@@ -147,8 +148,7 @@ extern struct t_irc_server *irc_server_new (char *name, int autoconnect,
int autoreconnect_delay,
int temp_server, char *address,
int port, int ipv6, int ssl,
char *password, char *nick1,
char *nick2, char *nick3,
char *password, char *nicks,
char *username, char *realname,
char *hostname, char *command,
int command_delay, char *autojoin,