1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-04 00:33:13 +02:00

Compare commits

...

11 Commits

Author SHA1 Message Date
Sebastien Helleu 6dacffe946 Version 0.2.3 2007-01-10 18:12:53 +00:00
Sebastien Helleu 3409d9a7e7 Fixed display bugs with nicklist at top/bottom when look_nicklist_separator is OFF (bug #18737) 2007-01-09 21:15:02 +00:00
Sebastien Helleu c14e090638 Fixed bug in topic display 2007-01-08 16:28:06 +00:00
Sebastien Helleu 1b348cf8ad Fixed again iconv 2007-01-08 16:10:02 +00:00
Sebastien Helleu 66161f5249 Fixed iconv problem, causing truncated words when using iso locale 2007-01-08 15:43:21 +00:00
Sebastien Helleu a1bbfb0129 Fixed topic scroll when topic has multi-bytes chars 2007-01-07 18:38:39 +00:00
Sebastien Helleu 428127cb71 Fixed typo in doc 2007-01-07 15:31:49 +00:00
Sebastien Helleu 029e539aba Fixed display bug in nicklist with cyrillic nick names 2007-01-07 10:06:58 +00:00
Sebastien Helleu 53acc07eb1 Fixed compilation problem with iconv under FreeBSD 2007-01-06 23:57:59 +00:00
Sebastien Helleu bbe2f9093c Fixed bugs with charset: now decodes/encodes nicks and channels in IRC messages (bug #18716) 2007-01-06 22:24:54 +00:00
Sebastien Helleu 09efc5333f Version 0.2.3-cvs 2007-01-06 00:33:42 +00:00
42 changed files with 696 additions and 616 deletions
+10 -1
View File
@@ -1,9 +1,18 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
ChangeLog - 2007-01-06 ChangeLog - 2007-01-10
Version 0.2.3 (2007-01-10):
* fixed display bugs with nicklist at top/bottom when look_nicklist_separator
is OFF (bug #18737)
* fixed iconv problem, causing truncated words when using iso locale
* fixed topic scroll when topic has multi-bytes chars
* fixed compilation problem with iconv under FreeBSD
* fixed bugs with charset: now decodes/encodes nicks and channels in IRC
messages (bug #18716)
Version 0.2.2 (2007-01-06): Version 0.2.2 (2007-01-06):
* fixed bug with status bar (missing refresh) when closing a buffer * fixed bug with status bar (missing refresh) when closing a buffer
* fixed bug with use of first buffer for a channel if not connected * fixed bug with use of first buffer for a channel if not connected
+7
View File
@@ -1,6 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
* FlashCode, 2007-01-10
WeeChat 0.2.3 released.
This version fixes several major bugs of version 0.2.2.
All users of version 0.2.2 should upgrade to this version.
* FlashCode, 2007-01-06 * FlashCode, 2007-01-06
WeeChat 0.2.2 released. WeeChat 0.2.2 released.
+2 -2
View File
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56) AC_PREREQ(2.56)
AC_INIT(WeeChat, 0.2.2, flashcode@flashtux.org) AC_INIT(WeeChat, 0.2.3, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c]) AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([weechat], [0.2.2]) AM_INIT_AUTOMAKE([weechat], [0.2.3])
# Checks for programs # Checks for programs
AC_PROG_CC AC_PROG_CC
+2 -2
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - User guide</title> <title>WeeChat 0.2.3 - User guide</title>
<subtitle>Schneller, leichter und erweiterbarer IRC Client</subtitle> <subtitle>Schneller, leichter und erweiterbarer IRC Client</subtitle>
<author> <author>
@@ -705,7 +705,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<row> <row>
<entry>Alt + J dann Alt + X</entry> <entry>Alt + J dann Alt + X</entry>
<entry> <entry>
Schalte in den ersten Channel des nächsten Puffers Schalte in den ersten Channel des nächsten Servers
(oder in den Server-Puffer wenn keine Channel offen ist) (oder in den Server-Puffer wenn keine Channel offen ist)
</entry> </entry>
</row> </row>
+2 -2
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - User guide</title> <title>WeeChat 0.2.3 - User guide</title>
<subtitle>Fast, light and extensible IRC client</subtitle> <subtitle>Fast, light and extensible IRC client</subtitle>
<author> <author>
@@ -701,7 +701,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<row> <row>
<entry>Alt + J then Alt + X</entry> <entry>Alt + J then Alt + X</entry>
<entry> <entry>
Switch to first channel of next buffer Switch to first channel of next server
(or server buffer if no channel is opened) (or server buffer if no channel is opened)
</entry> </entry>
</row> </row>
+1 -1
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - Guide utilisateur</title> <title>WeeChat 0.2.3 - Guide utilisateur</title>
<subtitle>Client IRC rapide, léger et extensible</subtitle> <subtitle>Client IRC rapide, léger et extensible</subtitle>
<author> <author>
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 22:32+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1339,38 +1339,38 @@ msgstr "nemůžu změnit mód přo ostatní uživatele"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (zabezpečená část)" msgstr "whois (zabezpečená část)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "připojen" msgstr "připojen"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nepřipojen" msgstr "nepřipojen"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "na" msgstr "na"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "off" msgstr "off"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)" msgstr " (dočasný server, nebude uložen)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "sekund" msgstr "sekund"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(skrytý)" msgstr "(skrytý)"
@@ -2235,51 +2235,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n" msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "bajtů" msgstr "bajtů"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Akceptovat" msgstr " [A] Akceptovat"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Storno" msgstr " [C] Storno"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Odebrat" msgstr " [R] Odebrat"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC" msgstr " [P] Pročistit staré DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled" msgstr " [Q] Zavřít DCC pohled"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Vyčistit buffer" msgstr " [C] Vyčistit buffer"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data" msgstr " [Q] Zavřít čistý pohled na data"
+25 -25
View File
@@ -7,10 +7,10 @@
# Thomas Schuetz <i18n@internet-villa.de>, 2006. # Thomas Schuetz <i18n@internet-villa.de>, 2006.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n" "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n" "Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1339,38 +1339,38 @@ msgstr "Modes anderer User können nicht geändert werden"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (sichere Verbindung)" msgstr "whois (sichere Verbindung)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "verbunden" msgstr "verbunden"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nicht verbunden" msgstr "nicht verbunden"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "an" msgstr "an"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "aus" msgstr "aus"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)" msgstr " (temporärer Server, wird nicht gespeichert)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "Sekunden" msgstr "Sekunden"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(versteckt)" msgstr "(versteckt)"
@@ -2243,51 +2243,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n" msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "Bytes" msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] annehmen" msgstr " [A] annehmen"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] abbrechen" msgstr " [C] abbrechen"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] entfernen" msgstr " [R] entfernen"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen" msgstr " [P] alte DCCs entfernen"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen" msgstr " [Q] DCC-Ansicht schließen"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Puffer löschen" msgstr " [C] Puffer löschen"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen" msgstr " [Q] Rohdatenansicht schließen"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Weechat 0.2.2\n" "Project-Id-Version: Weechat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1357,38 +1357,38 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "quién es (conexión segura)" msgstr "quién es (conexión segura)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServidor:%s%s %s[%s%s%s]\n" msgstr "%sServidor:%s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "conectado" msgstr "conectado"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "no conectado" msgstr "no conectado"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "activo" msgstr "activo"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "inactivo" msgstr "inactivo"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no será guardado)" msgstr " (servidor temporal, no será guardado)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "segundos" msgstr "segundos"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(oculto)" msgstr "(oculto)"
@@ -2271,52 +2271,52 @@ msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "" msgstr ""
"%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n" "%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "bytes" msgstr "bytes"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "Tiempo estimado de llegada" msgstr "Tiempo estimado de llegada"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Aceptar" msgstr " [A] Aceptar"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Cancelar" msgstr " [C] Cancelar"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Eliminar" msgstr " [R] Eliminar"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC" msgstr " [P] Purgar los viejos DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC" msgstr " [Q] Cerrar la vista DCC"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
#, fuzzy #, fuzzy
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr "saltar al búfer DCC" msgstr "saltar al búfer DCC"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura" msgstr " [Q] Cerrar vista de datos basura"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1345,38 +1345,38 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (connexion sécurisée)" msgstr "whois (connexion sécurisée)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServeur: %s%s %s[%s%s%s]\n" msgstr "%sServeur: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "connecté" msgstr "connecté"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "non connecté" msgstr "non connecté"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "activé" msgstr "activé"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "désactivé" msgstr "désactivé"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)" msgstr " (serveur temporaire, ne sera pas sauvé)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "secondes" msgstr "secondes"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(caché)" msgstr "(caché)"
@@ -2260,51 +2260,51 @@ msgstr ""
"%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de " "%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
"l'extension\n" "l'extension\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "octets" msgstr "octets"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "Ko" msgstr "Ko"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "Mo" msgstr "Mo"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "Go" msgstr "Go"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Accepter" msgstr " [A] Accepter"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Annuler" msgstr " [C] Annuler"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Retirer" msgstr " [R] Retirer"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC" msgstr " [P] Purger anciens DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC" msgstr " [Q] Fermer la vue DCC"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Effacer le tampon" msgstr " [C] Effacer le tampon"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut" msgstr " [Q] Fermer la vue IRC brut"
+25 -25
View File
@@ -5,10 +5,10 @@
# Andras Voroskoi <voroskoi@frugalware.org>, 2006-2007. # Andras Voroskoi <voroskoi@frugalware.org>, 2006-2007.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2006-11-01 18:51+0100\n" "PO-Revision-Date: 2007-01-10 18:49+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1351,38 +1351,38 @@ msgstr "más felhasználók üzemmódját nem módosíthatja"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "kicsoda (titkosított kapcsolat)" msgstr "kicsoda (titkosított kapcsolat)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n" msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "csatlakozva" msgstr "csatlakozva"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nincs csatlakozva" msgstr "nincs csatlakozva"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "be" msgstr "be"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "ki" msgstr "ki"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)" msgstr " (átmeneti szerver, nem lesz mentve)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "másodperc" msgstr "másodperc"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(rejtett)" msgstr "(rejtett)"
@@ -2243,51 +2243,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n" msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "byte" msgstr "byte"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Elfogadás" msgstr " [A] Elfogadás"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Mégsem" msgstr " [C] Mégsem"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Eltávolítás" msgstr " [R] Eltávolítás"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése" msgstr " [P] Régi DCC törlése"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása" msgstr " [Q] DCC nézet bezárása"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Puffer törlése" msgstr " [C] Puffer törlése"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása" msgstr " [Q] Nyers adat nézet bezárása"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:49+0100\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1338,38 +1338,38 @@ msgstr "вы не можете менять режимы других польз
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (защищённое соединение)" msgstr "whois (защищённое соединение)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sСервер: %s%s %s[%s%s%s]\n" msgstr "%sСервер: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "подключен" msgstr "подключен"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "отключен" msgstr "отключен"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "вкл." msgstr "вкл."
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "выкл." msgstr "выкл."
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)" msgstr " (временный сервер, не будет сохранён)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "секунды" msgstr "секунды"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(скрытый)" msgstr "(скрытый)"
@@ -2224,51 +2224,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s сервер/канал (%s/%s) не найден для команды plug-inа\n" msgstr "%s сервер/канал (%s/%s) не найден для команды plug-inа\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "байтов" msgstr "байтов"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "КБ" msgstr "КБ"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "МБ" msgstr "МБ"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "ГБ" msgstr "ГБ"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "осталось" msgstr "осталось"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Принять" msgstr " [A] Принять"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Отменить" msgstr " [C] Отменить"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Удалить" msgstr " [R] Удалить"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Очистить список" msgstr " [P] Очистить список"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Закрыть окно" msgstr " [Q] Закрыть окно"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Очистить буфер" msgstr " [C] Очистить буфер"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Закрыть окно сырых данных" msgstr " [Q] Закрыть окно сырых данных"
+23 -23
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1235,38 +1235,38 @@ msgstr ""
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "" msgstr ""
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "" msgstr ""
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "" msgstr ""
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "" msgstr ""
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "" msgstr ""
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "" msgstr ""
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr "" msgstr ""
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "" msgstr ""
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "" msgstr ""
@@ -2095,51 +2095,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr "" msgstr ""
+29 -8
View File
@@ -194,16 +194,14 @@ ascii_strcasestr (char *string, char *search)
*/ */
char * char *
weechat_iconv (char *from_code, char *to_code, char *string) weechat_iconv (int from_utf8, char *from_code, char *to_code, char *string)
{ {
char *outbuf; char *outbuf;
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
iconv_t cd; iconv_t cd;
char *inbuf; char *inbuf, *ptr_inbuf, *ptr_outbuf, *next_char;
int done; int done;
ICONV_CONST char *ptr_inbuf;
char *ptr_outbuf;
size_t err, inbytesleft, outbytesleft; size_t err, inbytesleft, outbytesleft;
if (from_code && from_code[0] && to_code && to_code[0] if (from_code && from_code[0] && to_code && to_code[0]
@@ -223,7 +221,7 @@ weechat_iconv (char *from_code, char *to_code, char *string)
done = 0; done = 0;
while (!done) while (!done)
{ {
err = iconv (cd, &ptr_inbuf, &inbytesleft, err = iconv (cd, (ICONV_CONST char **)(&ptr_inbuf), &inbytesleft,
&ptr_outbuf, &outbytesleft); &ptr_outbuf, &outbytesleft);
if (err == (size_t)(-1)) if (err == (size_t)(-1))
{ {
@@ -236,7 +234,28 @@ weechat_iconv (char *from_code, char *to_code, char *string)
done = 1; done = 1;
break; break;
case EILSEQ: case EILSEQ:
ptr_inbuf[0] = '?'; if (from_utf8)
{
next_char = utf8_next_char (ptr_inbuf);
if (next_char)
{
inbytesleft -= next_char - ptr_inbuf;
ptr_inbuf = next_char;
}
else
{
inbytesleft--;
ptr_inbuf++;
}
}
else
{
ptr_inbuf++;
inbytesleft--;
}
ptr_outbuf[0] = '?';
ptr_outbuf++;
outbytesleft--;
break; break;
} }
} }
@@ -282,7 +301,8 @@ weechat_iconv_to_internal (char *charset, char *string)
if (utf8_is_valid (input, NULL)) if (utf8_is_valid (input, NULL))
return input; return input;
output = weechat_iconv ((charset && charset[0]) ? output = weechat_iconv (0,
(charset && charset[0]) ?
charset : local_charset, charset : local_charset,
WEECHAT_INTERNAL_CHARSET, WEECHAT_INTERNAL_CHARSET,
input); input);
@@ -313,7 +333,8 @@ weechat_iconv_from_internal (char *charset, char *string)
if (input) if (input)
{ {
utf8_normalize (input, '?'); utf8_normalize (input, '?');
output = weechat_iconv (WEECHAT_INTERNAL_CHARSET, output = weechat_iconv (1,
WEECHAT_INTERNAL_CHARSET,
(charset && charset[0]) ? (charset && charset[0]) ?
charset : local_charset, charset : local_charset,
input); input);
+11 -15
View File
@@ -169,7 +169,6 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
{ {
t_gui_window *ptr_win; t_gui_window *ptr_win;
char format[32], *buf, *buf2, *ptr_topic; char format[32], *buf, *buf2, *ptr_topic;
int length, width;
if (!gui_ok) if (!gui_ok)
return; return;
@@ -189,17 +188,15 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
if (CHANNEL(buffer)->topic) if (CHANNEL(buffer)->topic)
{ {
buf = (char *)gui_color_decode ((unsigned char *)(CHANNEL(buffer)->topic), 0); buf = (char *)gui_color_decode ((unsigned char *)(CHANNEL(buffer)->topic), 0);
buf2 = weechat_iconv_from_internal (NULL, ptr_topic = utf8_add_offset ((buf) ? buf : CHANNEL(buffer)->topic,
(buf) ? buf : CHANNEL(buffer)->topic); ptr_win->win_title_start);
ptr_topic = (buf2) ? buf2 : CHANNEL(buffer)->topic; if (!ptr_topic || !ptr_topic[0])
length = utf8_strlen (ptr_topic); {
if (ptr_win->win_title_start >= length)
ptr_win->win_title_start = 0; ptr_win->win_title_start = 0;
width = (ptr_win->win_title_start == 0) ? ptr_topic = (buf) ? buf : CHANNEL(buffer)->topic;
ptr_win->win_width : ptr_win->win_width - 2; }
ptr_topic += ptr_win->win_title_start; buf2 = weechat_iconv_from_internal (NULL,
ptr_topic);
snprintf (format, 32, "%%-%ds", width);
if (ptr_win->win_title_start > 0) if (ptr_win->win_title_start > 0)
{ {
@@ -208,11 +205,10 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
wprintw (GUI_CURSES(ptr_win)->win_title, "%s", "++"); wprintw (GUI_CURSES(ptr_win)->win_title, "%s", "++");
} }
if (utf8_strlen (ptr_topic) > ptr_win->win_width) if (utf8_width_screen (ptr_topic) > ptr_win->win_width)
{ {
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
wprintw (GUI_CURSES(ptr_win)->win_title, wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
format, ptr_topic);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title,
COLOR_WIN_TITLE_MORE); COLOR_WIN_TITLE_MORE);
mvwprintw (GUI_CURSES(ptr_win)->win_title, 0, ptr_win->win_width - 2, mvwprintw (GUI_CURSES(ptr_win)->win_title, 0, ptr_win->win_width - 2,
@@ -221,7 +217,7 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
else else
{ {
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
wprintw (GUI_CURSES(ptr_win)->win_title, format, ptr_topic); wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
} }
if (buf) if (buf)
free (buf); free (buf);
+18 -7
View File
@@ -90,11 +90,11 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
{ {
case 'c': case 'c':
if (CHANNEL(window->buffer)) if (CHANNEL(window->buffer))
length += utf8_strlen (CHANNEL(window->buffer)->name); length += utf8_width_screen (CHANNEL(window->buffer)->name);
else else
{ {
if (SERVER(window->buffer)) if (SERVER(window->buffer))
length += utf8_strlen (SERVER(window->buffer)->name); length += utf8_width_screen (SERVER(window->buffer)->name);
} }
pos++; pos++;
break; break;
@@ -108,7 +108,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
pos++; pos++;
break; break;
case 'n': case 'n':
length += utf8_strlen (nick); length += utf8_width_screen (nick);
pos++; pos++;
break; break;
default: default:
@@ -148,7 +148,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
void void
gui_input_draw_prompt (t_gui_window *window, char *nick) gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
char *pos, saved_char; char *pos, saved_char, *buf;
int char_size; int char_size;
wmove (GUI_CURSES(window)->win_input, 0, 0); wmove (GUI_CURSES(window)->win_input, 0, 0);
@@ -166,8 +166,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_CHANNEL); COLOR_WIN_INPUT_CHANNEL);
buf = weechat_iconv_from_internal (NULL,
CHANNEL(window->buffer)->name);
wprintw (GUI_CURSES(window)->win_input, "%s", wprintw (GUI_CURSES(window)->win_input, "%s",
CHANNEL(window->buffer)->name); (buf) ? buf : CHANNEL(window->buffer)->name);
if (buf)
free (buf);
} }
else else
{ {
@@ -175,8 +179,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_SERVER); COLOR_WIN_INPUT_SERVER);
buf = weechat_iconv_from_internal (NULL,
SERVER(window->buffer)->name);
wprintw (GUI_CURSES(window)->win_input, "%s", wprintw (GUI_CURSES(window)->win_input, "%s",
SERVER(window->buffer)->name); (buf) ? buf : SERVER(window->buffer)->name);
if (buf)
free (buf);
} }
} }
pos++; pos++;
@@ -198,7 +206,10 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
case 'n': case 'n':
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_NICK); COLOR_WIN_INPUT_NICK);
wprintw (GUI_CURSES(window)->win_input, "%s", nick); buf = weechat_iconv_from_internal (NULL, nick);
wprintw (GUI_CURSES(window)->win_input, "%s", (buf) ? buf : nick);
if (buf)
free (buf);
pos++; pos++;
break; break;
default: default:
+52 -14
View File
@@ -24,8 +24,12 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdlib.h>
#include "../../common/weechat.h" #include "../../common/weechat.h"
#include "../gui.h" #include "../gui.h"
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h" #include "../../common/weeconfig.h"
#include "../../irc/irc.h" #include "../../irc/irc.h"
#include "gui-curses.h" #include "gui-curses.h"
@@ -39,8 +43,8 @@ void
gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size) gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
{ {
t_gui_window *ptr_win; t_gui_window *ptr_win;
int i, j, x, y, x2, column, max_length, nicks_displayed; int i, j, k, x, y, x2, max_y, column, max_length, max_chars, nicks_displayed;
char format[32], format_empty[32]; char format_empty[32], *buf, *ptr_buf, *ptr_next, saved_char;
t_irc_nick *ptr_nick; t_irc_nick *ptr_nick;
if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer)) if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
@@ -81,15 +85,14 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
(cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
snprintf (format, 32, "%%.%ds", max_length); max_chars = max_length;
else else
snprintf (format, 32, "%%.%ds", max_chars = ((cfg_look_nicklist_min_size > 0)
((cfg_look_nicklist_min_size > 0) && (max_length < cfg_look_nicklist_min_size)) ?
&& (max_length < cfg_look_nicklist_min_size)) ? cfg_look_nicklist_min_size :
cfg_look_nicklist_min_size : (((cfg_look_nicklist_max_size > 0)
(((cfg_look_nicklist_max_size > 0) && (max_length > cfg_look_nicklist_max_size)) ?
&& (max_length > cfg_look_nicklist_max_size)) ? cfg_look_nicklist_max_size : max_length);
cfg_look_nicklist_max_size : max_length));
if (cfg_look_nicklist_separator && has_colors ()) if (cfg_look_nicklist_separator && has_colors ())
{ {
@@ -122,6 +125,20 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK);
x = 0; x = 0;
y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0; y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0;
max_y = 0;
switch (cfg_look_nicklist_position)
{
case CFG_LOOK_NICKLIST_LEFT:
case CFG_LOOK_NICKLIST_RIGHT:
max_y = 0;
break;
case CFG_LOOK_NICKLIST_TOP:
max_y = ptr_win->win_nick_height - cfg_look_nicklist_separator;
break;
case CFG_LOOK_NICKLIST_BOTTOM:
max_y = ptr_win->win_nick_height;
break;
}
column = 0; column = 0;
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
@@ -203,7 +220,30 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick,
((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ? ((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ?
COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK); COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format, ptr_nick->nick); wmove (GUI_CURSES(ptr_win)->win_nick, y, x);
ptr_buf = ptr_nick->nick;
saved_char = '\0';
for (k = 0; k < max_chars; k++)
{
if (ptr_buf && ptr_buf[0])
{
ptr_next = utf8_next_char (ptr_buf);
if (ptr_next)
{
saved_char = ptr_next[0];
ptr_next[0] = '\0';
}
buf = weechat_iconv_from_internal (NULL, ptr_buf);
wprintw (GUI_CURSES(ptr_win)->win_nick, "%s", (buf) ? buf : "?");
if (buf)
free (buf);
if (ptr_next)
ptr_next[0] = saved_char;
ptr_buf = ptr_next;
}
else
wprintw (GUI_CURSES(ptr_win)->win_nick, " ");
}
ptr_nick = ptr_nick->next_nick; ptr_nick = ptr_nick->next_nick;
@@ -214,9 +254,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
(cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
{ {
if (y - ((cfg_look_nicklist_separator if (y >= max_y)
&& (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0)
>= ptr_win->win_nick_height - 1)
{ {
column += max_length + 2; column += max_length + 2;
y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ?
+2 -1
View File
@@ -31,6 +31,7 @@
#include "../common/weechat.h" #include "../common/weechat.h"
#include "irc.h" #include "irc.h"
#include "../common/utf8.h"
#include "../common/weeconfig.h" #include "../common/weeconfig.h"
#include "../gui/gui.h" #include "../gui/gui.h"
@@ -159,7 +160,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
ptr_nickname = strdup ((nick) ? nick->nick : nickname); ptr_nickname = strdup ((nick) ? nick->nick : nickname);
if (!ptr_nickname) if (!ptr_nickname)
return; return;
nickname_length = strlen (ptr_nickname); nickname_length = utf8_width_screen (ptr_nickname);
external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer)); external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer));
disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE) disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE)
&& ((int)strlen (cfg_look_nick_prefix) + && ((int)strlen (cfg_look_nick_prefix) +
+2 -1
View File
@@ -31,6 +31,7 @@
#include "../common/weechat.h" #include "../common/weechat.h"
#include "irc.h" #include "irc.h"
#include "../common/log.h" #include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h" #include "../common/util.h"
#include "../common/weeconfig.h" #include "../common/weeconfig.h"
@@ -387,7 +388,7 @@ nick_get_max_length (t_irc_channel *channel)
max_length = 0; max_length = 0;
for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
{ {
length = strlen (ptr_nick->nick); length = utf8_width_screen (ptr_nick->nick);
if (length > max_length) if (length > max_length)
max_length = length; max_length = length;
} }
+33 -79
View File
@@ -29,8 +29,6 @@
#include "weechat-charset.h" #include "weechat-charset.h"
char *weechat_charset_excluded_cmd[] = { "ping", "pong", NULL };
char *weechat_charset_terminal = NULL; char *weechat_charset_terminal = NULL;
char *weechat_charset_internal = NULL; char *weechat_charset_internal = NULL;
@@ -185,28 +183,6 @@ weechat_charset_set_config (t_weechat_plugin *plugin,
plugin->set_plugin_config (plugin, option, value); plugin->set_plugin_config (plugin, option, value);
} }
/*
* weechat_charset_command_allowed: return 1 if command can be decoded/encoded
*/
int
weechat_charset_command_allowed (char *command)
{
int i;
if (!command)
return 0;
for (i = 0; weechat_charset_excluded_cmd[i]; i++)
{
if (strcasecmp (weechat_charset_excluded_cmd[i], command) == 0)
return 0;
}
/* command can be decoded/recoded */
return 1;
}
/* /*
* weechat_charset_parse_irc_msg: return nick, command, channel and position * weechat_charset_parse_irc_msg: return nick, command, channel and position
* of arguments in IRC message * of arguments in IRC message
@@ -216,15 +192,19 @@ void
weechat_charset_parse_irc_msg (char *message, char **nick, char **command, weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
char **channel, char **pos_args) char **channel, char **pos_args)
{ {
char *pos, *pos2, *pos3; char *pos, *pos2, *pos3, *pos_tmp;
*nick = NULL; *nick = NULL;
*command = NULL; *command = NULL;
*channel = NULL; *channel = NULL;
*pos_args = NULL; *pos_args = NULL;
if (message[0] == ':') if (message[0] == ':')
{ {
pos = message + 1; pos = message + 1;
pos_tmp = strchr (pos, ' ');
if (pos_tmp)
pos_tmp[0] = '\0';
pos2 = strchr (pos, '!'); pos2 = strchr (pos, '!');
if (pos2) if (pos2)
*nick = weechat_charset_strndup (pos, pos2 - pos); *nick = weechat_charset_strndup (pos, pos2 - pos);
@@ -234,6 +214,8 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
if (pos2) if (pos2)
*nick = weechat_charset_strndup (pos, pos2 - pos); *nick = weechat_charset_strndup (pos, pos2 - pos);
} }
if (pos_tmp)
pos_tmp[0] = ' ';
pos = strchr (message, ' '); pos = strchr (message, ' ');
if (!pos) if (!pos)
pos = message; pos = message;
@@ -292,8 +274,7 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
char *handler_args, void *handler_pointer) char *handler_args, void *handler_pointer)
{ {
char *nick, *command, *channel, *charset, *ptr_args; char *nick, *command, *channel, *charset, *ptr_args;
char *decoded, *output; char *output;
int length;
/* make gcc happy */ /* make gcc happy */
(void) argc; (void) argc;
@@ -304,32 +285,19 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args); weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
if (weechat_charset_command_allowed (command)) charset = weechat_charset_get_config (plugin,
"decode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset IN: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (charset)
{ {
charset = weechat_charset_get_config (plugin, output = plugin->iconv_to_internal (plugin, charset, argv[1]);
"decode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset IN: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (ptr_args && charset)
{
decoded = plugin->iconv_to_internal (plugin, charset, ptr_args);
if (decoded)
{
length = strlen (decoded) + (ptr_args - argv[1]) + 1;
output = (char *)malloc (length + 1);
strncpy (output, argv[1], ptr_args - argv[1]);
output[ptr_args - argv[1]] = '\0';
strcat (output, decoded);
free (decoded);
}
}
if (charset) if (charset)
free (charset); free (charset);
} }
@@ -354,8 +322,7 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
char *handler_args, void *handler_pointer) char *handler_args, void *handler_pointer)
{ {
char *nick, *command, *channel, *charset, *ptr_args; char *nick, *command, *channel, *charset, *ptr_args;
char *encoded, *output; char *output;
int length;
/* make gcc happy */ /* make gcc happy */
(void) argc; (void) argc;
@@ -366,32 +333,19 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args); weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
if (weechat_charset_command_allowed (command)) charset = weechat_charset_get_config (plugin,
"encode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset OUT: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (charset)
{ {
charset = weechat_charset_get_config (plugin, output = plugin->iconv_from_internal (plugin, charset, argv[1]);
"encode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset OUT: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (ptr_args && charset)
{
encoded = plugin->iconv_from_internal (plugin, charset, ptr_args);
if (encoded)
{
length = strlen (encoded) + (ptr_args - argv[1]) + 1;
output = (char *)malloc (length + 1);
strncpy (output, argv[1], ptr_args - argv[1]);
output[ptr_args - argv[1]] = '\0';
strcat (output, encoded);
free (encoded);
}
}
if (charset) if (charset)
free (charset); free (charset);
} }
+3 -1
View File
@@ -18,7 +18,7 @@
# #
%define name weechat %define name weechat
%define version 0.2.2 %define version 0.2.3
%define release 1 %define release 1
Name: %{name} Name: %{name}
@@ -68,6 +68,8 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/%{name}/weechat_quickstart* %{_docdir}/%{name}/weechat_quickstart*
%changelog %changelog
* Wed Jan 10 2007 FlashCode <flashcode@flashtux.org> 0.2.3-1
- Released version 0.2.3
* Sat Jan 06 2007 FlashCode <flashcode@flashtux.org> 0.2.2-1 * Sat Jan 06 2007 FlashCode <flashcode@flashtux.org> 0.2.2-1
- Released version 0.2.2 - Released version 0.2.2
* Sun Oct 01 2006 FlashCode <flashcode@flashtux.org> 0.2.1-1 * Sun Oct 01 2006 FlashCode <flashcode@flashtux.org> 0.2.1-1
+10 -1
View File
@@ -1,9 +1,18 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
ChangeLog - 2007-01-06 ChangeLog - 2007-01-10
Version 0.2.3 (2007-01-10):
* fixed display bugs with nicklist at top/bottom when look_nicklist_separator
is OFF (bug #18737)
* fixed iconv problem, causing truncated words when using iso locale
* fixed topic scroll when topic has multi-bytes chars
* fixed compilation problem with iconv under FreeBSD
* fixed bugs with charset: now decodes/encodes nicks and channels in IRC
messages (bug #18716)
Version 0.2.2 (2007-01-06): Version 0.2.2 (2007-01-06):
* fixed bug with status bar (missing refresh) when closing a buffer * fixed bug with status bar (missing refresh) when closing a buffer
* fixed bug with use of first buffer for a channel if not connected * fixed bug with use of first buffer for a channel if not connected
+7
View File
@@ -1,6 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
* FlashCode, 2007-01-10
WeeChat 0.2.3 released.
This version fixes several major bugs of version 0.2.2.
All users of version 0.2.2 should upgrade to this version.
* FlashCode, 2007-01-06 * FlashCode, 2007-01-06
WeeChat 0.2.2 released. WeeChat 0.2.2 released.
+2 -2
View File
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56) AC_PREREQ(2.56)
AC_INIT(WeeChat, 0.2.2, flashcode@flashtux.org) AC_INIT(WeeChat, 0.2.3, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c]) AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([weechat], [0.2.2]) AM_INIT_AUTOMAKE([weechat], [0.2.3])
# Checks for programs # Checks for programs
AC_PROG_CC AC_PROG_CC
+2 -2
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - User guide</title> <title>WeeChat 0.2.3 - User guide</title>
<subtitle>Schneller, leichter und erweiterbarer IRC Client</subtitle> <subtitle>Schneller, leichter und erweiterbarer IRC Client</subtitle>
<author> <author>
@@ -705,7 +705,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<row> <row>
<entry>Alt + J dann Alt + X</entry> <entry>Alt + J dann Alt + X</entry>
<entry> <entry>
Schalte in den ersten Channel des nächsten Puffers Schalte in den ersten Channel des nächsten Servers
(oder in den Server-Puffer wenn keine Channel offen ist) (oder in den Server-Puffer wenn keine Channel offen ist)
</entry> </entry>
</row> </row>
+2 -2
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - User guide</title> <title>WeeChat 0.2.3 - User guide</title>
<subtitle>Fast, light and extensible IRC client</subtitle> <subtitle>Fast, light and extensible IRC client</subtitle>
<author> <author>
@@ -701,7 +701,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<row> <row>
<entry>Alt + J then Alt + X</entry> <entry>Alt + J then Alt + X</entry>
<entry> <entry>
Switch to first channel of next buffer Switch to first channel of next server
(or server buffer if no channel is opened) (or server buffer if no channel is opened)
</entry> </entry>
</row> </row>
+1 -1
View File
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<bookinfo> <bookinfo>
<title>WeeChat 0.2.2 - Guide utilisateur</title> <title>WeeChat 0.2.3 - Guide utilisateur</title>
<subtitle>Client IRC rapide, léger et extensible</subtitle> <subtitle>Client IRC rapide, léger et extensible</subtitle>
<author> <author>
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 22:32+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1339,38 +1339,38 @@ msgstr "nemůžu změnit mód přo ostatní uživatele"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (zabezpečená část)" msgstr "whois (zabezpečená část)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "připojen" msgstr "připojen"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nepřipojen" msgstr "nepřipojen"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "na" msgstr "na"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "off" msgstr "off"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)" msgstr " (dočasný server, nebude uložen)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "sekund" msgstr "sekund"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(skrytý)" msgstr "(skrytý)"
@@ -2235,51 +2235,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n" msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "bajtů" msgstr "bajtů"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Akceptovat" msgstr " [A] Akceptovat"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Storno" msgstr " [C] Storno"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Odebrat" msgstr " [R] Odebrat"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC" msgstr " [P] Pročistit staré DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled" msgstr " [Q] Zavřít DCC pohled"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Vyčistit buffer" msgstr " [C] Vyčistit buffer"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data" msgstr " [Q] Zavřít čistý pohled na data"
+25 -25
View File
@@ -7,10 +7,10 @@
# Thomas Schuetz <i18n@internet-villa.de>, 2006. # Thomas Schuetz <i18n@internet-villa.de>, 2006.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n" "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n" "Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1339,38 +1339,38 @@ msgstr "Modes anderer User können nicht geändert werden"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (sichere Verbindung)" msgstr "whois (sichere Verbindung)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "verbunden" msgstr "verbunden"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nicht verbunden" msgstr "nicht verbunden"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "an" msgstr "an"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "aus" msgstr "aus"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)" msgstr " (temporärer Server, wird nicht gespeichert)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "Sekunden" msgstr "Sekunden"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(versteckt)" msgstr "(versteckt)"
@@ -2243,51 +2243,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n" msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "Bytes" msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] annehmen" msgstr " [A] annehmen"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] abbrechen" msgstr " [C] abbrechen"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] entfernen" msgstr " [R] entfernen"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen" msgstr " [P] alte DCCs entfernen"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen" msgstr " [Q] DCC-Ansicht schließen"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Puffer löschen" msgstr " [C] Puffer löschen"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen" msgstr " [Q] Rohdatenansicht schließen"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Weechat 0.2.2\n" "Project-Id-Version: Weechat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1357,38 +1357,38 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "quién es (conexión segura)" msgstr "quién es (conexión segura)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServidor:%s%s %s[%s%s%s]\n" msgstr "%sServidor:%s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "conectado" msgstr "conectado"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "no conectado" msgstr "no conectado"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "activo" msgstr "activo"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "inactivo" msgstr "inactivo"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no será guardado)" msgstr " (servidor temporal, no será guardado)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "segundos" msgstr "segundos"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(oculto)" msgstr "(oculto)"
@@ -2271,52 +2271,52 @@ msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "" msgstr ""
"%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n" "%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "bytes" msgstr "bytes"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "Tiempo estimado de llegada" msgstr "Tiempo estimado de llegada"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Aceptar" msgstr " [A] Aceptar"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Cancelar" msgstr " [C] Cancelar"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Eliminar" msgstr " [R] Eliminar"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC" msgstr " [P] Purgar los viejos DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC" msgstr " [Q] Cerrar la vista DCC"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
#, fuzzy #, fuzzy
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr "saltar al búfer DCC" msgstr "saltar al búfer DCC"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura" msgstr " [Q] Cerrar vista de datos basura"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:50+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1345,38 +1345,38 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (connexion sécurisée)" msgstr "whois (connexion sécurisée)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sServeur: %s%s %s[%s%s%s]\n" msgstr "%sServeur: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "connecté" msgstr "connecté"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "non connecté" msgstr "non connecté"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "activé" msgstr "activé"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "désactivé" msgstr "désactivé"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)" msgstr " (serveur temporaire, ne sera pas sauvé)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "secondes" msgstr "secondes"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(caché)" msgstr "(caché)"
@@ -2260,51 +2260,51 @@ msgstr ""
"%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de " "%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
"l'extension\n" "l'extension\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "octets" msgstr "octets"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "Ko" msgstr "Ko"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "Mo" msgstr "Mo"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "Go" msgstr "Go"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Accepter" msgstr " [A] Accepter"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Annuler" msgstr " [C] Annuler"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Retirer" msgstr " [R] Retirer"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC" msgstr " [P] Purger anciens DCC"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC" msgstr " [Q] Fermer la vue DCC"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Effacer le tampon" msgstr " [C] Effacer le tampon"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut" msgstr " [Q] Fermer la vue IRC brut"
+25 -25
View File
@@ -5,10 +5,10 @@
# Andras Voroskoi <voroskoi@frugalware.org>, 2006-2007. # Andras Voroskoi <voroskoi@frugalware.org>, 2006-2007.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2006-11-01 18:51+0100\n" "PO-Revision-Date: 2007-01-10 18:49+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1351,38 +1351,38 @@ msgstr "más felhasználók üzemmódját nem módosíthatja"
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "kicsoda (titkosított kapcsolat)" msgstr "kicsoda (titkosított kapcsolat)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n" msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "csatlakozva" msgstr "csatlakozva"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "nincs csatlakozva" msgstr "nincs csatlakozva"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "be" msgstr "be"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "ki" msgstr "ki"
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)" msgstr " (átmeneti szerver, nem lesz mentve)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "másodperc" msgstr "másodperc"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(rejtett)" msgstr "(rejtett)"
@@ -2243,51 +2243,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n" msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "byte" msgstr "byte"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "KB" msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "MB" msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "GB" msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Elfogadás" msgstr " [A] Elfogadás"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Mégsem" msgstr " [C] Mégsem"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Eltávolítás" msgstr " [R] Eltávolítás"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése" msgstr " [P] Régi DCC törlése"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása" msgstr " [Q] DCC nézet bezárása"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Puffer törlése" msgstr " [C] Puffer törlése"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása" msgstr " [Q] Nyers adat nézet bezárása"
+25 -25
View File
@@ -4,10 +4,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.2.2\n" "Project-Id-Version: WeeChat 0.2.3\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: 2007-01-05 20:29+0100\n" "PO-Revision-Date: 2007-01-10 18:49+0100\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -1338,38 +1338,38 @@ msgstr "вы не можете менять режимы других польз
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "whois (защищённое соединение)" msgstr "whois (защищённое соединение)"
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "%sСервер: %s%s %s[%s%s%s]\n" msgstr "%sСервер: %s%s %s[%s%s%s]\n"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "подключен" msgstr "подключен"
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "отключен" msgstr "отключен"
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "вкл." msgstr "вкл."
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "выкл." msgstr "выкл."
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)" msgstr " (временный сервер, не будет сохранён)"
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "секунды" msgstr "секунды"
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "(скрытый)" msgstr "(скрытый)"
@@ -2224,51 +2224,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s сервер/канал (%s/%s) не найден для команды plug-inа\n" msgstr "%s сервер/канал (%s/%s) не найден для команды plug-inа\n"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "байтов" msgstr "байтов"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "КБ" msgstr "КБ"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "МБ" msgstr "МБ"
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "ГБ" msgstr "ГБ"
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "осталось" msgstr "осталось"
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr " [A] Принять" msgstr " [A] Принять"
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr " [C] Отменить" msgstr " [C] Отменить"
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr " [R] Удалить" msgstr " [R] Удалить"
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr " [P] Очистить список" msgstr " [P] Очистить список"
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr " [Q] Закрыть окно" msgstr " [Q] Закрыть окно"
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr " [C] Очистить буфер" msgstr " [C] Очистить буфер"
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr " [Q] Закрыть окно сырых данных" msgstr " [Q] Закрыть окно сырых данных"
+23 -23
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-01-05 20:28+0100\n" "POT-Creation-Date: 2007-01-10 18:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1235,38 +1235,38 @@ msgstr ""
msgid "whois (secure connection)" msgid "whois (secure connection)"
msgstr "" msgstr ""
#: src/irc/irc-display.c:375 #: src/irc/irc-display.c:376
#, c-format #, c-format
msgid "%sServer: %s%s %s[%s%s%s]\n" msgid "%sServer: %s%s %s[%s%s%s]\n"
msgstr "" msgstr ""
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "connected" msgid "connected"
msgstr "" msgstr ""
#: src/irc/irc-display.c:382 #: src/irc/irc-display.c:383
msgid "not connected" msgid "not connected"
msgstr "" msgstr ""
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "on" msgid "on"
msgstr "" msgstr ""
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390 #: src/irc/irc-display.c:387 src/irc/irc-display.c:391
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401 #: src/irc/irc-display.c:400 src/irc/irc-display.c:402
msgid "off" msgid "off"
msgstr "" msgstr ""
#: src/irc/irc-display.c:388 #: src/irc/irc-display.c:389
msgid " (temporary server, will not be saved)" msgid " (temporary server, will not be saved)"
msgstr "" msgstr ""
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144 #: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
msgid "seconds" msgid "seconds"
msgstr "" msgstr ""
#: src/irc/irc-display.c:404 #: src/irc/irc-display.c:405
msgid "(hidden)" msgid "(hidden)"
msgstr "" msgstr ""
@@ -2095,51 +2095,51 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n" msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "KB" msgid "KB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "MB" msgid "MB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:945 #: src/gui/curses/gui-curses-chat.c:941
msgid "GB" msgid "GB"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-chat.c:1079 #: src/gui/curses/gui-curses-chat.c:1075
msgid "ETA" msgid "ETA"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:395 #: src/gui/curses/gui-curses-input.c:406
msgid " [A] Accept" msgid " [A] Accept"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402 #: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
msgid " [C] Cancel" msgid " [C] Cancel"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:408 #: src/gui/curses/gui-curses-input.c:419
msgid " [R] Remove" msgid " [R] Remove"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:413 #: src/gui/curses/gui-curses-input.c:424
msgid " [P] Purge old DCC" msgid " [P] Purge old DCC"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:415 #: src/gui/curses/gui-curses-input.c:426
msgid " [Q] Close DCC view" msgid " [Q] Close DCC view"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:424 #: src/gui/curses/gui-curses-input.c:435
msgid " [C] Clear buffer" msgid " [C] Clear buffer"
msgstr "" msgstr ""
#: src/gui/curses/gui-curses-input.c:426 #: src/gui/curses/gui-curses-input.c:437
msgid " [Q] Close raw data view" msgid " [Q] Close raw data view"
msgstr "" msgstr ""
+29 -8
View File
@@ -194,16 +194,14 @@ ascii_strcasestr (char *string, char *search)
*/ */
char * char *
weechat_iconv (char *from_code, char *to_code, char *string) weechat_iconv (int from_utf8, char *from_code, char *to_code, char *string)
{ {
char *outbuf; char *outbuf;
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
iconv_t cd; iconv_t cd;
char *inbuf; char *inbuf, *ptr_inbuf, *ptr_outbuf, *next_char;
int done; int done;
ICONV_CONST char *ptr_inbuf;
char *ptr_outbuf;
size_t err, inbytesleft, outbytesleft; size_t err, inbytesleft, outbytesleft;
if (from_code && from_code[0] && to_code && to_code[0] if (from_code && from_code[0] && to_code && to_code[0]
@@ -223,7 +221,7 @@ weechat_iconv (char *from_code, char *to_code, char *string)
done = 0; done = 0;
while (!done) while (!done)
{ {
err = iconv (cd, &ptr_inbuf, &inbytesleft, err = iconv (cd, (ICONV_CONST char **)(&ptr_inbuf), &inbytesleft,
&ptr_outbuf, &outbytesleft); &ptr_outbuf, &outbytesleft);
if (err == (size_t)(-1)) if (err == (size_t)(-1))
{ {
@@ -236,7 +234,28 @@ weechat_iconv (char *from_code, char *to_code, char *string)
done = 1; done = 1;
break; break;
case EILSEQ: case EILSEQ:
ptr_inbuf[0] = '?'; if (from_utf8)
{
next_char = utf8_next_char (ptr_inbuf);
if (next_char)
{
inbytesleft -= next_char - ptr_inbuf;
ptr_inbuf = next_char;
}
else
{
inbytesleft--;
ptr_inbuf++;
}
}
else
{
ptr_inbuf++;
inbytesleft--;
}
ptr_outbuf[0] = '?';
ptr_outbuf++;
outbytesleft--;
break; break;
} }
} }
@@ -282,7 +301,8 @@ weechat_iconv_to_internal (char *charset, char *string)
if (utf8_is_valid (input, NULL)) if (utf8_is_valid (input, NULL))
return input; return input;
output = weechat_iconv ((charset && charset[0]) ? output = weechat_iconv (0,
(charset && charset[0]) ?
charset : local_charset, charset : local_charset,
WEECHAT_INTERNAL_CHARSET, WEECHAT_INTERNAL_CHARSET,
input); input);
@@ -313,7 +333,8 @@ weechat_iconv_from_internal (char *charset, char *string)
if (input) if (input)
{ {
utf8_normalize (input, '?'); utf8_normalize (input, '?');
output = weechat_iconv (WEECHAT_INTERNAL_CHARSET, output = weechat_iconv (1,
WEECHAT_INTERNAL_CHARSET,
(charset && charset[0]) ? (charset && charset[0]) ?
charset : local_charset, charset : local_charset,
input); input);
+11 -15
View File
@@ -169,7 +169,6 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
{ {
t_gui_window *ptr_win; t_gui_window *ptr_win;
char format[32], *buf, *buf2, *ptr_topic; char format[32], *buf, *buf2, *ptr_topic;
int length, width;
if (!gui_ok) if (!gui_ok)
return; return;
@@ -189,17 +188,15 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
if (CHANNEL(buffer)->topic) if (CHANNEL(buffer)->topic)
{ {
buf = (char *)gui_color_decode ((unsigned char *)(CHANNEL(buffer)->topic), 0); buf = (char *)gui_color_decode ((unsigned char *)(CHANNEL(buffer)->topic), 0);
buf2 = weechat_iconv_from_internal (NULL, ptr_topic = utf8_add_offset ((buf) ? buf : CHANNEL(buffer)->topic,
(buf) ? buf : CHANNEL(buffer)->topic); ptr_win->win_title_start);
ptr_topic = (buf2) ? buf2 : CHANNEL(buffer)->topic; if (!ptr_topic || !ptr_topic[0])
length = utf8_strlen (ptr_topic); {
if (ptr_win->win_title_start >= length)
ptr_win->win_title_start = 0; ptr_win->win_title_start = 0;
width = (ptr_win->win_title_start == 0) ? ptr_topic = (buf) ? buf : CHANNEL(buffer)->topic;
ptr_win->win_width : ptr_win->win_width - 2; }
ptr_topic += ptr_win->win_title_start; buf2 = weechat_iconv_from_internal (NULL,
ptr_topic);
snprintf (format, 32, "%%-%ds", width);
if (ptr_win->win_title_start > 0) if (ptr_win->win_title_start > 0)
{ {
@@ -208,11 +205,10 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
wprintw (GUI_CURSES(ptr_win)->win_title, "%s", "++"); wprintw (GUI_CURSES(ptr_win)->win_title, "%s", "++");
} }
if (utf8_strlen (ptr_topic) > ptr_win->win_width) if (utf8_width_screen (ptr_topic) > ptr_win->win_width)
{ {
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
wprintw (GUI_CURSES(ptr_win)->win_title, wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
format, ptr_topic);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title,
COLOR_WIN_TITLE_MORE); COLOR_WIN_TITLE_MORE);
mvwprintw (GUI_CURSES(ptr_win)->win_title, 0, ptr_win->win_width - 2, mvwprintw (GUI_CURSES(ptr_win)->win_title, 0, ptr_win->win_width - 2,
@@ -221,7 +217,7 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
else else
{ {
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
wprintw (GUI_CURSES(ptr_win)->win_title, format, ptr_topic); wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
} }
if (buf) if (buf)
free (buf); free (buf);
+18 -7
View File
@@ -90,11 +90,11 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
{ {
case 'c': case 'c':
if (CHANNEL(window->buffer)) if (CHANNEL(window->buffer))
length += utf8_strlen (CHANNEL(window->buffer)->name); length += utf8_width_screen (CHANNEL(window->buffer)->name);
else else
{ {
if (SERVER(window->buffer)) if (SERVER(window->buffer))
length += utf8_strlen (SERVER(window->buffer)->name); length += utf8_width_screen (SERVER(window->buffer)->name);
} }
pos++; pos++;
break; break;
@@ -108,7 +108,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
pos++; pos++;
break; break;
case 'n': case 'n':
length += utf8_strlen (nick); length += utf8_width_screen (nick);
pos++; pos++;
break; break;
default: default:
@@ -148,7 +148,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
void void
gui_input_draw_prompt (t_gui_window *window, char *nick) gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
char *pos, saved_char; char *pos, saved_char, *buf;
int char_size; int char_size;
wmove (GUI_CURSES(window)->win_input, 0, 0); wmove (GUI_CURSES(window)->win_input, 0, 0);
@@ -166,8 +166,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_CHANNEL); COLOR_WIN_INPUT_CHANNEL);
buf = weechat_iconv_from_internal (NULL,
CHANNEL(window->buffer)->name);
wprintw (GUI_CURSES(window)->win_input, "%s", wprintw (GUI_CURSES(window)->win_input, "%s",
CHANNEL(window->buffer)->name); (buf) ? buf : CHANNEL(window->buffer)->name);
if (buf)
free (buf);
} }
else else
{ {
@@ -175,8 +179,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
{ {
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_SERVER); COLOR_WIN_INPUT_SERVER);
buf = weechat_iconv_from_internal (NULL,
SERVER(window->buffer)->name);
wprintw (GUI_CURSES(window)->win_input, "%s", wprintw (GUI_CURSES(window)->win_input, "%s",
SERVER(window->buffer)->name); (buf) ? buf : SERVER(window->buffer)->name);
if (buf)
free (buf);
} }
} }
pos++; pos++;
@@ -198,7 +206,10 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
case 'n': case 'n':
gui_window_set_weechat_color (GUI_CURSES(window)->win_input, gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT_NICK); COLOR_WIN_INPUT_NICK);
wprintw (GUI_CURSES(window)->win_input, "%s", nick); buf = weechat_iconv_from_internal (NULL, nick);
wprintw (GUI_CURSES(window)->win_input, "%s", (buf) ? buf : nick);
if (buf)
free (buf);
pos++; pos++;
break; break;
default: default:
+52 -14
View File
@@ -24,8 +24,12 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdlib.h>
#include "../../common/weechat.h" #include "../../common/weechat.h"
#include "../gui.h" #include "../gui.h"
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h" #include "../../common/weeconfig.h"
#include "../../irc/irc.h" #include "../../irc/irc.h"
#include "gui-curses.h" #include "gui-curses.h"
@@ -39,8 +43,8 @@ void
gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size) gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
{ {
t_gui_window *ptr_win; t_gui_window *ptr_win;
int i, j, x, y, x2, column, max_length, nicks_displayed; int i, j, k, x, y, x2, max_y, column, max_length, max_chars, nicks_displayed;
char format[32], format_empty[32]; char format_empty[32], *buf, *ptr_buf, *ptr_next, saved_char;
t_irc_nick *ptr_nick; t_irc_nick *ptr_nick;
if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer)) if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
@@ -81,15 +85,14 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
(cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
snprintf (format, 32, "%%.%ds", max_length); max_chars = max_length;
else else
snprintf (format, 32, "%%.%ds", max_chars = ((cfg_look_nicklist_min_size > 0)
((cfg_look_nicklist_min_size > 0) && (max_length < cfg_look_nicklist_min_size)) ?
&& (max_length < cfg_look_nicklist_min_size)) ? cfg_look_nicklist_min_size :
cfg_look_nicklist_min_size : (((cfg_look_nicklist_max_size > 0)
(((cfg_look_nicklist_max_size > 0) && (max_length > cfg_look_nicklist_max_size)) ?
&& (max_length > cfg_look_nicklist_max_size)) ? cfg_look_nicklist_max_size : max_length);
cfg_look_nicklist_max_size : max_length));
if (cfg_look_nicklist_separator && has_colors ()) if (cfg_look_nicklist_separator && has_colors ())
{ {
@@ -122,6 +125,20 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK); gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK);
x = 0; x = 0;
y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0; y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0;
max_y = 0;
switch (cfg_look_nicklist_position)
{
case CFG_LOOK_NICKLIST_LEFT:
case CFG_LOOK_NICKLIST_RIGHT:
max_y = 0;
break;
case CFG_LOOK_NICKLIST_TOP:
max_y = ptr_win->win_nick_height - cfg_look_nicklist_separator;
break;
case CFG_LOOK_NICKLIST_BOTTOM:
max_y = ptr_win->win_nick_height;
break;
}
column = 0; column = 0;
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
@@ -203,7 +220,30 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick,
((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ? ((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ?
COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK); COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format, ptr_nick->nick); wmove (GUI_CURSES(ptr_win)->win_nick, y, x);
ptr_buf = ptr_nick->nick;
saved_char = '\0';
for (k = 0; k < max_chars; k++)
{
if (ptr_buf && ptr_buf[0])
{
ptr_next = utf8_next_char (ptr_buf);
if (ptr_next)
{
saved_char = ptr_next[0];
ptr_next[0] = '\0';
}
buf = weechat_iconv_from_internal (NULL, ptr_buf);
wprintw (GUI_CURSES(ptr_win)->win_nick, "%s", (buf) ? buf : "?");
if (buf)
free (buf);
if (ptr_next)
ptr_next[0] = saved_char;
ptr_buf = ptr_next;
}
else
wprintw (GUI_CURSES(ptr_win)->win_nick, " ");
}
ptr_nick = ptr_nick->next_nick; ptr_nick = ptr_nick->next_nick;
@@ -214,9 +254,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
(cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
{ {
if (y - ((cfg_look_nicklist_separator if (y >= max_y)
&& (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0)
>= ptr_win->win_nick_height - 1)
{ {
column += max_length + 2; column += max_length + 2;
y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ?
+2 -1
View File
@@ -31,6 +31,7 @@
#include "../common/weechat.h" #include "../common/weechat.h"
#include "irc.h" #include "irc.h"
#include "../common/utf8.h"
#include "../common/weeconfig.h" #include "../common/weeconfig.h"
#include "../gui/gui.h" #include "../gui/gui.h"
@@ -159,7 +160,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
ptr_nickname = strdup ((nick) ? nick->nick : nickname); ptr_nickname = strdup ((nick) ? nick->nick : nickname);
if (!ptr_nickname) if (!ptr_nickname)
return; return;
nickname_length = strlen (ptr_nickname); nickname_length = utf8_width_screen (ptr_nickname);
external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer)); external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer));
disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE) disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE)
&& ((int)strlen (cfg_look_nick_prefix) + && ((int)strlen (cfg_look_nick_prefix) +
+2 -1
View File
@@ -31,6 +31,7 @@
#include "../common/weechat.h" #include "../common/weechat.h"
#include "irc.h" #include "irc.h"
#include "../common/log.h" #include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h" #include "../common/util.h"
#include "../common/weeconfig.h" #include "../common/weeconfig.h"
@@ -387,7 +388,7 @@ nick_get_max_length (t_irc_channel *channel)
max_length = 0; max_length = 0;
for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
{ {
length = strlen (ptr_nick->nick); length = utf8_width_screen (ptr_nick->nick);
if (length > max_length) if (length > max_length)
max_length = length; max_length = length;
} }
+33 -79
View File
@@ -29,8 +29,6 @@
#include "weechat-charset.h" #include "weechat-charset.h"
char *weechat_charset_excluded_cmd[] = { "ping", "pong", NULL };
char *weechat_charset_terminal = NULL; char *weechat_charset_terminal = NULL;
char *weechat_charset_internal = NULL; char *weechat_charset_internal = NULL;
@@ -185,28 +183,6 @@ weechat_charset_set_config (t_weechat_plugin *plugin,
plugin->set_plugin_config (plugin, option, value); plugin->set_plugin_config (plugin, option, value);
} }
/*
* weechat_charset_command_allowed: return 1 if command can be decoded/encoded
*/
int
weechat_charset_command_allowed (char *command)
{
int i;
if (!command)
return 0;
for (i = 0; weechat_charset_excluded_cmd[i]; i++)
{
if (strcasecmp (weechat_charset_excluded_cmd[i], command) == 0)
return 0;
}
/* command can be decoded/recoded */
return 1;
}
/* /*
* weechat_charset_parse_irc_msg: return nick, command, channel and position * weechat_charset_parse_irc_msg: return nick, command, channel and position
* of arguments in IRC message * of arguments in IRC message
@@ -216,15 +192,19 @@ void
weechat_charset_parse_irc_msg (char *message, char **nick, char **command, weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
char **channel, char **pos_args) char **channel, char **pos_args)
{ {
char *pos, *pos2, *pos3; char *pos, *pos2, *pos3, *pos_tmp;
*nick = NULL; *nick = NULL;
*command = NULL; *command = NULL;
*channel = NULL; *channel = NULL;
*pos_args = NULL; *pos_args = NULL;
if (message[0] == ':') if (message[0] == ':')
{ {
pos = message + 1; pos = message + 1;
pos_tmp = strchr (pos, ' ');
if (pos_tmp)
pos_tmp[0] = '\0';
pos2 = strchr (pos, '!'); pos2 = strchr (pos, '!');
if (pos2) if (pos2)
*nick = weechat_charset_strndup (pos, pos2 - pos); *nick = weechat_charset_strndup (pos, pos2 - pos);
@@ -234,6 +214,8 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
if (pos2) if (pos2)
*nick = weechat_charset_strndup (pos, pos2 - pos); *nick = weechat_charset_strndup (pos, pos2 - pos);
} }
if (pos_tmp)
pos_tmp[0] = ' ';
pos = strchr (message, ' '); pos = strchr (message, ' ');
if (!pos) if (!pos)
pos = message; pos = message;
@@ -292,8 +274,7 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
char *handler_args, void *handler_pointer) char *handler_args, void *handler_pointer)
{ {
char *nick, *command, *channel, *charset, *ptr_args; char *nick, *command, *channel, *charset, *ptr_args;
char *decoded, *output; char *output;
int length;
/* make gcc happy */ /* make gcc happy */
(void) argc; (void) argc;
@@ -304,32 +285,19 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args); weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
if (weechat_charset_command_allowed (command)) charset = weechat_charset_get_config (plugin,
"decode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset IN: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (charset)
{ {
charset = weechat_charset_get_config (plugin, output = plugin->iconv_to_internal (plugin, charset, argv[1]);
"decode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset IN: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (ptr_args && charset)
{
decoded = plugin->iconv_to_internal (plugin, charset, ptr_args);
if (decoded)
{
length = strlen (decoded) + (ptr_args - argv[1]) + 1;
output = (char *)malloc (length + 1);
strncpy (output, argv[1], ptr_args - argv[1]);
output[ptr_args - argv[1]] = '\0';
strcat (output, decoded);
free (decoded);
}
}
if (charset) if (charset)
free (charset); free (charset);
} }
@@ -354,8 +322,7 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
char *handler_args, void *handler_pointer) char *handler_args, void *handler_pointer)
{ {
char *nick, *command, *channel, *charset, *ptr_args; char *nick, *command, *channel, *charset, *ptr_args;
char *encoded, *output; char *output;
int length;
/* make gcc happy */ /* make gcc happy */
(void) argc; (void) argc;
@@ -366,32 +333,19 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args); weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
if (weechat_charset_command_allowed (command)) charset = weechat_charset_get_config (plugin,
"encode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset OUT: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (charset)
{ {
charset = weechat_charset_get_config (plugin, output = plugin->iconv_from_internal (plugin, charset, argv[1]);
"encode", argv[0],
(channel) ? channel : nick);
if (weechat_charset_debug)
plugin->print(plugin, NULL, NULL,
"Charset OUT: srv='%s', nick='%s', chan='%s', "
"msg='%s', ptr_args='%s' => charset: %s",
argv[0], nick, channel, argv[1], ptr_args, charset);
if (ptr_args && charset)
{
encoded = plugin->iconv_from_internal (plugin, charset, ptr_args);
if (encoded)
{
length = strlen (encoded) + (ptr_args - argv[1]) + 1;
output = (char *)malloc (length + 1);
strncpy (output, argv[1], ptr_args - argv[1]);
output[ptr_args - argv[1]] = '\0';
strcat (output, encoded);
free (encoded);
}
}
if (charset) if (charset)
free (charset); free (charset);
} }
+3 -1
View File
@@ -18,7 +18,7 @@
# #
%define name weechat %define name weechat
%define version 0.2.2 %define version 0.2.3
%define release 1 %define release 1
Name: %{name} Name: %{name}
@@ -68,6 +68,8 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/%{name}/weechat_quickstart* %{_docdir}/%{name}/weechat_quickstart*
%changelog %changelog
* Wed Jan 10 2007 FlashCode <flashcode@flashtux.org> 0.2.3-1
- Released version 0.2.3
* Sat Jan 06 2007 FlashCode <flashcode@flashtux.org> 0.2.2-1 * Sat Jan 06 2007 FlashCode <flashcode@flashtux.org> 0.2.2-1
- Released version 0.2.2 - Released version 0.2.2
* Sun Oct 01 2006 FlashCode <flashcode@flashtux.org> 0.2.1-1 * Sun Oct 01 2006 FlashCode <flashcode@flashtux.org> 0.2.1-1