diff --git a/ChangeLog b/ChangeLog index aa888999d..5386892c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ ChangeLog - 2005-06-19 Version 0.1.3 (under dev!): + * SSL support (currently in development, NOT WORKING!) * channel notify levels are saved in config file (new option "server_notify_levels" for server sections) * part message now accepts %v (replaced by WeeChat version), like quit message diff --git a/po/es.po b/po/es.po index d99a4143a..e397cde3e 100644 --- a/po/es.po +++ b/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-19 15:59+0200\n" -"PO-Revision-Date: 2005-06-19 16:08+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" +"PO-Revision-Date: 2005-06-19 22:51+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -20,103 +20,113 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s no ha sido posible crear un nuevo nick\n" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "No ha sido posible obtener el nombre de usuario" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s no ha sido posible crear un nuevo servidor\n" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s error enviando datos al servidor IRC\n" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s memoria insuficiente para un mensaje IRC recibido\n" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s ¡Ha fallado el comando '%s' !\n" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "%s ¡Ningún comando para ejecutar!\n" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "%s Comando desconocido: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" "%s no ha sido posible leer datos del socket, desconectando del servidor...\n" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "%s: Reconexión al servidor en %d segundos\n" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s dirección \"%s\" no encontrada\n" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "%s Dirección IP no encontrada\n" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "%s conexión rechazada\n" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" -msgstr "%s: conectando a %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" +msgstr "%s: conectando a %s:%d%s...\n" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" -msgstr "Conectando al servidor %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" +msgstr "Conectando al servidor %s:%d%s...\n" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexión\n" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "¡Desconectado del servidor!\n" @@ -1251,7 +1261,7 @@ msgstr "no es posible cambiar el modo para el resto de usuarios" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "Servidor: " @@ -1264,10 +1274,12 @@ msgid "not connected" msgstr "no conectado" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "sí" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "no" @@ -1275,7 +1287,7 @@ msgstr "no" msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no será guardado)" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(oculto)" @@ -1300,8 +1312,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -2247,20 +2259,22 @@ msgstr "lista, a #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" "[nombre_de_servidor] | [nombre_de_servidor nombre/IP puerto [-auto | -" -"noauto] [-pwd contraseña] [-nicks alias1 [alias2 [alias3]]] [-username " -"nombre de usuario] [-realname nombre_real] [-command comando] [-autojoin " -"canal[,canal]] ] | [del nombre_de_servidor]" +"noauto] [-ssl] [-pwd contraseña] [-nicks alias1 [alias2 [alias3]]] [-" +"username nombre de usuario] [-realname nombre_real] [-command comando] [-" +"autojoin canal[,canal]] ] | [del nombre_de_servidor]" #: src/common/command.c:91 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2270,6 +2284,7 @@ msgid "" msgstr "" "nombre_de_servidor: nombre del servidor, para uso interno y para mostrar\n" "nombre/IP: nombre o dirección IP del servidor\n" +"ssl: use SSL protocol\n" "puerto: puerto para el servidor (número entero)\n" "contraseña: contraseña para el servidor\n" "alias1: primer alias para el servidor\n" @@ -2278,27 +2293,27 @@ msgstr "" "nombre_de_usuario: nombre de usuario\n" "nombre_real: nombre real del usuario" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "guardar configuración a disco" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "[archivo]" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "archivo: fichero en el que guardar la configuración" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "modificar parámetros de configuración" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "[opción[=valor]]" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" @@ -2306,27 +2321,27 @@ msgstr "" "opción: nombre de una opción\n" "valor: valor para la opción" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "eliminar un alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "alias: nombre del alias a suprimir" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "gestión de ventanas" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2339,29 +2354,29 @@ msgstr "" "splitv: dividir la ventana actual verticalmente\n" "merge: fusionar una ventana con otra" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s ¡el alias o el comando \"%s\" ya existe!\n" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s ¡el alias no puede ejecutar otro alias!\n" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s ¡el comando objetivo \"%s\" no existe!\n" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d " "parámetro%s)\n" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2370,19 +2385,19 @@ msgstr "" "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: " "entre %d y %d parámetro%s)\n" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s el comando \"%s\" ha fallado\n" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d " "parámetro%s)\n" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2391,189 +2406,189 @@ msgstr "" "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: " "entre %d y %d parámetro%s)\n" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s ¡el comando \"%s\" requiere una conexión a servidor!\n" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format 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/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "¡Esta ventana no es un canal!\n" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s faltan argumentos para el comando \"%s\"\n" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" creado\n" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente " "memoria)\n" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "Lista de alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Ningún alias definido.\n" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr " (servidor: " -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "Privado con: " -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "Búfers abiertos:\n" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s número de búfer incorrecto\n" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s no es posible cerrar el único búfer\n" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "Niveles de notificación: " -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s búfer \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s ¡no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexión automática está anulada\n" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "%s scripts registrados:\n" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "Comandos %s :\n" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2582,7 +2597,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2592,32 +2607,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2626,108 +2641,108 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a " "él. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opción de configuración \"%s\" no encontrada\n" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en " "ejecución\n" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opción de configuración encontrada con \"%s\"\n" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -2797,7 +2812,7 @@ msgstr "**** Comienzo del log (registro) " msgid "**** End of log " msgstr "**** Fin del log " -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" @@ -2806,47 +2821,47 @@ msgstr "" "Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n" "\n" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "vacío" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" @@ -2855,7 +2870,7 @@ msgstr "" " . descripción: %s\n" "\n" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" @@ -2863,7 +2878,7 @@ msgstr "" "Además, usted puede definir alias en la sección [alias], añadiendo líneas " "como:\n" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" @@ -2872,65 +2887,65 @@ msgstr "" "donde 'j' es el nombre del alias, y 'join' el comando asociado.\n" "\n" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "%s no es posible crear el servidor ('%s'), ignorado\n" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "%s parámetro desconocido '%s', ignorado\n" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "%s no es posible crear el directorio \"%s\"\n" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "%s no ha sido posible leer el directorio HOME\n" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "%s no hay suficiente memoria para el directorio home\n" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "%s no es posible crear el directorio ~/.weechat\n" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "%s no es posible crear el directorio ~/.weechat/logs\n" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "%sBienvenido a " -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "compilado en" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "Error WeeChat:" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "Advertencia WeeChat:" @@ -3624,37 +3639,41 @@ msgstr "puerto para el servidor IRC" msgid "port for connecting to server" msgstr "puerto para conectarse al servidor" -#: src/common/weeconfig.c:653 +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" +msgstr "" + +#: src/common/weeconfig.c:657 msgid "server password" msgstr "contraseña para el servidor" -#: src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 msgid "password for IRC server" msgstr "contraseña para el servidor IRC" -#: src/common/weeconfig.c:657 +#: src/common/weeconfig.c:661 msgid "nickname for server" msgstr "nombre de usuario para el servidor" -#: src/common/weeconfig.c:658 +#: src/common/weeconfig.c:662 msgid "nickname to use on IRC server" msgstr "nombre de usuario a utilizar en el servidor IRC" -#: src/common/weeconfig.c:661 +#: src/common/weeconfig.c:665 msgid "alternate nickname for server" msgstr "nombre de usuario alternativo para el servidor" -#: src/common/weeconfig.c:662 +#: src/common/weeconfig.c:666 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)" -#: src/common/weeconfig.c:665 +#: src/common/weeconfig.c:669 msgid "2nd alternate nickname for server" msgstr "segundo nombre de usuario alternativo para el servidor" -#: src/common/weeconfig.c:666 +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3662,31 +3681,31 @@ msgstr "" "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el " "nombre de usuario alternativo ya está en uso)" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "nombre de usuario para el servidor" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "nombre de usuario para el servidor IRC" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "nombre real para el servidor" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "nombre real para el servidor IRC" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "primer comando a ejecutar cuando se conecte a un servidor" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "espera (en segundos) después de que el comando sea ejecutado" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3694,86 +3713,86 @@ msgstr "" "espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar " "algo de tiempo para la autenticación)" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "lista de canales a unirse cuando se conecte a un servidor" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" "lista de canales (separados por comas) a unirse cuando se conecte a un " "servidor" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" msgstr "" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, línea %d: el servidor '%s' ya existe\n" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, línea %d: no es posible crear el servidor\n" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s no es posible asignar el color por defecto (\"%s\")\n" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichero de configuración \"%s\" no encontrado.\n" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, línea %d: opción \"%s\" inválida\n" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3782,7 +3801,7 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción '%s'\n" "Esperado: valor booleano: 'off' u 'on'\n" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3791,7 +3810,7 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción %s'\n" "Esperado: entero comprendido entre %d y %d\n" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3800,26 +3819,26 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción '%s'\n" "Esperado: una de estas cadenas: " -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s no es posible crear el fichero \"%s\"\n" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "Creando fichero de configuración por defecto\n" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" @@ -3828,6 +3847,6 @@ msgstr "" "#\n" "# %s: fichero de configuración, creado por %s v%s el %s#\n" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "Guardar configuración a disco\n" diff --git a/po/fr.po b/po/fr.po index e8dd83944..55c9e2f17 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-19 15:59+0200\n" -"PO-Revision-Date: 2005-06-19 16:07+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" +"PO-Revision-Date: 2005-06-19 22:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -20,103 +20,113 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s impossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s erreur d'envoi de données au serveur IRC\n" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s mémoire insuffisante pour un message IRC reçu\n" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "%s Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "%s Commande inconnue: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" "%s impossible de lire des données sur la socket, déconnexion du serveur...\n" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "%s: Reconnexion au serveur dans %d secondes\n" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "%s le handshake gnutls a échoué\n" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "%s connexion refusée\n" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" -msgstr "%s: connexion à %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" +msgstr "%s: connexion à %s:%d%s...\n" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" -msgstr "Connexion au serveur %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" +msgstr "Connexion au serveur %s:%d%s...\n" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "%s erreur d'initialisation gnutls\n" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de créer la socket\n" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" @@ -1252,7 +1262,7 @@ msgstr "impossible de changer le mode pour les autres utilisateurs" msgid "whois (secure connection)" msgstr "qui est (connexion sécurisée)" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "Serveur: " @@ -1265,10 +1275,12 @@ msgid "not connected" msgstr "non connecté" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "oui" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "non" @@ -1276,7 +1288,7 @@ msgstr "non" msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(caché)" @@ -1302,8 +1314,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -2248,11 +2260,12 @@ msgstr "liste, ajoute ou retire des serveurs" #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" -"[nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-pwd " +"[nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ssl] [-pwd " "mot_de_passe] [-nicks pseudo1 [pseudo2 [pseudo3]]] [-username " "nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[," "canal]] ] | [del nom_serveur]" @@ -2262,6 +2275,7 @@ msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2272,6 +2286,7 @@ msgstr "" "nom_serveur: nom du serveur, pour usage interne et affichage\n" "nom/IP: nom ou adresse IP du serveur\n" "port: port pour le serveur (nombre entier)\n" +"ssl: utiliser le protocole SSL\n" "mot_de_passe: mot de passe pour le serveur\n" "pseudo1: premier pseudo pour le serveur\n" "pseudo2: pseudo alternatif pour le serveur\n" @@ -2279,27 +2294,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "[option[=valeur]]" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" @@ -2307,27 +2322,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2339,29 +2354,29 @@ msgstr "" "splitv: éclate la fenêtre en deux verticalement\n" "merge: fusionne la fenêtre avec une autre" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peux pas lancer un autre alias !\n" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s la commande cible \"%s\" n'existe pas !\n" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d " "paramètre%s)\n" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2370,19 +2385,19 @@ msgstr "" "%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre " "%d et %d paramètre%s)\n" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s la commande \"%s\" a échoué\n" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d " "paramètre%s)\n" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2391,190 +2406,190 @@ msgstr "" "%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: " "entre %d et %d paramètre%s)\n" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" "%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr " (serveur: " -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "Privé avec: " -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s impossible de fermer le tampon unique\n" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s impossible de fermer le tampon du serveur tant que des canaux sont " "ouverts\n" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" "%s tampon incorrect pour la notification (doit être un canal ou un privé)\n" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s buffer \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annulée\n" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "Commandes %s :\n" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2583,7 +2598,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2593,31 +2608,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2626,106 +2641,106 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -2793,7 +2808,7 @@ msgstr "**** D msgid "**** End of log " msgstr "**** Fin du log " -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" @@ -2802,47 +2817,47 @@ msgstr "" "Options de configuration de WeeChat (~/.weechat/weechat.rc):\n" "\n" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type booléen (valeurs: 'on' ou 'off')\n" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par défaut: '%s'\n" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr " . valeur par défaut: %d\n" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr " . type chaîne (valeurs: " -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "vide" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr " . type chaîne (toute chaîne)\n" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" @@ -2851,7 +2866,7 @@ msgstr "" " . description: %s\n" "\n" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" @@ -2859,7 +2874,7 @@ msgstr "" "De plus, vous pouvez définir des alias dans la section [alias], en ajoutant " "des lignes comme :\n" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" @@ -2868,65 +2883,65 @@ msgstr "" "où 'j' est le nom de l'alias, et 'join' la commande associée.\n" "\n" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "%s impossible de créer le serveur ('%s'), ignoré\n" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "%s paramètre inconnu '%s', ignoré\n" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "%s impossible de créer le répertoire \"%s\"\n" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "%s impossible de lire le répertoire personnel\n" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "%s pas assez de mémoire pour le répertoire personnel\n" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "%s impossible de créer le répertoire ~/.weechat\n" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "%sBienvenue dans " -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "compilé le" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "Erreur WeeChat:" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "Avertissement WeeChat:" @@ -3620,35 +3635,39 @@ msgstr "port pour le serveur IRC" msgid "port for connecting to server" msgstr "port pour se connecter au serveur" -#: src/common/weeconfig.c:653 +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" +msgstr "utiliser SSL pour la communication avec le serveur" + +#: src/common/weeconfig.c:657 msgid "server password" msgstr "mot de passe pour le serveur" -#: src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 msgid "password for IRC server" msgstr "mot de passe pour le serveur IRC" -#: src/common/weeconfig.c:657 +#: src/common/weeconfig.c:661 msgid "nickname for server" msgstr "pseudo pour le serveur" -#: src/common/weeconfig.c:658 +#: src/common/weeconfig.c:662 msgid "nickname to use on IRC server" msgstr "pseudo à utiliser sur le serveur IRC" -#: src/common/weeconfig.c:661 +#: src/common/weeconfig.c:665 msgid "alternate nickname for server" msgstr "pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:662 +#: src/common/weeconfig.c:666 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é)" -#: src/common/weeconfig.c:665 +#: src/common/weeconfig.c:669 msgid "2nd alternate nickname for server" msgstr "2nd pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:666 +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3656,31 +3675,31 @@ msgstr "" "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà " "utilisé)" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "nom d'utilisateur pour le serveur" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "nom d'utilisateur pour le serveur IRC" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "nom réel pour le serveur" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "nom réel pour le serveur IRC" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "commande à exécuter en premier lorsque connecté au serveur" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "délai (en secondes) après exécution de la commande" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3688,25 +3707,25 @@ msgstr "" "délai (en secondes) après exécution de la commande (exemple: donner du temps " "pour l'authentification)" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "liste des canaux à rejoindre lorsque connecté au serveur" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "niveaux de notification pour les canaux de ce serveur" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" @@ -3714,64 +3733,64 @@ msgstr "" "liste des niveaux de notifications (séparés par des virgules) pour les " "canaux de ce serveur (format: #canal:1,..)" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, ligne %d: impossible de créer le serveur\n" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" "%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s" "\")\n" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3780,7 +3799,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: valeur booléenne: 'off' ou 'on'\n" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3789,7 +3808,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: entier compris entre %d et %d\n" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3798,26 +3817,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "Création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" @@ -3826,6 +3845,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" diff --git a/po/weechat.pot b/po/weechat.pot index ff79a356e..0717a9591 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: 2005-06-19 15:59+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,102 +20,112 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "" @@ -1146,7 +1156,7 @@ msgstr "" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "" @@ -1159,10 +1169,12 @@ msgid "not connected" msgstr "" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "" @@ -1170,7 +1182,7 @@ msgstr "" msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "" @@ -1194,8 +1206,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -2100,9 +2112,10 @@ msgstr "" #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" #: src/common/command.c:91 @@ -2110,6 +2123,7 @@ msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2118,53 +2132,53 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2172,373 +2186,373 @@ msgid "" "merge: merge window with another" msgstr "" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "" -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr "" -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "" -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "" -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr "" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "" -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "" @@ -2606,132 +2620,132 @@ msgstr "" msgid "**** End of log " msgstr "" -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" "\n" msgstr "" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr "" -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr "" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" "\n" msgstr "" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" msgstr "" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" "\n" msgstr "" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "" -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "" @@ -3380,194 +3394,198 @@ msgstr "" msgid "port for connecting to server" msgstr "" -#: src/common/weeconfig.c:653 -msgid "server password" -msgstr "" - -#: src/common/weeconfig.c:654 -msgid "password for IRC server" +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" msgstr "" #: src/common/weeconfig.c:657 -msgid "nickname for server" +msgid "server password" msgstr "" #: src/common/weeconfig.c:658 -msgid "nickname to use on IRC server" +msgid "password for IRC server" msgstr "" #: src/common/weeconfig.c:661 -msgid "alternate nickname for server" +msgid "nickname for server" msgstr "" #: src/common/weeconfig.c:662 -msgid "alternate nickname to use on IRC server (if nickname is already used)" +msgid "nickname to use on IRC server" msgstr "" #: src/common/weeconfig.c:665 -msgid "2nd alternate nickname for server" +msgid "alternate nickname for server" msgstr "" #: src/common/weeconfig.c:666 +msgid "alternate nickname to use on IRC server (if nickname is already used)" +msgstr "" + +#: src/common/weeconfig.c:669 +msgid "2nd alternate nickname for server" +msgstr "" + +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" msgstr "" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" msgstr "" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" msgstr "" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: integer between %d and %d\n" msgstr "" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index fa8d4bdcd..6297f28e4 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -84,13 +84,14 @@ t_weechat_command weechat_commands[] = 0, 2, weechat_cmd_python, NULL }, { "server", N_("list, add or remove servers"), N_("[servername] | " - "[servername hostname port [-auto | -noauto] [-pwd password] [-nicks nick1 " + "[servername hostname port [-auto | -noauto] [-ssl] [-pwd password] [-nicks nick1 " "[nick2 [nick3]]] [-username username] [-realname realname] " "[-command command] [-autojoin channel[,channel]] ] | " "[del servername]"), N_("servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" + "ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -1764,6 +1765,8 @@ weechat_cmd_server (int argc, char **argv) server.autoconnect = 1; if (strcasecmp (argv[i], "-noauto") == 0) server.autoconnect = 0; + if (strcasecmp (argv[i], "-ssl") == 0) + server.ssl = 1; if (strcasecmp (argv[i], "-pwd") == 0) { if (i == (argc - 1)) @@ -1851,7 +1854,8 @@ weechat_cmd_server (int argc, char **argv) new_server = server_new (server.name, server.autoconnect, server.autoreconnect, server.autoreconnect_delay, - 0, server.address, server.port, server.password, + 0, server.address, server.port, server.ssl, + server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, server.command, 1, server.autojoin, 1, NULL); diff --git a/src/common/weechat.c b/src/common/weechat.c index 3b20f3d5a..b208d56ea 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -47,6 +47,7 @@ #include #include #include +#include #ifdef HAVE_ICONV #include @@ -70,9 +71,11 @@ int sigsegv = 0; /* SIGSEGV received? char *weechat_home = NULL; /* WeeChat home dir. (example: /home/toto/.weechat) */ FILE *weechat_log_file = NULL; /* WeeChat log file (~/.weechat/weechat.log) */ -char *local_charset = NULL; /* local charset, for example: ISO-8859-1 */ +char *local_charset = NULL; /* local charset, for example: ISO-8859-1 */ -int server_cmd_line; /* at least one server on WeeChat command line */ +int server_cmd_line; /* at least one server on WeeChat command line */ + +gnutls_anon_client_credentials gnutls_anoncred; /* gnutls client credentials */ /* @@ -368,7 +371,7 @@ wee_parse_args (int argc, char *argv[]) if (!server_new (server_tmp.name, server_tmp.autoconnect, server_tmp.autoreconnect, server_tmp.autoreconnect_delay, - 1, server_tmp.address, server_tmp.port, + 1, server_tmp.address, server_tmp.port, 0, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL)) @@ -516,6 +519,10 @@ wee_init_vars () /* init received messages queue */ recv_msgq = NULL; msgq_last_msg = NULL; + + /* init gnutls */ + gnutls_global_init (); + gnutls_anon_allocate_client_credentials (&gnutls_anoncred); } /* @@ -609,6 +616,8 @@ wee_shutdown (int return_code) if (local_charset) free (local_charset); alias_free_all (); + gnutls_anon_free_client_credentials (gnutls_anoncred); + gnutls_global_deinit(); exit (return_code); } diff --git a/src/common/weechat.h b/src/common/weechat.h index 6b40fe965..77ff134ba 100644 --- a/src/common/weechat.h +++ b/src/common/weechat.h @@ -27,6 +27,7 @@ #include #include +#include #if defined(ENABLE_NLS) && !defined(_) #include @@ -107,6 +108,7 @@ extern int quit_weechat; extern char *weechat_home; extern char *local_charset; +extern gnutls_anon_client_credentials gnutls_anoncred; extern void wee_log_printf (char *, ...); extern void wee_dump (int); diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index c51f29332..eb94abe1d 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -650,6 +650,10 @@ t_config_option weechat_options_server[] = N_("port for connecting to server"), OPTION_TYPE_INT, 0, 65535, 6667, NULL, NULL, &(cfg_server.port), NULL, NULL }, + { "server_ssl", N_("use SSL for server communication"), + N_("use SSL for server communication"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, + NULL, NULL, &(cfg_server.ssl), NULL, NULL }, { "server_password", N_("server password"), N_("password for IRC server"), OPTION_TYPE_STRING, 0, 0, 0, @@ -920,6 +924,8 @@ config_get_server_option_ptr (t_irc_server *server, char *option_name) return (void *)(&server->address); if (strcasecmp (option_name, "server_port") == 0) return (void *)(&server->port); + if (strcasecmp (option_name, "server_ssl") == 0) + return (void *)(&server->ssl); if (strcasecmp (option_name, "server_password") == 0) return (void *)(&server->password); if (strcasecmp (option_name, "server_nick1") == 0) @@ -1095,7 +1101,7 @@ config_allocate_server (char *filename, int line_number) if (!server_new (cfg_server.name, cfg_server.autoconnect, cfg_server.autoreconnect, cfg_server.autoreconnect_delay, 0, cfg_server.address, cfg_server.port, - cfg_server.password, cfg_server.nick1, cfg_server.nick2, + cfg_server.ssl, cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, cfg_server.command, cfg_server.command_delay, cfg_server.autojoin, cfg_server.autorejoin, cfg_server.notify_levels)) @@ -1672,6 +1678,8 @@ config_write (char *config_name) ptr_server->autoreconnect_delay); fprintf (file, "server_address=%s\n", ptr_server->address); fprintf (file, "server_port=%d\n", ptr_server->port); + fprintf (file, "server_ssl=%s\n", + (ptr_server->ssl) ? "on" : "off"); fprintf (file, "server_password=%s\n", (ptr_server->password) ? ptr_server->password : ""); fprintf (file, "server_nick1=%s\n", ptr_server->nick1); diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 2f885de8f..7f8c0b001 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -23,7 +23,8 @@ weechat_curses_LDADD = ../lib_weechat_gui_common.a \ ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ $(NCURSES_LIBS) \ - ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) + ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) \ + -lgnutls weechat_curses_SOURCES = gui-display.c \ gui-input.c diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index 1fd1e045c..ab7276d45 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -175,6 +175,9 @@ irc_display_server (t_irc_server *server) gui_printf_color (NULL, COLOR_WIN_CHAT, " server_port . . . . . . .: %d\n", server->port); + gui_printf_color (NULL, COLOR_WIN_CHAT, + " server_ssl . . . . . . . .: %s\n", + (server->ssl) ? _("yes") : _("no")); gui_printf_color (NULL, COLOR_WIN_CHAT, " server_password . . . . .: %s\n", (server->password && server->password[0]) ? diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index e1cbf5453..3497a724c 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* irc-server.c: (dis)connection and communication with irc server */ +/* irc-server.c: connection and communication with IRC server */ #ifdef HAVE_CONFIG_H @@ -38,6 +38,7 @@ #include #include #include +#include #include "../common/weechat.h" #include "irc.h" @@ -67,6 +68,7 @@ server_init (t_irc_server *server) server->command_line = 0; server->address = NULL; server->port = -1; + server->ssl = 0; server->password = NULL; server->nick1 = NULL; server->nick2 = NULL; @@ -317,7 +319,7 @@ server_free_all () t_irc_server * server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_delay, - int command_line, char *address, int port, char *password, + int command_line, char *address, int port, int ssl, char *password, char *nick1, char *nick2, char *nick3, char *username, char *realname, char *command, int command_delay, char *autojoin, int autorejoin, char *notify_levels) @@ -347,6 +349,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de new_server->command_line = command_line; new_server->address = strdup (address); new_server->port = port; + 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"); @@ -371,7 +374,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de } /* - * server_send: send data to irc server + * server_send: send data to IRC server */ int @@ -380,11 +383,14 @@ server_send (t_irc_server *server, char *buffer, int size_buf) if (!server) return -1; - return send (server->sock, buffer, size_buf, 0); + if (server->ssl) + return gnutls_record_send (server->gnutls_sess, buffer, size_buf); + else + return send (server->sock, buffer, size_buf, 0); } /* - * server_sendf: send formatted data to irc server + * server_sendf: send formatted data to IRC server */ void @@ -651,7 +657,14 @@ server_recv (t_irc_server *server) static char buffer[4096 + 2]; int num_read; - num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0); + if (!server) + return; + + if (server->ssl) + num_read = gnutls_record_recv (server->gnutls_sess, buffer, sizeof (buffer) - 2); + else + num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0); + if (num_read > 0) { buffer[num_read] = '\0'; @@ -708,8 +721,12 @@ server_close_connection (t_irc_server *server) /* close network socket */ if (server->sock != -1) { + if (server->ssl) + gnutls_bye (server->gnutls_sess, GNUTLS_SHUT_RDWR); close (server->sock); server->sock = -1; + if (server->ssl) + gnutls_deinit (server->gnutls_sess); } /* free any pending message */ @@ -758,6 +775,22 @@ server_child_read (t_irc_server *server) { /* connection OK */ case '0': + /* enable SSL if asked */ + if (server->ssl) + { + gnutls_transport_set_ptr (server->gnutls_sess, (gnutls_transport_ptr) server->sock); + if (gnutls_handshake (server->gnutls_sess) < 0) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s gnutls handshake failed\n"), + WEECHAT_ERROR); + server_close_connection (server); + server_reconnect_schedule (server); + return; + } + } + /* kill child and login to server */ server_kill_child (server); irc_login (server); break; @@ -845,17 +878,37 @@ server_connect (t_irc_server *server) { int child_pipe[2], set; pid_t pid; + const int proto_prio[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; + const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 }; irc_display_prefix (server->buffer, PREFIX_INFO); gui_printf (server->buffer, - _("%s: connecting to %s:%d...\n"), - PACKAGE_NAME, server->address, server->port); - wee_log_printf (_("Connecting to server %s:%d...\n"), - server->address, server->port); + _("%s: connecting to %s:%d%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ssl) ? "(ssl)" : ""); + wee_log_printf (_("Connecting to server %s:%d%s...\n"), + server->address, server->port, + (server->ssl) ? "(ssl)" : ""); /* close any opened connection and kill child process if running */ server_close_connection (server); + /* init SSL if asked */ + if (server->ssl) + { + if (gnutls_init (&server->gnutls_sess, GNUTLS_CLIENT) != 0) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s gnutls init error\n"), WEECHAT_ERROR); + return 0; + } + gnutls_set_default_priority (server->gnutls_sess); + gnutls_protocol_set_priority (server->gnutls_sess, proto_prio); + gnutls_kx_set_priority (server->gnutls_sess, kx_prio); + gnutls_credentials_set (server->gnutls_sess, GNUTLS_CRD_ANON, &gnutls_anoncred); + } + /* create pipe for child process */ if (pipe (child_pipe) < 0) { diff --git a/src/irc/irc.h b/src/irc/irc.h index e397937d0..f0a920f5f 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "../gui/gui.h" /* prefixes for chat window */ @@ -137,6 +138,7 @@ struct t_irc_server int command_line; /* server was given on command line */ char *address; /* address of server (IP or name) */ int port; /* port for server (6667 by default) */ + int ssl; /* SSL protocol */ char *password; /* password for server */ char *nick1; /* first nickname for the server */ char *nick2; /* alternate nickname */ @@ -154,6 +156,7 @@ struct t_irc_server int child_read; /* to read into child pipe */ int child_write; /* to write into child pipe */ int sock; /* socket for server */ + gnutls_session gnutls_sess; /* gnutls session (only if SSL is used) */ int is_connected; /* 1 if WeeChat is connected to server */ char *unterminated_message; /* beginning of a message in input buf */ char *nick; /* current nickname */ @@ -249,9 +252,9 @@ extern t_irc_server *server_alloc (); extern void server_destroy (t_irc_server *); extern void server_free (t_irc_server *); extern void server_free_all (); -extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *, +extern t_irc_server *server_new (char *, int, int, int, int, char *, int, int, char *, char *, char *, char *, char *, char *, - int, char *, int, char *); + char *, int, char *, int, char *); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index aa888999d..5386892c6 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -5,6 +5,7 @@ ChangeLog - 2005-06-19 Version 0.1.3 (under dev!): + * SSL support (currently in development, NOT WORKING!) * channel notify levels are saved in config file (new option "server_notify_levels" for server sections) * part message now accepts %v (replaced by WeeChat version), like quit message diff --git a/weechat/po/es.po b/weechat/po/es.po index d99a4143a..e397cde3e 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-19 15:59+0200\n" -"PO-Revision-Date: 2005-06-19 16:08+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" +"PO-Revision-Date: 2005-06-19 22:51+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -20,103 +20,113 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s no ha sido posible crear un nuevo nick\n" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "No ha sido posible obtener el nombre de usuario" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s no ha sido posible crear un nuevo servidor\n" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s error enviando datos al servidor IRC\n" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s memoria insuficiente para un mensaje IRC recibido\n" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s ¡Ha fallado el comando '%s' !\n" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "%s ¡Ningún comando para ejecutar!\n" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "%s Comando desconocido: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" "%s no ha sido posible leer datos del socket, desconectando del servidor...\n" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "%s: Reconexión al servidor en %d segundos\n" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s dirección \"%s\" no encontrada\n" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "%s Dirección IP no encontrada\n" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "%s conexión rechazada\n" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" -msgstr "%s: conectando a %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" +msgstr "%s: conectando a %s:%d%s...\n" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" -msgstr "Conectando al servidor %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" +msgstr "Conectando al servidor %s:%d%s...\n" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexión\n" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "¡Desconectado del servidor!\n" @@ -1251,7 +1261,7 @@ msgstr "no es posible cambiar el modo para el resto de usuarios" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "Servidor: " @@ -1264,10 +1274,12 @@ msgid "not connected" msgstr "no conectado" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "sí" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "no" @@ -1275,7 +1287,7 @@ msgstr "no" msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no será guardado)" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(oculto)" @@ -1300,8 +1312,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -2247,20 +2259,22 @@ msgstr "lista, a #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" "[nombre_de_servidor] | [nombre_de_servidor nombre/IP puerto [-auto | -" -"noauto] [-pwd contraseña] [-nicks alias1 [alias2 [alias3]]] [-username " -"nombre de usuario] [-realname nombre_real] [-command comando] [-autojoin " -"canal[,canal]] ] | [del nombre_de_servidor]" +"noauto] [-ssl] [-pwd contraseña] [-nicks alias1 [alias2 [alias3]]] [-" +"username nombre de usuario] [-realname nombre_real] [-command comando] [-" +"autojoin canal[,canal]] ] | [del nombre_de_servidor]" #: src/common/command.c:91 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2270,6 +2284,7 @@ msgid "" msgstr "" "nombre_de_servidor: nombre del servidor, para uso interno y para mostrar\n" "nombre/IP: nombre o dirección IP del servidor\n" +"ssl: use SSL protocol\n" "puerto: puerto para el servidor (número entero)\n" "contraseña: contraseña para el servidor\n" "alias1: primer alias para el servidor\n" @@ -2278,27 +2293,27 @@ msgstr "" "nombre_de_usuario: nombre de usuario\n" "nombre_real: nombre real del usuario" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "guardar configuración a disco" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "[archivo]" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "archivo: fichero en el que guardar la configuración" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "modificar parámetros de configuración" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "[opción[=valor]]" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" @@ -2306,27 +2321,27 @@ msgstr "" "opción: nombre de una opción\n" "valor: valor para la opción" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "eliminar un alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "alias: nombre del alias a suprimir" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "gestión de ventanas" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2339,29 +2354,29 @@ msgstr "" "splitv: dividir la ventana actual verticalmente\n" "merge: fusionar una ventana con otra" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s ¡el alias o el comando \"%s\" ya existe!\n" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s ¡el alias no puede ejecutar otro alias!\n" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s ¡el comando objetivo \"%s\" no existe!\n" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d " "parámetro%s)\n" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2370,19 +2385,19 @@ msgstr "" "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: " "entre %d y %d parámetro%s)\n" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s el comando \"%s\" ha fallado\n" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d " "parámetro%s)\n" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2391,189 +2406,189 @@ msgstr "" "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: " "entre %d y %d parámetro%s)\n" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s ¡el comando \"%s\" requiere una conexión a servidor!\n" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format 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/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "¡Esta ventana no es un canal!\n" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s faltan argumentos para el comando \"%s\"\n" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" creado\n" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente " "memoria)\n" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "Lista de alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Ningún alias definido.\n" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr " (servidor: " -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "Privado con: " -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "Búfers abiertos:\n" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s número de búfer incorrecto\n" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s no es posible cerrar el único búfer\n" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "Niveles de notificación: " -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s búfer \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s ¡no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexión automática está anulada\n" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "%s scripts registrados:\n" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "Comandos %s :\n" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2582,7 +2597,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2592,32 +2607,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2626,108 +2641,108 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a " "él. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opción de configuración \"%s\" no encontrada\n" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en " "ejecución\n" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opción de configuración encontrada con \"%s\"\n" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -2797,7 +2812,7 @@ msgstr "**** Comienzo del log (registro) " msgid "**** End of log " msgstr "**** Fin del log " -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" @@ -2806,47 +2821,47 @@ msgstr "" "Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n" "\n" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "vacío" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" @@ -2855,7 +2870,7 @@ msgstr "" " . descripción: %s\n" "\n" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" @@ -2863,7 +2878,7 @@ msgstr "" "Además, usted puede definir alias en la sección [alias], añadiendo líneas " "como:\n" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" @@ -2872,65 +2887,65 @@ msgstr "" "donde 'j' es el nombre del alias, y 'join' el comando asociado.\n" "\n" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "%s no es posible crear el servidor ('%s'), ignorado\n" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "%s parámetro desconocido '%s', ignorado\n" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "%s no es posible crear el directorio \"%s\"\n" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "%s no ha sido posible leer el directorio HOME\n" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "%s no hay suficiente memoria para el directorio home\n" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "%s no es posible crear el directorio ~/.weechat\n" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "%s no es posible crear el directorio ~/.weechat/logs\n" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "%sBienvenido a " -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "compilado en" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "Error WeeChat:" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "Advertencia WeeChat:" @@ -3624,37 +3639,41 @@ msgstr "puerto para el servidor IRC" msgid "port for connecting to server" msgstr "puerto para conectarse al servidor" -#: src/common/weeconfig.c:653 +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" +msgstr "" + +#: src/common/weeconfig.c:657 msgid "server password" msgstr "contraseña para el servidor" -#: src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 msgid "password for IRC server" msgstr "contraseña para el servidor IRC" -#: src/common/weeconfig.c:657 +#: src/common/weeconfig.c:661 msgid "nickname for server" msgstr "nombre de usuario para el servidor" -#: src/common/weeconfig.c:658 +#: src/common/weeconfig.c:662 msgid "nickname to use on IRC server" msgstr "nombre de usuario a utilizar en el servidor IRC" -#: src/common/weeconfig.c:661 +#: src/common/weeconfig.c:665 msgid "alternate nickname for server" msgstr "nombre de usuario alternativo para el servidor" -#: src/common/weeconfig.c:662 +#: src/common/weeconfig.c:666 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)" -#: src/common/weeconfig.c:665 +#: src/common/weeconfig.c:669 msgid "2nd alternate nickname for server" msgstr "segundo nombre de usuario alternativo para el servidor" -#: src/common/weeconfig.c:666 +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3662,31 +3681,31 @@ msgstr "" "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el " "nombre de usuario alternativo ya está en uso)" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "nombre de usuario para el servidor" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "nombre de usuario para el servidor IRC" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "nombre real para el servidor" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "nombre real para el servidor IRC" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "primer comando a ejecutar cuando se conecte a un servidor" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "espera (en segundos) después de que el comando sea ejecutado" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3694,86 +3713,86 @@ msgstr "" "espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar " "algo de tiempo para la autenticación)" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "lista de canales a unirse cuando se conecte a un servidor" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" "lista de canales (separados por comas) a unirse cuando se conecte a un " "servidor" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" msgstr "" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, línea %d: el servidor '%s' ya existe\n" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, línea %d: no es posible crear el servidor\n" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s no es posible asignar el color por defecto (\"%s\")\n" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichero de configuración \"%s\" no encontrado.\n" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, línea %d: opción \"%s\" inválida\n" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3782,7 +3801,7 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción '%s'\n" "Esperado: valor booleano: 'off' u 'on'\n" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3791,7 +3810,7 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción %s'\n" "Esperado: entero comprendido entre %d y %d\n" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3800,26 +3819,26 @@ msgstr "" "%s %s, línea %d: valor inválido para la opción '%s'\n" "Esperado: una de estas cadenas: " -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s no es posible crear el fichero \"%s\"\n" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "Creando fichero de configuración por defecto\n" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" @@ -3828,6 +3847,6 @@ msgstr "" "#\n" "# %s: fichero de configuración, creado por %s v%s el %s#\n" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "Guardar configuración a disco\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index e8dd83944..55c9e2f17 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-19 15:59+0200\n" -"PO-Revision-Date: 2005-06-19 16:07+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" +"PO-Revision-Date: 2005-06-19 22:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -20,103 +20,113 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s impossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s erreur d'envoi de données au serveur IRC\n" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s mémoire insuffisante pour un message IRC reçu\n" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "%s Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "%s Commande inconnue: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" "%s impossible de lire des données sur la socket, déconnexion du serveur...\n" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "%s: Reconnexion au serveur dans %d secondes\n" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "%s le handshake gnutls a échoué\n" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "%s connexion refusée\n" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" -msgstr "%s: connexion à %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" +msgstr "%s: connexion à %s:%d%s...\n" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" -msgstr "Connexion au serveur %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" +msgstr "Connexion au serveur %s:%d%s...\n" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "%s erreur d'initialisation gnutls\n" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de créer la socket\n" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" @@ -1252,7 +1262,7 @@ msgstr "impossible de changer le mode pour les autres utilisateurs" msgid "whois (secure connection)" msgstr "qui est (connexion sécurisée)" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "Serveur: " @@ -1265,10 +1275,12 @@ msgid "not connected" msgstr "non connecté" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "oui" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "non" @@ -1276,7 +1288,7 @@ msgstr "non" msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(caché)" @@ -1302,8 +1314,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -2248,11 +2260,12 @@ msgstr "liste, ajoute ou retire des serveurs" #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" -"[nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-pwd " +"[nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ssl] [-pwd " "mot_de_passe] [-nicks pseudo1 [pseudo2 [pseudo3]]] [-username " "nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[," "canal]] ] | [del nom_serveur]" @@ -2262,6 +2275,7 @@ msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2272,6 +2286,7 @@ msgstr "" "nom_serveur: nom du serveur, pour usage interne et affichage\n" "nom/IP: nom ou adresse IP du serveur\n" "port: port pour le serveur (nombre entier)\n" +"ssl: utiliser le protocole SSL\n" "mot_de_passe: mot de passe pour le serveur\n" "pseudo1: premier pseudo pour le serveur\n" "pseudo2: pseudo alternatif pour le serveur\n" @@ -2279,27 +2294,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "[option[=valeur]]" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" @@ -2307,27 +2322,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2339,29 +2354,29 @@ msgstr "" "splitv: éclate la fenêtre en deux verticalement\n" "merge: fusionne la fenêtre avec une autre" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peux pas lancer un autre alias !\n" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s la commande cible \"%s\" n'existe pas !\n" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d " "paramètre%s)\n" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2370,19 +2385,19 @@ msgstr "" "%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre " "%d et %d paramètre%s)\n" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s la commande \"%s\" a échoué\n" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d " "paramètre%s)\n" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2391,190 +2406,190 @@ msgstr "" "%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: " "entre %d et %d paramètre%s)\n" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" "%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr " (serveur: " -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "Privé avec: " -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s impossible de fermer le tampon unique\n" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s impossible de fermer le tampon du serveur tant que des canaux sont " "ouverts\n" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" "%s tampon incorrect pour la notification (doit être un canal ou un privé)\n" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s buffer \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annulée\n" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "Commandes %s :\n" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2583,7 +2598,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2593,31 +2608,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2626,106 +2641,106 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -2793,7 +2808,7 @@ msgstr "**** D msgid "**** End of log " msgstr "**** Fin du log " -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" @@ -2802,47 +2817,47 @@ msgstr "" "Options de configuration de WeeChat (~/.weechat/weechat.rc):\n" "\n" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type booléen (valeurs: 'on' ou 'off')\n" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par défaut: '%s'\n" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr " . valeur par défaut: %d\n" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr " . type chaîne (valeurs: " -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "vide" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr " . type chaîne (toute chaîne)\n" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" @@ -2851,7 +2866,7 @@ msgstr "" " . description: %s\n" "\n" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" @@ -2859,7 +2874,7 @@ msgstr "" "De plus, vous pouvez définir des alias dans la section [alias], en ajoutant " "des lignes comme :\n" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" @@ -2868,65 +2883,65 @@ msgstr "" "où 'j' est le nom de l'alias, et 'join' la commande associée.\n" "\n" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "%s impossible de créer le serveur ('%s'), ignoré\n" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "%s paramètre inconnu '%s', ignoré\n" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "%s impossible de créer le répertoire \"%s\"\n" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "%s impossible de lire le répertoire personnel\n" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "%s pas assez de mémoire pour le répertoire personnel\n" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "%s impossible de créer le répertoire ~/.weechat\n" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "%sBienvenue dans " -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "compilé le" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "Erreur WeeChat:" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "Avertissement WeeChat:" @@ -3620,35 +3635,39 @@ msgstr "port pour le serveur IRC" msgid "port for connecting to server" msgstr "port pour se connecter au serveur" -#: src/common/weeconfig.c:653 +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" +msgstr "utiliser SSL pour la communication avec le serveur" + +#: src/common/weeconfig.c:657 msgid "server password" msgstr "mot de passe pour le serveur" -#: src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 msgid "password for IRC server" msgstr "mot de passe pour le serveur IRC" -#: src/common/weeconfig.c:657 +#: src/common/weeconfig.c:661 msgid "nickname for server" msgstr "pseudo pour le serveur" -#: src/common/weeconfig.c:658 +#: src/common/weeconfig.c:662 msgid "nickname to use on IRC server" msgstr "pseudo à utiliser sur le serveur IRC" -#: src/common/weeconfig.c:661 +#: src/common/weeconfig.c:665 msgid "alternate nickname for server" msgstr "pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:662 +#: src/common/weeconfig.c:666 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é)" -#: src/common/weeconfig.c:665 +#: src/common/weeconfig.c:669 msgid "2nd alternate nickname for server" msgstr "2nd pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:666 +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3656,31 +3675,31 @@ msgstr "" "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà " "utilisé)" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "nom d'utilisateur pour le serveur" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "nom d'utilisateur pour le serveur IRC" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "nom réel pour le serveur" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "nom réel pour le serveur IRC" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "commande à exécuter en premier lorsque connecté au serveur" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "délai (en secondes) après exécution de la commande" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3688,25 +3707,25 @@ msgstr "" "délai (en secondes) après exécution de la commande (exemple: donner du temps " "pour l'authentification)" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "liste des canaux à rejoindre lorsque connecté au serveur" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "niveaux de notification pour les canaux de ce serveur" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" @@ -3714,64 +3733,64 @@ msgstr "" "liste des niveaux de notifications (séparés par des virgules) pour les " "canaux de ce serveur (format: #canal:1,..)" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, ligne %d: impossible de créer le serveur\n" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" "%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s" "\")\n" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3780,7 +3799,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: valeur booléenne: 'off' ou 'on'\n" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3789,7 +3808,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: entier compris entre %d et %d\n" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3798,26 +3817,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "Création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" @@ -3826,6 +3845,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index ff79a356e..0717a9591 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: 2005-06-19 15:59+0200\n" +"POT-Creation-Date: 2005-06-19 22:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,102 +20,112 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 +#: src/irc/irc-server.c:149 src/common/weeconfig.c:1537 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:212 +#: src/irc/irc-server.c:214 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:423 +#: src/irc/irc-server.c:429 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 -#: src/irc/irc-server.c:535 +#: src/irc/irc-server.c:449 src/irc/irc-server.c:462 src/irc/irc-server.c:528 +#: src/irc/irc-server.c:541 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:613 +#: src/irc/irc-server.c:619 #, c-format msgid "%s Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:618 +#: src/irc/irc-server.c:624 #, c-format msgid "%s No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:623 +#: src/irc/irc-server.c:629 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:665 +#: src/irc/irc-server.c:678 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" -#: src/irc/irc-server.c:737 +#: src/irc/irc-server.c:754 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "" -#: src/irc/irc-server.c:768 +#: src/irc/irc-server.c:786 +#, c-format +msgid "%s gnutls handshake failed\n" +msgstr "" + +#: src/irc/irc-server.c:801 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:777 +#: src/irc/irc-server.c:810 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:785 +#: src/irc/irc-server.c:818 #, c-format msgid "%s connection refused\n" msgstr "" -#: src/irc/irc-server.c:851 +#: src/irc/irc-server.c:886 #, c-format -msgid "%s: connecting to %s:%d...\n" +msgid "%s: connecting to %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:853 +#: src/irc/irc-server.c:889 #, c-format -msgid "Connecting to server %s:%d...\n" +msgid "Connecting to server %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:864 +#: src/irc/irc-server.c:903 +#, c-format +msgid "%s gnutls init error\n" +msgstr "" + +#: src/irc/irc-server.c:917 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:876 +#: src/irc/irc-server.c:929 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:888 +#: src/irc/irc-server.c:941 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:899 +#: src/irc/irc-server.c:952 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:930 +#: src/irc/irc-server.c:983 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 +#: src/irc/irc-server.c:1032 src/irc/irc-server.c:1041 msgid "Disconnected from server!\n" msgstr "" @@ -1146,7 +1156,7 @@ msgstr "" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:154 src/common/command.c:840 +#: src/irc/irc-display.c:154 src/common/command.c:841 msgid "Server: " msgstr "" @@ -1159,10 +1169,12 @@ msgid "not connected" msgstr "" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "yes" msgstr "" #: src/irc/irc-display.c:163 src/irc/irc-display.c:168 +#: src/irc/irc-display.c:180 msgid "no" msgstr "" @@ -1170,7 +1182,7 @@ msgstr "" msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:181 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "" @@ -1194,8 +1206,8 @@ msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 #: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 -#: src/common/command.c:1165 src/common/command.c:1449 -#: src/common/command.c:1592 +#: src/common/command.c:1166 src/common/command.c:1450 +#: src/common/command.c:1593 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -2100,9 +2112,10 @@ msgstr "" #: src/common/command.c:86 msgid "" -"[servername] | [servername hostname port [-auto | -noauto] [-pwd password] [-" -"nicks nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-" -"command command] [-autojoin channel[,channel]] ] | [del servername]" +"[servername] | [servername hostname port [-auto | -noauto] [-ssl] [-pwd " +"password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname " +"realname] [-command command] [-autojoin channel[,channel]] ] | [del " +"servername]" msgstr "" #: src/common/command.c:91 @@ -2110,6 +2123,7 @@ msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" +"ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -2118,53 +2132,53 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:101 +#: src/common/command.c:102 msgid "save config to disk" msgstr "" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "[file]" msgstr "" -#: src/common/command.c:102 +#: src/common/command.c:103 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:104 +#: src/common/command.c:105 msgid "set config parameters" msgstr "" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "[option[=value]]" msgstr "" -#: src/common/command.c:105 +#: src/common/command.c:106 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:107 +#: src/common/command.c:108 msgid "remove an alias" msgstr "" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name" msgstr "" -#: src/common/command.c:108 +#: src/common/command.c:109 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:110 +#: src/common/command.c:111 msgid "manage windows" msgstr "" -#: src/common/command.c:111 +#: src/common/command.c:112 msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]" msgstr "" -#: src/common/command.c:113 +#: src/common/command.c:114 msgid "" "list: list opened windows (no parameter implies this list)\n" "splith: split current window horizontally\n" @@ -2172,373 +2186,373 @@ msgid "" "merge: merge window with another" msgstr "" -#: src/common/command.c:259 +#: src/common/command.c:260 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:269 +#: src/common/command.c:270 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:276 +#: src/common/command.c:277 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:484 +#: src/common/command.c:485 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:496 +#: src/common/command.c:497 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:518 src/common/command.c:588 +#: src/common/command.c:519 src/common/command.c:589 #, c-format msgid "%s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:546 +#: src/common/command.c:547 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:558 +#: src/common/command.c:559 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:573 +#: src/common/command.c:574 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:637 +#: src/common/command.c:638 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:718 +#: src/common/command.c:719 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:740 +#: src/common/command.c:741 #, c-format msgid "%s unable to call handler for message (not enough memory)\n" msgstr "" -#: src/common/command.c:748 +#: src/common/command.c:749 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:776 src/common/command.c:800 src/common/command.c:904 +#: src/common/command.c:777 src/common/command.c:801 src/common/command.c:905 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:785 +#: src/common/command.c:786 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:791 +#: src/common/command.c:792 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" -#: src/common/command.c:811 +#: src/common/command.c:812 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:846 +#: src/common/command.c:847 msgid "Channel: " msgstr "" -#: src/common/command.c:849 src/common/command.c:859 +#: src/common/command.c:850 src/common/command.c:860 msgid " (server: " msgstr "" -#: src/common/command.c:856 +#: src/common/command.c:857 msgid "Private with: " msgstr "" -#: src/common/command.c:884 +#: src/common/command.c:885 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:927 src/common/command.c:1067 +#: src/common/command.c:928 src/common/command.c:1068 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:941 +#: src/common/command.c:942 #, c-format msgid "%s can not close the single buffer\n" msgstr "" -#: src/common/command.c:951 +#: src/common/command.c:952 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" -#: src/common/command.c:990 +#: src/common/command.c:991 msgid "Notify levels: " msgstr "" -#: src/common/command.c:1018 src/common/command.c:1040 +#: src/common/command.c:1019 src/common/command.c:1041 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "" -#: src/common/command.c:1027 +#: src/common/command.c:1028 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1058 +#: src/common/command.c:1059 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1092 +#: src/common/command.c:1093 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1122 +#: src/common/command.c:1123 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1130 +#: src/common/command.c:1131 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1148 src/common/command.c:1223 +#: src/common/command.c:1149 src/common/command.c:1224 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1178 src/common/command.c:1442 -#: src/common/command.c:1585 src/common/command.c:2276 -#: src/common/command.c:2288 +#: src/common/command.c:1179 src/common/command.c:1443 +#: src/common/command.c:1586 src/common/command.c:2280 +#: src/common/command.c:2292 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1207 +#: src/common/command.c:1208 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1215 +#: src/common/command.c:1216 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1241 src/common/weechat.c:265 +#: src/common/command.c:1242 src/common/weechat.c:268 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1250 src/common/weechat.c:285 +#: src/common/command.c:1251 src/common/weechat.c:288 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1317 +#: src/common/command.c:1318 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1341 src/common/command.c:1484 +#: src/common/command.c:1342 src/common/command.c:1485 #, c-format msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1358 src/common/command.c:1381 -#: src/common/command.c:1404 src/common/command.c:1501 -#: src/common/command.c:1524 src/common/command.c:1547 +#: src/common/command.c:1359 src/common/command.c:1382 +#: src/common/command.c:1405 src/common/command.c:1502 +#: src/common/command.c:1525 src/common/command.c:1548 msgid " (none)\n" msgstr "" -#: src/common/command.c:1363 src/common/command.c:1506 +#: src/common/command.c:1364 src/common/command.c:1507 #, c-format msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1372 src/common/command.c:1515 +#: src/common/command.c:1373 src/common/command.c:1516 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1386 src/common/command.c:1529 +#: src/common/command.c:1387 src/common/command.c:1530 #, c-format msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1395 src/common/command.c:1538 +#: src/common/command.c:1396 src/common/command.c:1539 #, c-format msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1455 +#: src/common/command.c:1456 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1598 +#: src/common/command.c:1599 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1646 +#: src/common/command.c:1647 msgid "No server.\n" msgstr "" -#: src/common/command.c:1657 +#: src/common/command.c:1658 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1669 +#: src/common/command.c:1670 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1677 +#: src/common/command.c:1678 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1696 +#: src/common/command.c:1697 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1704 +#: src/common/command.c:1705 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:1720 src/common/command.c:1861 +#: src/common/command.c:1721 src/common/command.c:1865 msgid "Server" msgstr "" -#: src/common/command.c:1723 +#: src/common/command.c:1724 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1738 +#: src/common/command.c:1739 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1748 +#: src/common/command.c:1749 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1773 src/common/command.c:1801 -#: src/common/command.c:1814 src/common/command.c:1840 +#: src/common/command.c:1776 src/common/command.c:1804 +#: src/common/command.c:1817 src/common/command.c:1843 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1786 +#: src/common/command.c:1789 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1827 +#: src/common/command.c:1830 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1864 +#: src/common/command.c:1868 msgid "created\n" msgstr "" -#: src/common/command.c:1870 +#: src/common/command.c:1874 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1925 +#: src/common/command.c:1929 msgid "(unknown)" msgstr "" -#: src/common/command.c:1948 +#: src/common/command.c:1952 msgid "(password hidden) " msgstr "" -#: src/common/command.c:2012 +#: src/common/command.c:2016 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2043 src/common/command.c:2089 +#: src/common/command.c:2047 src/common/command.c:2093 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2048 src/common/command.c:2081 +#: src/common/command.c:2052 src/common/command.c:2085 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2064 +#: src/common/command.c:2068 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2162 +#: src/common/command.c:2166 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2165 +#: src/common/command.c:2169 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2171 +#: src/common/command.c:2175 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2174 +#: src/common/command.c:2178 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2194 +#: src/common/command.c:2198 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2204 +#: src/common/command.c:2208 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2224 +#: src/common/command.c:2228 msgid "Opened windows:\n" msgstr "" @@ -2606,132 +2620,132 @@ msgstr "" msgid "**** End of log " msgstr "" -#: src/common/weechat.c:190 +#: src/common/weechat.c:193 #, c-format msgid "" "WeeChat configuration options (~/.weechat/weechat.rc):\n" "\n" msgstr "" -#: src/common/weechat.c:203 +#: src/common/weechat.c:206 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/weechat.c:204 src/common/weechat.c:227 src/common/weechat.c:233 -#: src/common/weechat.c:239 +#: src/common/weechat.c:207 src/common/weechat.c:230 src/common/weechat.c:236 +#: src/common/weechat.c:242 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/weechat.c:209 +#: src/common/weechat.c:212 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/weechat.c:212 +#: src/common/weechat.c:215 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/weechat.c:216 +#: src/common/weechat.c:219 #, c-format msgid " . type string (values: " msgstr "" -#: src/common/weechat.c:229 src/common/weechat.c:235 src/common/weechat.c:241 +#: src/common/weechat.c:232 src/common/weechat.c:238 src/common/weechat.c:244 msgid "empty" msgstr "" -#: src/common/weechat.c:232 +#: src/common/weechat.c:235 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/weechat.c:238 +#: src/common/weechat.c:241 #, c-format msgid " . type string (any string)\n" msgstr "" -#: src/common/weechat.c:244 +#: src/common/weechat.c:247 #, c-format msgid "" " . description: %s\n" "\n" msgstr "" -#: src/common/weechat.c:250 +#: src/common/weechat.c:253 #, c-format msgid "" "Moreover, you can define aliases in [alias] section, by adding lines like:\n" msgstr "" -#: src/common/weechat.c:252 +#: src/common/weechat.c:255 #, c-format msgid "" "where 'j' is alias name, and 'join' associated command.\n" "\n" msgstr "" -#: src/common/weechat.c:363 +#: src/common/weechat.c:366 #, c-format msgid "%s invalid syntax for IRC server ('%s'), ignored\n" msgstr "" -#: src/common/weechat.c:375 +#: src/common/weechat.c:378 #, c-format msgid "%s unable to create server ('%s'), ignored\n" msgstr "" -#: src/common/weechat.c:384 +#: src/common/weechat.c:387 #, c-format msgid "%s unknown parameter '%s', ignored\n" msgstr "" -#: src/common/weechat.c:404 +#: src/common/weechat.c:407 #, c-format msgid "%s cannot create directory \"%s\"\n" msgstr "" -#: src/common/weechat.c:430 +#: src/common/weechat.c:433 #, c-format msgid "%s unable to get HOME directory\n" msgstr "" -#: src/common/weechat.c:439 +#: src/common/weechat.c:442 #, c-format msgid "%s not enough memory for home directory\n" msgstr "" -#: src/common/weechat.c:449 +#: src/common/weechat.c:452 #, c-format msgid "%s unable to create ~/.weechat directory\n" msgstr "" -#: src/common/weechat.c:501 +#: src/common/weechat.c:504 #, c-format msgid "%s unable to create ~/.weechat/logs directory\n" msgstr "" -#: src/common/weechat.c:537 +#: src/common/weechat.c:544 #, c-format msgid "%s unable to create/append to log file (~/.weechat/%s)" msgstr "" -#: src/common/weechat.c:560 +#: src/common/weechat.c:567 #, c-format msgid "%sWelcome to " msgstr "" -#: src/common/weechat.c:573 src/common/weechat.c:582 +#: src/common/weechat.c:580 src/common/weechat.c:589 msgid "compiled on" msgstr "" -#: src/common/weechat.h:54 +#: src/common/weechat.h:55 msgid "WeeChat Error:" msgstr "" -#: src/common/weechat.h:55 +#: src/common/weechat.h:56 msgid "WeeChat Warning:" msgstr "" @@ -3380,194 +3394,198 @@ msgstr "" msgid "port for connecting to server" msgstr "" -#: src/common/weeconfig.c:653 -msgid "server password" -msgstr "" - -#: src/common/weeconfig.c:654 -msgid "password for IRC server" +#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +msgid "use SSL for server communication" msgstr "" #: src/common/weeconfig.c:657 -msgid "nickname for server" +msgid "server password" msgstr "" #: src/common/weeconfig.c:658 -msgid "nickname to use on IRC server" +msgid "password for IRC server" msgstr "" #: src/common/weeconfig.c:661 -msgid "alternate nickname for server" +msgid "nickname for server" msgstr "" #: src/common/weeconfig.c:662 -msgid "alternate nickname to use on IRC server (if nickname is already used)" +msgid "nickname to use on IRC server" msgstr "" #: src/common/weeconfig.c:665 -msgid "2nd alternate nickname for server" +msgid "alternate nickname for server" msgstr "" #: src/common/weeconfig.c:666 +msgid "alternate nickname to use on IRC server (if nickname is already used)" +msgstr "" + +#: src/common/weeconfig.c:669 +msgid "2nd alternate nickname for server" +msgstr "" + +#: src/common/weeconfig.c:670 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" msgstr "" -#: src/common/weeconfig.c:669 +#: src/common/weeconfig.c:673 msgid "user name for server" msgstr "" -#: src/common/weeconfig.c:670 +#: src/common/weeconfig.c:674 msgid "user name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:673 +#: src/common/weeconfig.c:677 msgid "real name for server" msgstr "" -#: src/common/weeconfig.c:674 +#: src/common/weeconfig.c:678 msgid "real name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:677 src/common/weeconfig.c:678 +#: src/common/weeconfig.c:681 src/common/weeconfig.c:682 msgid "first command to run when connected to server" msgstr "" -#: src/common/weeconfig.c:681 +#: src/common/weeconfig.c:685 msgid "delay (in seconds) after command was executed" msgstr "" -#: src/common/weeconfig.c:682 +#: src/common/weeconfig.c:686 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" msgstr "" -#: src/common/weeconfig.c:685 +#: src/common/weeconfig.c:689 msgid "list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:686 +#: src/common/weeconfig.c:690 msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:689 src/common/weeconfig.c:690 +#: src/common/weeconfig.c:693 src/common/weeconfig.c:694 msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:693 +#: src/common/weeconfig.c:697 msgid "notify levels for channels of this server" msgstr "" -#: src/common/weeconfig.c:694 +#: src/common/weeconfig.c:698 msgid "" "comma separated list of notify levels for channels of this server (format: " "#channel:1,..)" msgstr "" -#: src/common/weeconfig.c:1082 +#: src/common/weeconfig.c:1088 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1091 +#: src/common/weeconfig.c:1097 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1105 +#: src/common/weeconfig.c:1111 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1144 +#: src/common/weeconfig.c:1150 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1155 +#: src/common/weeconfig.c:1161 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1194 +#: src/common/weeconfig.c:1200 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1226 +#: src/common/weeconfig.c:1232 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1249 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1261 +#: src/common/weeconfig.c:1267 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1269 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1303 +#: src/common/weeconfig.c:1309 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1314 +#: src/common/weeconfig.c:1320 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1323 +#: src/common/weeconfig.c:1329 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: integer between %d and %d\n" msgstr "" -#: src/common/weeconfig.c:1334 +#: src/common/weeconfig.c:1340 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1350 +#: src/common/weeconfig.c:1356 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 +#: src/common/weeconfig.c:1416 src/common/weeconfig.c:1589 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1416 +#: src/common/weeconfig.c:1422 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1417 +#: src/common/weeconfig.c:1423 msgid "Creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 +#: src/common/weeconfig.c:1426 src/common/weeconfig.c:1598 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1589 +#: src/common/weeconfig.c:1595 msgid "Saving config to disk\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index fa8d4bdcd..6297f28e4 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -84,13 +84,14 @@ t_weechat_command weechat_commands[] = 0, 2, weechat_cmd_python, NULL }, { "server", N_("list, add or remove servers"), N_("[servername] | " - "[servername hostname port [-auto | -noauto] [-pwd password] [-nicks nick1 " + "[servername hostname port [-auto | -noauto] [-ssl] [-pwd password] [-nicks nick1 " "[nick2 [nick3]]] [-username username] [-realname realname] " "[-command command] [-autojoin channel[,channel]] ] | " "[del servername]"), N_("servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" "port: port for server (integer)\n" + "ssl: use SSL protocol\n" "password: password for server\n" "nick1: first nick for server\n" "nick2: alternate nick for server\n" @@ -1764,6 +1765,8 @@ weechat_cmd_server (int argc, char **argv) server.autoconnect = 1; if (strcasecmp (argv[i], "-noauto") == 0) server.autoconnect = 0; + if (strcasecmp (argv[i], "-ssl") == 0) + server.ssl = 1; if (strcasecmp (argv[i], "-pwd") == 0) { if (i == (argc - 1)) @@ -1851,7 +1854,8 @@ weechat_cmd_server (int argc, char **argv) new_server = server_new (server.name, server.autoconnect, server.autoreconnect, server.autoreconnect_delay, - 0, server.address, server.port, server.password, + 0, server.address, server.port, server.ssl, + server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, server.command, 1, server.autojoin, 1, NULL); diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c index 3b20f3d5a..b208d56ea 100644 --- a/weechat/src/common/weechat.c +++ b/weechat/src/common/weechat.c @@ -47,6 +47,7 @@ #include #include #include +#include #ifdef HAVE_ICONV #include @@ -70,9 +71,11 @@ int sigsegv = 0; /* SIGSEGV received? char *weechat_home = NULL; /* WeeChat home dir. (example: /home/toto/.weechat) */ FILE *weechat_log_file = NULL; /* WeeChat log file (~/.weechat/weechat.log) */ -char *local_charset = NULL; /* local charset, for example: ISO-8859-1 */ +char *local_charset = NULL; /* local charset, for example: ISO-8859-1 */ -int server_cmd_line; /* at least one server on WeeChat command line */ +int server_cmd_line; /* at least one server on WeeChat command line */ + +gnutls_anon_client_credentials gnutls_anoncred; /* gnutls client credentials */ /* @@ -368,7 +371,7 @@ wee_parse_args (int argc, char *argv[]) if (!server_new (server_tmp.name, server_tmp.autoconnect, server_tmp.autoreconnect, server_tmp.autoreconnect_delay, - 1, server_tmp.address, server_tmp.port, + 1, server_tmp.address, server_tmp.port, 0, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL)) @@ -516,6 +519,10 @@ wee_init_vars () /* init received messages queue */ recv_msgq = NULL; msgq_last_msg = NULL; + + /* init gnutls */ + gnutls_global_init (); + gnutls_anon_allocate_client_credentials (&gnutls_anoncred); } /* @@ -609,6 +616,8 @@ wee_shutdown (int return_code) if (local_charset) free (local_charset); alias_free_all (); + gnutls_anon_free_client_credentials (gnutls_anoncred); + gnutls_global_deinit(); exit (return_code); } diff --git a/weechat/src/common/weechat.h b/weechat/src/common/weechat.h index 6b40fe965..77ff134ba 100644 --- a/weechat/src/common/weechat.h +++ b/weechat/src/common/weechat.h @@ -27,6 +27,7 @@ #include #include +#include #if defined(ENABLE_NLS) && !defined(_) #include @@ -107,6 +108,7 @@ extern int quit_weechat; extern char *weechat_home; extern char *local_charset; +extern gnutls_anon_client_credentials gnutls_anoncred; extern void wee_log_printf (char *, ...); extern void wee_dump (int); diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index c51f29332..eb94abe1d 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -650,6 +650,10 @@ t_config_option weechat_options_server[] = N_("port for connecting to server"), OPTION_TYPE_INT, 0, 65535, 6667, NULL, NULL, &(cfg_server.port), NULL, NULL }, + { "server_ssl", N_("use SSL for server communication"), + N_("use SSL for server communication"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, + NULL, NULL, &(cfg_server.ssl), NULL, NULL }, { "server_password", N_("server password"), N_("password for IRC server"), OPTION_TYPE_STRING, 0, 0, 0, @@ -920,6 +924,8 @@ config_get_server_option_ptr (t_irc_server *server, char *option_name) return (void *)(&server->address); if (strcasecmp (option_name, "server_port") == 0) return (void *)(&server->port); + if (strcasecmp (option_name, "server_ssl") == 0) + return (void *)(&server->ssl); if (strcasecmp (option_name, "server_password") == 0) return (void *)(&server->password); if (strcasecmp (option_name, "server_nick1") == 0) @@ -1095,7 +1101,7 @@ config_allocate_server (char *filename, int line_number) if (!server_new (cfg_server.name, cfg_server.autoconnect, cfg_server.autoreconnect, cfg_server.autoreconnect_delay, 0, cfg_server.address, cfg_server.port, - cfg_server.password, cfg_server.nick1, cfg_server.nick2, + cfg_server.ssl, cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, cfg_server.command, cfg_server.command_delay, cfg_server.autojoin, cfg_server.autorejoin, cfg_server.notify_levels)) @@ -1672,6 +1678,8 @@ config_write (char *config_name) ptr_server->autoreconnect_delay); fprintf (file, "server_address=%s\n", ptr_server->address); fprintf (file, "server_port=%d\n", ptr_server->port); + fprintf (file, "server_ssl=%s\n", + (ptr_server->ssl) ? "on" : "off"); fprintf (file, "server_password=%s\n", (ptr_server->password) ? ptr_server->password : ""); fprintf (file, "server_nick1=%s\n", ptr_server->nick1); diff --git a/weechat/src/gui/curses/Makefile.am b/weechat/src/gui/curses/Makefile.am index 2f885de8f..7f8c0b001 100644 --- a/weechat/src/gui/curses/Makefile.am +++ b/weechat/src/gui/curses/Makefile.am @@ -23,7 +23,8 @@ weechat_curses_LDADD = ../lib_weechat_gui_common.a \ ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ $(NCURSES_LIBS) \ - ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) + ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) \ + -lgnutls weechat_curses_SOURCES = gui-display.c \ gui-input.c diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index 1fd1e045c..ab7276d45 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -175,6 +175,9 @@ irc_display_server (t_irc_server *server) gui_printf_color (NULL, COLOR_WIN_CHAT, " server_port . . . . . . .: %d\n", server->port); + gui_printf_color (NULL, COLOR_WIN_CHAT, + " server_ssl . . . . . . . .: %s\n", + (server->ssl) ? _("yes") : _("no")); gui_printf_color (NULL, COLOR_WIN_CHAT, " server_password . . . . .: %s\n", (server->password && server->password[0]) ? diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index e1cbf5453..3497a724c 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* irc-server.c: (dis)connection and communication with irc server */ +/* irc-server.c: connection and communication with IRC server */ #ifdef HAVE_CONFIG_H @@ -38,6 +38,7 @@ #include #include #include +#include #include "../common/weechat.h" #include "irc.h" @@ -67,6 +68,7 @@ server_init (t_irc_server *server) server->command_line = 0; server->address = NULL; server->port = -1; + server->ssl = 0; server->password = NULL; server->nick1 = NULL; server->nick2 = NULL; @@ -317,7 +319,7 @@ server_free_all () t_irc_server * server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_delay, - int command_line, char *address, int port, char *password, + int command_line, char *address, int port, int ssl, char *password, char *nick1, char *nick2, char *nick3, char *username, char *realname, char *command, int command_delay, char *autojoin, int autorejoin, char *notify_levels) @@ -347,6 +349,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de new_server->command_line = command_line; new_server->address = strdup (address); new_server->port = port; + 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"); @@ -371,7 +374,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de } /* - * server_send: send data to irc server + * server_send: send data to IRC server */ int @@ -380,11 +383,14 @@ server_send (t_irc_server *server, char *buffer, int size_buf) if (!server) return -1; - return send (server->sock, buffer, size_buf, 0); + if (server->ssl) + return gnutls_record_send (server->gnutls_sess, buffer, size_buf); + else + return send (server->sock, buffer, size_buf, 0); } /* - * server_sendf: send formatted data to irc server + * server_sendf: send formatted data to IRC server */ void @@ -651,7 +657,14 @@ server_recv (t_irc_server *server) static char buffer[4096 + 2]; int num_read; - num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0); + if (!server) + return; + + if (server->ssl) + num_read = gnutls_record_recv (server->gnutls_sess, buffer, sizeof (buffer) - 2); + else + num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0); + if (num_read > 0) { buffer[num_read] = '\0'; @@ -708,8 +721,12 @@ server_close_connection (t_irc_server *server) /* close network socket */ if (server->sock != -1) { + if (server->ssl) + gnutls_bye (server->gnutls_sess, GNUTLS_SHUT_RDWR); close (server->sock); server->sock = -1; + if (server->ssl) + gnutls_deinit (server->gnutls_sess); } /* free any pending message */ @@ -758,6 +775,22 @@ server_child_read (t_irc_server *server) { /* connection OK */ case '0': + /* enable SSL if asked */ + if (server->ssl) + { + gnutls_transport_set_ptr (server->gnutls_sess, (gnutls_transport_ptr) server->sock); + if (gnutls_handshake (server->gnutls_sess) < 0) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s gnutls handshake failed\n"), + WEECHAT_ERROR); + server_close_connection (server); + server_reconnect_schedule (server); + return; + } + } + /* kill child and login to server */ server_kill_child (server); irc_login (server); break; @@ -845,17 +878,37 @@ server_connect (t_irc_server *server) { int child_pipe[2], set; pid_t pid; + const int proto_prio[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; + const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 }; irc_display_prefix (server->buffer, PREFIX_INFO); gui_printf (server->buffer, - _("%s: connecting to %s:%d...\n"), - PACKAGE_NAME, server->address, server->port); - wee_log_printf (_("Connecting to server %s:%d...\n"), - server->address, server->port); + _("%s: connecting to %s:%d%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ssl) ? "(ssl)" : ""); + wee_log_printf (_("Connecting to server %s:%d%s...\n"), + server->address, server->port, + (server->ssl) ? "(ssl)" : ""); /* close any opened connection and kill child process if running */ server_close_connection (server); + /* init SSL if asked */ + if (server->ssl) + { + if (gnutls_init (&server->gnutls_sess, GNUTLS_CLIENT) != 0) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s gnutls init error\n"), WEECHAT_ERROR); + return 0; + } + gnutls_set_default_priority (server->gnutls_sess); + gnutls_protocol_set_priority (server->gnutls_sess, proto_prio); + gnutls_kx_set_priority (server->gnutls_sess, kx_prio); + gnutls_credentials_set (server->gnutls_sess, GNUTLS_CRD_ANON, &gnutls_anoncred); + } + /* create pipe for child process */ if (pipe (child_pipe) < 0) { diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index e397937d0..f0a920f5f 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "../gui/gui.h" /* prefixes for chat window */ @@ -137,6 +138,7 @@ struct t_irc_server int command_line; /* server was given on command line */ char *address; /* address of server (IP or name) */ int port; /* port for server (6667 by default) */ + int ssl; /* SSL protocol */ char *password; /* password for server */ char *nick1; /* first nickname for the server */ char *nick2; /* alternate nickname */ @@ -154,6 +156,7 @@ struct t_irc_server int child_read; /* to read into child pipe */ int child_write; /* to write into child pipe */ int sock; /* socket for server */ + gnutls_session gnutls_sess; /* gnutls session (only if SSL is used) */ int is_connected; /* 1 if WeeChat is connected to server */ char *unterminated_message; /* beginning of a message in input buf */ char *nick; /* current nickname */ @@ -249,9 +252,9 @@ extern t_irc_server *server_alloc (); extern void server_destroy (t_irc_server *); extern void server_free (t_irc_server *); extern void server_free_all (); -extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *, +extern t_irc_server *server_new (char *, int, int, int, int, char *, int, int, char *, char *, char *, char *, char *, char *, - int, char *, int, char *); + char *, int, char *, int, char *); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *);