Version 0.3.0-rc3

There was a problem with some locales like turkish, where upper "i" is "İ".
All IRC commands with "I" inside (JOIN, PRIVMSG, ..) failed with turkish
locale.

CMakeLists.txt

@@ -28,7 +28,7 @@ ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "0-rc2")
+SET(VERSION_PATCH "0-rc3")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})

Makefile.am

@@ -38,9 +38,12 @@ EXTRA_DIST = CMakeLists.txt \
              cmake/FindSourcehighlight.cmake \
              cmake/FindTCL.cmake \
              cmake/makedist.sh.in \
+             po/CMakeLists.txt \
+             po/srcfiles.cmake \
              weechat.spec \
              weechat_icon_32.png \
-             weechat.pc.in
+             weechat.pc.in \
+             UPGRADE_0.3
 
 ACLOCAL_AMFLAGS = -I m4
 

NEWS

@@ -1,6 +1,12 @@
 WeeChat News
 ============
 
+FlashCode, 2009-08-10::
+    WeeChat 0.3.0 will bring major changes, especially for configuration files
+    and plugin API.
+    +
+    For more information about this version, please read file UPGRADE_0.3.
+
 FlashCode, 2009-06-13::
     WeeChat 0.2.6.3 released.
     +

UPGRADE_0.3

@@ -0,0 +1,83 @@
+WeeChat Upgrade to 0.3.x
+========================
+FlashCode <flashcode@flashtux.org>
+v0.3.0, 2009-08-09
+
+
+This document lists major changes introduced in version 0.3.0 and not compatible
+with versions 0.2.x.
+
+
+Upgrade to version 0.3.x
+------------------------
+
+It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
+You have to quit your old WeeChat, then run new version.
+
+Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
+upgrade to another 0.3.x (unless this command is broken again, please look
+at release notes (file 'NEWS') for version you're currently installing).
+
+
+Configuration files
+-------------------
+
+Changes with previous versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
+
+Name of options is similar to old versions, but there is now one configuration
+file by plugin, and one file for WeeChat core.
+
+There is *no automatic conversion* for your old options to new configuration files,
+so you'll have to setup again your IRC servers and all other options.
+
+In WeeChat, option names are now with format: `plugin.section.option` (for
+WeeChat core, `plugin` is `weechat`).
+
+Examples:
+
+* WeeChat options: `weechat.xxx.yyy`
+* IRC options: `irc.xxx.yyy`
+
+You should read quickstart guide to be familiar with basic commands and syntax
+(some commands like `/server` have changed): http://weechat.flashtux.org/doc.php
+
+
+List of configuration files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Old configuration files:
+** weechat.rc
+** plugins.rc
+* New configuration files are now (with default plugins):
+** weechat.conf
+** alias.conf
+** aspell.conf
+** charset.conf
+** irc.conf
+** jabber.conf
+** logger.conf
+** plugins.conf
+** relay.conf
+** xfer.conf
+
+
+Plugin API
+----------
+
+Plugin API has been rewritten and is not compatible with previous versions.
+Accordingly, scripts and plugins must have been designed for version 0.3.x to
+be loaded into WeeChat.
+
+There is no migration script today to convert old script to new API.
+Therefore, if you plan to use old script, you'll have to wait for new version
+or you can convert script yourself and send us new version ;)
+
+You can download scripts for new API on plugins page:
+http://weechat.flashtux.org/plugins.php
+
+More information about new API is available on wiki:
+http://wiki.flashtux.org/wiki/WeeChat_0.3.0
+and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API

configure.in

@@ -18,10 +18,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.0-rc2, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.0-rc3, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.0-rc2])
+AM_INIT_AUTOMAKE([weechat], [0.3.0-rc3])
 
 # Checks for programs
 AC_PROG_CC

doc/en/autogen/user/aspell_options.txt

@@ -4,7 +4,7 @@
 ** values: any string (default value: "ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic")
 
 * *aspell.check.default_dict*
-** description: default dictionary (or comma separated list of dictionaries) to use when buffer has no dictionary defined (leave blank to disable aspell on buffers for which you didn't explicitely enabled it)
+** description: default dictionary (or comma separated list of dictionaries) to use when buffer has no dictionary defined (leave blank to disable aspell on buffers for which you didn't explicitly enabled it)
 ** type: string
 ** values: any string (default value: "")
 
@@ -24,7 +24,7 @@
 ** values: 0 .. 2147483647 (default value: 2)
 
 * *aspell.look.color*
-** description: color used for mispelled words
+** description: color used for misspelled words
 ** type: color
 ** values: a color name (default value: lightred)
 

doc/en/autogen/user/irc_commands.txt

@@ -170,7 +170,7 @@
   nickname: nickname
 ........................................
 
-• *`/join`* `channel[,channel] [key[,key]]`::
+• *`/join`* `[channel[,channel] [key[,key]]]`::
 
 ........................................
   join a channel

doc/en/autogen/user/weechat_commands.txt

@@ -120,7 +120,7 @@
            -all: delete all filters
   plugin.buffer: plugin and buffer where filter is active ("*" for all buffers)
            tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
-          regex: regular expression to search in line (use \t to separate prefix from message)
+          regex: regular expression to search in line (use \t to separate prefix from message, special chars like '|' must be escaped: '\|')
   
   The default key alt+'=' toggles filtering on/off.
   

doc/en/autogen/user/weechat_options.txt

@@ -193,11 +193,6 @@
 ** type: color
 ** values: a color name (default value: lightgreen)
 
-* *weechat.color.input_nick*
-** description: text color for nick name in input line
-** type: color
-** values: a color name (default value: lightcyan)
-
 * *weechat.color.input_text_not_found*
 ** description: text color for unsucessful text search in input line
 ** type: color
@@ -243,11 +238,6 @@
 ** type: color
 ** values: a color name (default value: brown)
 
-* *weechat.color.nicklist_separator*
-** description: text color for nicklist separator
-** type: color
-** values: a color name (default value: blue)
-
 * *weechat.color.separator*
 ** description: background color for window separators (when split)
 ** type: color
@@ -528,6 +518,11 @@
 ** type: integer
 ** values: 1 .. 100 (default value: 100)
 
+* *weechat.look.search_text_not_found_alert*
+** description: alert user when text sought is not found in buffer
+** type: boolean
+** values: on, off (default value: on)
+
 * *weechat.look.set_title*
 ** description: set title for window (terminal for Curses GUI) with name and version
 ** type: boolean

doc/en/weechat_plugin_api.en.txt

@@ -4046,8 +4046,8 @@ struct t_hook *weechat_hook_process (const char *command,
                                      int (*callback)(void *data,
                                                      const char *command,
                                                      int return_code,
-                                                     const char *stdout,
-                                                     const char *stderr),
+                                                     const char *out,
+                                                     const char *err),
                                      void *callback_data);
 ----------------------------------------
 
@@ -4065,8 +4065,8 @@ Arguments:
 *** '>= 0': child command return code
 *** '< 0': 'WEECHAT_HOOK_PROCESS_OK_RUNNING' (data available, but child still
     running) or 'WEECHAT_HOOK_PROCESS_ERROR' (error when launching command)
-** 'stdout': standard output of command
-** 'stderr': error output of command
+** 'out': standard output of command (stdout)
+** 'err': error output of command (stderr)
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -4079,7 +4079,7 @@ Example:
 ----------------------------------------
 int
 my_process_cb (void *data, const char *command, int return_code,
-               const char *stdout, const char *stderr)
+               const char *out, const char *err)
 {
     if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
     {
@@ -4092,14 +4092,14 @@ my_process_cb (void *data, const char *command, int return_code,
         weechat_printf (NULL, "return_code = %d", return_code);
     }
     
-    if (stdout)
+    if (out)
     {
-        weechat_printf (NULL, "stdout: %s", stdout);
+        weechat_printf (NULL, "stdout: %s", out);
     }
     
-    if (stderr)
+    if (err)
     {
-        weechat_printf (NULL, "stderr: %s", stderr);
+        weechat_printf (NULL, "stderr: %s", err);
     }
     
     return WEECHAT_RC_OK;

doc/en/weechat_quickstart.en.txt

@@ -129,9 +129,18 @@ Connect to IRC server and auto-join channels
 
   /connect oftc
 
-Note: this command can be used to create and connect to a new server
-without using `/server` command (should I repeat you can see help for
-this command with `/help connect` ? ;)
+[NOTE]
+This command can be used to create and connect to a new server without using
+`/server` command (should I repeat you can see help for this command with
+`/help connect` ?).
+
+By default, server buffers are merged with WeeChat 'core' buffer. To switch
+between 'core' buffer and server buffers, you can use ctrl-X.
+
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+  /set irc.look.server_buffer independent
 
 
 [[join_part_irc_channels]]
@@ -210,7 +219,8 @@ Plugins/scripts
 
 On some distros like Debian, plugins are available via a separate package
 (like weechat-plugins).
-Plugins are automatically loaded when found.
+Plugins are automatically loaded when found (please look at the WeeChat
+documentation to load/unload plugins or scripts).
 
 Some plugins let you use scripts in WeeChat (in many languages like Perl,
 Python, Ruby, Lua and Tcl). These plugins must be loaded with the `/plugin`
@@ -219,7 +229,11 @@ command and they provide commands like `/perl`, used to load scripts.
 Many external plugins/scripts (from contributors) are available for
 WeeChat: http://weechat.flashtux.org/plugins.php
 
-Please look at the WeeChat documentation to load/unload plugins or scripts.
+Easiest way to install scripts is to use script 'weeget.py':
+
+. download and copy 'weeget.py' to ~/.weechat/python/autoload/
+. load script: `/python autoload`
+. scripts list: `/weeget list` (for help: `/help weeget`)
 
 
 [[more_doc]]

doc/fr/autogen/user/irc_commands.txt

@@ -170,7 +170,7 @@
   pseudo: pseudo
 ........................................
 
-• *`/join`* `canal[,canal] [clé[,clé]]`::
+• *`/join`* `[canal[,canal] [clé[,clé]]]`::
 
 ........................................
   joindre un canal

doc/fr/autogen/user/weechat_commands.txt

@@ -120,7 +120,7 @@
               -all: supprime tous les filtres
   extension.tampon: extension et tampon où le filtre est actif ("*" pour tous les tampons)
               tags: liste de tags, séparés par des virgules, par exemple: "irc_join,irc_part,irc_quit"
-             regex: expressoin régulière à rechercher dans la ligne (utiliser \t pour séparer le préfixe du message)
+             regex: expressoin régulière à rechercher dans la ligne (utiliser \t pour séparer le préfixe du message, les caractères spéciaux comme '|' doivent être échappés: '\|')
   
   La touche par défaut alt+'=' active/désactive le filtrage.
   

doc/fr/autogen/user/weechat_options.txt

@@ -193,11 +193,6 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: lightgreen)
 
-* *weechat.color.input_nick*
-** description: couleur du texte pour le pseudo dans la ligne de saisie
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: lightcyan)
-
 * *weechat.color.input_text_not_found*
 ** description: couleur du texte pour la recherche infructueuse de texte dans la ligne de saisie
 ** type: couleur
@@ -243,11 +238,6 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: brown)
 
-* *weechat.color.nicklist_separator*
-** description: couleur du texte pour le séparateur de la liste des pseudos
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: blue)
-
 * *weechat.color.separator*
 ** description: couleur du fond pour les séparateurs de fenêtres (quand divisé)
 ** type: couleur
@@ -319,7 +309,7 @@
 ** valeurs: toute chaîne (valeur par défaut: "[]-^")
 
 * *weechat.completion.partial_completion_alert*
-** description: alterte de l'utilisateur lorsqu'une complétion partielle survient
+** description: alterte l'utilisateur lorsqu'une complétion partielle survient
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)
 
@@ -528,6 +518,11 @@
 ** type: entier
 ** valeurs: 1 .. 100 (valeur par défaut: 100)
 
+* *weechat.look.search_text_not_found_alert*
+** description: alterte l'utilisateur lorsque le texte cherché n'est pas trouvé dans le tampon
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *weechat.look.set_title*
 ** description: définit le titre de la fenêtre (terminal pour l'interface Curses) avec le nom et la version
 ** type: booléen

doc/fr/weechat_faq.fr.txt

@@ -120,7 +120,7 @@ Pour les versions > = 0.2.3 :
 ** vérifiez que votre terminal est compatible UTF-8
    (un terminal conseillé pour l'UTF-8 est rxvt-unicode)
 ** si vous utilisez screen, vérifiez qu'il est lancé en mode UTF-8
-   ("`defutf8 on`" dans ~/.screnrc ou `screen -U` pour lancer screen)
+   ("`defutf8 on`" dans ~/.screenrc ou `screen -U` pour lancer screen)
 
 [NOTE]
 La locale UTF-8 est recommandée pour WeeChat. Si vous utilisez ISO ou une autre

doc/fr/weechat_plugin_api.fr.txt

@@ -4112,8 +4112,8 @@ struct t_hook *weechat_hook_process (const char *command,
                                      int (*callback)(void *data,
                                                      const char *command,
                                                      int return_code,
-                                                     const char *stdout,
-                                                     const char *stderr),
+                                                     const char *out,
+                                                     const char *err),
                                      void *callback_data);
 ----------------------------------------
 
@@ -4132,8 +4132,8 @@ Paramètres :
 *** '< 0' : 'WEECHAT_HOOK_PROCESS_OK_RUNNING' (données disponibles, mais le
     fils tourne toujours) ou 'WEECHAT_HOOK_PROCESS_ERROR' (erreur en lançant
     la commande)
-** 'stdout' : sortie standard de la commande
-** 'stderr' : erreurs de la commande
+** 'out' : sortie standard de la commande (stdout)
+** 'err' : erreurs de la commande (stderr)
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -4147,7 +4147,7 @@ Exemple :
 ----------------------------------------
 int
 mon_processus_cb (void *data, const char *command, int return_code,
-                  const char *stdout, const char *stderr)
+                  const char *out, const char *err)
 {
     if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
     {
@@ -4160,14 +4160,14 @@ mon_processus_cb (void *data, const char *command, int return_code,
         weechat_printf (NULL, "return_code = %d", return_code);
     }
     
-    if (stdout)
+    if (out)
     {
-        weechat_printf (NULL, "stdout : %s", stdout);
+        weechat_printf (NULL, "stdout : %s", out);
     }
     
-    if (stderr)
+    if (err)
     {
-        weechat_printf (NULL, "stderr : %s", stderr);
+        weechat_printf (NULL, "stderr : %s", err);
     }
     
     return WEECHAT_RC_OK;

doc/fr/weechat_quickstart.fr.txt

@@ -136,9 +136,19 @@ Se connecter au serveur IRC et rejoindre les canaux
 
   /connect oftc
 
-Note : cette commande peut aussi être utilisée pour créer et se connecter
-au serveur sans utiliser la commande `/server` (devrais-je répéter que vous
-pouvez voir l'aide pour cette commande avec `/help connect` ? ;)
+[NOTE]
+Cette commande peut aussi être utilisée pour créer et se connecter au serveur
+sans utiliser la commande `/server` (devrais-je répéter que vous pouvez voir
+l'aide pour cette commande avec `/help connect` ?).
+
+Par défaut, les tampons des serveurs sont mélangés avec le tampon 'core'
+WeeChat. Pour basculer entre le tampon 'core' et les tampons des serveurs, il
+faut utiliser la touche ctrl-X.
+
+Il est possible de désactiver le mélange des tampons serveurs pour avoir un
+tampon distinct par serveur :
+
+  /set irc.look.server_buffer independent
 
 
 [[join_part_irc_channels]]
@@ -220,7 +230,9 @@ Extensions/scripts
 
 Sur certaines distributions comme Debian, les extensions sont disponibles
 via un paquet séparé (par exemple weechat-plugins).
-Les extensions sont automatiquement chargées lorsqu'elles sont trouvées.
+Les extensions sont automatiquement chargées lorsqu'elles sont trouvées
+(merci de regarder la documentation WeeChat pour charger/décharger des
+extensions ou des scripts).
 
 Des extensions permettent d'utiliser des scripts dans WeeChat (dans
 différent langages comme Perl, Python, Ruby, Lua et Tcl). Ces extensions
@@ -230,8 +242,12 @@ commandes telles que `/perl`, utilisées pour charger les scripts.
 Plusieurs extensions/scripts (de contributeurs) sont disponibles pour
 WeeChat : http://weechat.flashtux.org/plugins.php
 
-Merci de regarder la documentation WeeChat pour charger/décharger des
-extensions ou des scripts.
+La manière la plus simple pour installer des scripts consiste à utiliser le
+script 'weeget.py' :
+
+. téléchargez et copiez 'weeget.py' dans ~/.weechat/python/autoload/
+. chargez le script : `/python autoload`
+. liste des scripts : `/weeget list` (pour l'aide: `/help weeget`)
 
 
 [[more_doc]]

po/cs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -907,7 +907,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1463,6 +1463,9 @@ msgstr ""
 "procenta obrazovky, o které posunout, při posunutí o stránku nahoru nebo "
 "dolů (například 100 znamená jedna stránka, 50 půl stránky)"
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
 
@@ -1655,10 +1658,6 @@ msgstr "barva okna s novými daty (ne zprávami) (status bar)"
 msgid "text color for buffer with new data (status bar)"
 msgstr "barva okna s novými daty (status bar)"
 
-#, fuzzy
-msgid "text color for nick name in input line"
-msgstr "barva přezdívek"
-
 #, fuzzy
 msgid "text color for unsucessful text search in input line"
 msgstr "barva děličů v infobaru"
@@ -1699,10 +1698,6 @@ msgstr "barva přezdívky"
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr "barva pro '+' při procházení přezdívek"
 
-#, fuzzy
-msgid "text color for nicklist separator"
-msgstr "barva děliče přezdívek"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2364,7 +2359,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr "%s nedostatek paměti pro infobar zprávu\n"
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2375,7 +2370,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -3030,7 +3025,8 @@ msgstr "přezdívka: přezdívka"
 msgid "join a channel"
 msgstr "připojit se ke kanálu"
 
-msgid "channel[,channel] [key[,key]]"
+#, fuzzy
+msgid "[channel[,channel] [key[,key]]]"
 msgstr "kanál[,kanál] [klíč[,klíč]]"
 
 msgid ""
@@ -4695,6 +4691,12 @@ msgstr ""
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%s nemůžu načist plugin \"%s\": %s\n"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5528,6 +5530,14 @@ msgstr "%s DCC: nemohu nastavit 'neblokovaci' volbu na soket\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s chybí argument pro volbu \"%s\"\n"
 
+#, fuzzy
+#~ msgid "text color for nick name in input line"
+#~ msgstr "barva přezdívek"
+
+#, fuzzy
+#~ msgid "text color for nicklist separator"
+#~ msgstr "barva děliče přezdívek"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "server"

po/de.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -943,7 +943,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1485,6 +1485,9 @@ msgid ""
 "100 means one page, 50 half-page)"
 msgstr ""
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "Fenstertitel setzen (oder Terminaltitel im Curses-GUI) mit Name und Version"
@@ -1680,10 +1683,6 @@ msgstr ""
 msgid "text color for buffer with new data (status bar)"
 msgstr "Farbe eines Fensters mit neuen Daten in der Statuszeile"
 
-#, fuzzy
-msgid "text color for nick name in input line"
-msgstr "Farbe von Nicknames"
-
 #, fuzzy
 msgid "text color for unsucessful text search in input line"
 msgstr "Farbe der Infobar-Trennzeichen"
@@ -1724,10 +1723,6 @@ msgstr "Farbe von Nicknames"
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr "Farbe des '+' beim Scrolling von Nicknames"
 
-#, fuzzy
-msgid "text color for nicklist separator"
-msgstr "Farbe der Nicknamefenster-Trennlinie"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2373,7 +2368,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n"
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2384,7 +2379,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -3029,7 +3024,8 @@ msgstr "Nickname: Nickname"
 msgid "join a channel"
 msgstr "einen Channel betreten"
 
-msgid "channel[,channel] [key[,key]]"
+#, fuzzy
+msgid "[channel[,channel] [key[,key]]]"
 msgstr "Channel[,Channel] [Passwort[,Passwort]]"
 
 msgid ""
@@ -4669,6 +4665,12 @@ msgstr "Liste der /ignore-Regeln:\n"
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%s kann Plugin \"%s\" nicht laden: %s\n"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5492,6 +5494,14 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s fehlende Argumente für die \"--dir\"-Option\n"
 
+#, fuzzy
+#~ msgid "text color for nick name in input line"
+#~ msgstr "Farbe von Nicknames"
+
+#, fuzzy
+#~ msgid "text color for nicklist separator"
+#~ msgstr "Farbe der Nicknamefenster-Trennlinie"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "Server"

po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -939,7 +939,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1466,6 +1466,9 @@ msgid ""
 "100 means one page, 50 half-page)"
 msgstr ""
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "define el título de la ventana (el terminal para la interfaz Curses) con el "
@@ -1661,10 +1664,6 @@ msgstr ""
 msgid "text color for buffer with new data (status bar)"
 msgstr "color para una ventana con nuevos datos (barra de estado)"
 
-#, fuzzy
-msgid "text color for nick name in input line"
-msgstr "color para los nombres de usuario"
-
 #, fuzzy
 msgid "text color for unsucessful text search in input line"
 msgstr "color para los delimitadores de la barra de información"
@@ -1705,10 +1704,6 @@ msgstr "color para el nombre de usuario"
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr "color para '+' al desplazar nicks"
 
-#, fuzzy
-msgid "text color for nicklist separator"
-msgstr "color para el separador de alias"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2347,7 +2342,7 @@ msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr ""
 "No hay suficiente memoria para el mensaje de la barra de información\n"
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2358,7 +2353,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -3007,7 +3002,8 @@ msgstr "usuario: usuario"
 msgid "join a channel"
 msgstr "unirse a un canal"
 
-msgid "channel[,channel] [key[,key]]"
+#, fuzzy
+msgid "[channel[,channel] [key[,key]]]"
 msgstr "canal[,canal] [clave[,clave]]"
 
 msgid ""
@@ -4662,6 +4658,12 @@ msgstr "Lista de ignores:\n"
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%s no ha sido posible cargar el plugin \"%s\": %s\n"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5489,6 +5491,14 @@ msgstr "%s no es posible crear el servidor\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s falta un argumento para la opción --dir\n"
 
+#, fuzzy
+#~ msgid "text color for nick name in input line"
+#~ msgstr "color para los nombres de usuario"
+
+#, fuzzy
+#~ msgid "text color for nicklist separator"
+#~ msgstr "color para el separador de alias"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "servidor"

po/fr.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
-"PO-Revision-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
+"PO-Revision-Date: 2009-08-09 12:17+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -977,7 +977,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1006,7 +1006,8 @@ msgstr ""
 "            tags: liste de tags, séparés par des virgules, par exemple: "
 "\"irc_join,irc_part,irc_quit\"\n"
 "           regex: expressoin régulière à rechercher dans la ligne (utiliser "
-"\\t pour séparer le préfixe du message)\n"
+"\\t pour séparer le préfixe du message, les caractères spéciaux comme '|' "
+"doivent être échappés: '\\|')\n"
 "\n"
 "La touche par défaut alt+'=' active/désactive le filtrage.\n"
 "\n"
@@ -1647,6 +1648,11 @@ msgstr ""
 "pourcentage de l'écran à faire défiler lors du défilement avec page "
 "précédente ou suivante (par exemple 100 signifie une page, 50 une demi-page)"
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+"alterte l'utilisateur lorsque le texte cherché n'est pas trouvé dans le "
+"tampon"
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
@@ -1807,9 +1813,6 @@ msgid "text color for buffer with new data (status bar)"
 msgstr ""
 "couleur du texte pour un tampon avec des nouvelles données (barre de statut)"
 
-msgid "text color for nick name in input line"
-msgstr "couleur du texte pour le pseudo dans la ligne de saisie"
-
 msgid "text color for unsucessful text search in input line"
 msgstr ""
 "couleur du texte pour la recherche infructueuse de texte dans la ligne de "
@@ -1844,9 +1847,6 @@ msgstr ""
 "couleur du texte pour les '+' lors du défilement des pseudos dans la liste "
 "des pseudos"
 
-msgid "text color for nicklist separator"
-msgstr "couleur du texte pour le séparateur de la liste des pseudos"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -1870,7 +1870,7 @@ msgid "chars ignored for nick completion"
 msgstr "caractères à ignorer pour la complétion des pseudos"
 
 msgid "alert user when a partial completion occurs"
-msgstr "alterte de l'utilisateur lorsqu'une complétion partielle survient"
+msgstr "alterte l'utilisateur lorsqu'une complétion partielle survient"
 
 msgid ""
 "partially complete command names (stop when many commands found begin with "
@@ -2493,7 +2493,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr "%s%s: erreur en création du dictionnaire aspell \"%s\" => \"%s\""
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr "couleur utilisée pour les mots mal orthographiés"
 
 msgid ""
@@ -2507,7 +2507,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 "dictionnaire par défaut (ou liste de dictionnaires séparés par une virgule) "
 "à utiliser quand le tampon courant n'a pas de dictionnaire défini (laissez "
@@ -3188,8 +3188,8 @@ msgstr "pseudo: pseudo"
 msgid "join a channel"
 msgstr "joindre un canal"
 
-msgid "channel[,channel] [key[,key]]"
-msgstr "canal[,canal] [clé[,clé]]"
+msgid "[channel[,channel] [key[,key]]]"
+msgstr "[canal[,canal] [clé[,clé]]]"
 
 msgid ""
 "channel: channel name to join\n"
@@ -4864,6 +4864,14 @@ msgstr "liste des fenêtres"
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%sErreur: impossible de charger l'extension \"%s\": %s"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+"%sSi vous essayez de charger un script et non une extension C, essayez la "
+"commande pour charger les scripts (/perl, /python, ...)"
+
 #, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5683,3 +5691,9 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket"
 #, c-format
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
+
+#~ msgid "text color for nick name in input line"
+#~ msgstr "couleur du texte pour le pseudo dans la ligne de saisie"
+
+#~ msgid "text color for nicklist separator"
+#~ msgstr "couleur du texte pour le séparateur de la liste des pseudos"

po/hu.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -959,7 +959,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1495,6 +1495,9 @@ msgid ""
 "100 means one page, 50 half-page)"
 msgstr ""
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "ablak címsorának beállítása (Curses GUI esetén a terminálé) a program nevére "
@@ -1689,10 +1692,6 @@ msgstr "új adatot tartalmazó ablak színe (nem üzenetek) (státuszsor)"
 msgid "text color for buffer with new data (status bar)"
 msgstr "új adatot tartalmazó ablak színe (státuszsor)"
 
-#, fuzzy
-msgid "text color for nick name in input line"
-msgstr "nevek színe"
-
 #, fuzzy
 msgid "text color for unsucessful text search in input line"
 msgstr "információs pult határolóinak színe"
@@ -1733,10 +1732,6 @@ msgstr "név színe"
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr "a '+' jel színe névlista görgetésekor"
 
-#, fuzzy
-msgid "text color for nicklist separator"
-msgstr "névelválasztó színe"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2383,7 +2378,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2394,7 +2389,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -3043,7 +3038,8 @@ msgstr "név: név"
 msgid "join a channel"
 msgstr "belépés egy szobába"
 
-msgid "channel[,channel] [key[,key]]"
+#, fuzzy
+msgid "[channel[,channel] [key[,key]]]"
 msgstr "szoba[,szoba] [kulcs[,kulcs]]"
 
 msgid ""
@@ -4701,6 +4697,12 @@ msgstr "Mellőzések listája:\n"
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%s nem sikerült a modult betölteni \"%s\": %s\n"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5518,6 +5520,14 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 
+#, fuzzy
+#~ msgid "text color for nick name in input line"
+#~ msgstr "nevek színe"
+
+#, fuzzy
+#~ msgid "text color for nicklist separator"
+#~ msgstr "névelválasztó színe"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "szerver"

po/ru.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -954,7 +954,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1498,6 +1498,9 @@ msgid ""
 "100 means one page, 50 half-page)"
 msgstr ""
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "устанавливать заголовок окна (терминала при интерфейсе Curses) с именем и "
@@ -1692,10 +1695,6 @@ msgstr "цвет окна с новыми данными (но не сообще
 msgid "text color for buffer with new data (status bar)"
 msgstr "цвет окна с новыми данными (в строке состояния)"
 
-#, fuzzy
-msgid "text color for nick name in input line"
-msgstr "цвет ников"
-
 #, fuzzy
 msgid "text color for unsucessful text search in input line"
 msgstr "цвет разделителей информационной панели"
@@ -1736,10 +1735,6 @@ msgstr "цвет ника"
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr "цвет '+' при прокрутке ников"
 
-#, fuzzy
-msgid "text color for nicklist separator"
-msgstr "цвет разделителя ников"
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2386,7 +2381,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2397,7 +2392,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -3045,7 +3040,8 @@ msgstr "ник: ник"
 msgid "join a channel"
 msgstr "зайти на канал"
 
-msgid "channel[,channel] [key[,key]]"
+#, fuzzy
+msgid "[channel[,channel] [key[,key]]]"
 msgstr "канал[,канал] [ключ[,ключ]]"
 
 msgid ""
@@ -4686,6 +4682,12 @@ msgstr "Список игнорирования:\n"
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr "%s не могу загрузить plugin \"%s\": %s\n"
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""
@@ -5497,6 +5499,14 @@ msgstr "%s DCC: не могу установить неблокирующий р
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s нет аргумента для параметра \"%s\"\n"
 
+#, fuzzy
+#~ msgid "text color for nick name in input line"
+#~ msgstr "цвет ников"
+
+#, fuzzy
+#~ msgid "text color for nicklist separator"
+#~ msgstr "цвет разделителя ников"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "сервер"

po/weechat.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-25 10:20+0200\n"
+"POT-Creation-Date: 2009-08-09 12:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -832,7 +832,7 @@ msgid ""
 "         tags: comma separated list of tags, for example: \"irc_join,"
 "irc_part,irc_quit\"\n"
 "        regex: regular expression to search in line (use \\t to separate "
-"prefix from message)\n"
+"prefix from message, special chars like '|' must be escaped: '\\|')\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1283,6 +1283,9 @@ msgid ""
 "100 means one page, 50 half-page)"
 msgstr ""
 
+msgid "alert user when text sought is not found in buffer"
+msgstr ""
+
 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 
@@ -1429,9 +1432,6 @@ msgstr ""
 msgid "text color for buffer with new data (status bar)"
 msgstr ""
 
-msgid "text color for nick name in input line"
-msgstr ""
-
 msgid "text color for unsucessful text search in input line"
 msgstr ""
 
@@ -1462,9 +1462,6 @@ msgstr ""
 msgid "text color for '+' when scrolling nicks in nicklist"
 msgstr ""
 
-msgid "text color for nicklist separator"
-msgstr ""
-
 msgid ""
 "default completion template (please see documentation for template codes and "
 "values)"
@@ -2035,7 +2032,7 @@ msgstr ""
 msgid "%s%s: error creating aspell dictionary \"%s\" => \"%s\""
 msgstr ""
 
-msgid "color used for mispelled words"
+msgid "color used for misspelled words"
 msgstr ""
 
 msgid ""
@@ -2046,7 +2043,7 @@ msgstr ""
 msgid ""
 "default dictionary (or comma separated list of dictionaries) to use when "
 "buffer has no dictionary defined (leave blank to disable aspell on buffers "
-"for which you didn't explicitely enabled it)"
+"for which you didn't explicitly enabled it)"
 msgstr ""
 
 msgid "check words during text search in buffer"
@@ -2642,7 +2639,7 @@ msgstr ""
 msgid "join a channel"
 msgstr ""
 
-msgid "channel[,channel] [key[,key]]"
+msgid "[channel[,channel] [key[,key]]]"
 msgstr ""
 
 msgid ""
@@ -4056,6 +4053,12 @@ msgstr ""
 msgid "%sError: unable to load plugin \"%s\": %s"
 msgstr ""
 
+#, c-format
+msgid ""
+"%sIf you're trying to load a script and not a C plugin, try command to load "
+"scripts (/perl, /python, ...)"
+msgstr ""
+
 #, c-format
 msgid "%sError: symbol \"%s\" not found in plugin \"%s\", failed to load"
 msgstr ""

src/core/wee-command.c

@@ -4075,7 +4075,8 @@ command_init ()
                      "         tags: comma separated list of tags, for "
                      "example: \"irc_join,irc_part,irc_quit\"\n"
                      "        regex: regular expression to search in "
-                     "line (use \\t to separate prefix from message)\n\n"
+                     "line (use \\t to separate prefix from message, special "
+                     "chars like '|' must be escaped: '\\|')\n\n"
                      "The default key alt+'=' toggles filtering on/off.\n\n"
                      "Examples:\n"
                      "  use IRC smart filter for join/part/quit messages:\n"

src/core/wee-config.c

@@ -99,6 +99,7 @@ struct t_config_option *config_look_save_config_on_exit;
 struct t_config_option *config_look_save_layout_on_exit;
 struct t_config_option *config_look_scroll_amount;
 struct t_config_option *config_look_scroll_page_percent;
+struct t_config_option *config_look_search_text_not_found_alert;
 struct t_config_option *config_look_set_title;
 
 /* config, colors section */
@@ -137,7 +138,6 @@ struct t_config_option *config_color_status_data_private;
 struct t_config_option *config_color_status_data_highlight;
 struct t_config_option *config_color_status_data_other;
 struct t_config_option *config_color_status_more;
-struct t_config_option *config_color_input_nick;
 struct t_config_option *config_color_input_text_not_found;
 struct t_config_option *config_color_input_actions;
 struct t_config_option *config_color_nicklist_group;
@@ -148,7 +148,6 @@ struct t_config_option *config_color_nicklist_prefix3;
 struct t_config_option *config_color_nicklist_prefix4;
 struct t_config_option *config_color_nicklist_prefix5;
 struct t_config_option *config_color_nicklist_more;
-struct t_config_option *config_color_nicklist_separator;
 
 /* config, completion section */
 
@@ -1410,6 +1409,11 @@ config_weechat_init_options ()
         N_("percent of screen to scroll when scrolling one page up or down "
            "(for example 100 means one page, 50 half-page)"),
         NULL, 1, 100, "100", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+    config_look_search_text_not_found_alert = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "search_text_not_found_alert", "boolean",
+        N_("alert user when text sought is not found in buffer"),
+        NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_set_title = config_file_new_option (
         weechat_config_file, ptr_section,
         "set_title", "boolean",
@@ -1717,12 +1721,6 @@ config_weechat_init_options ()
         NULL, -1, 0, "yellow", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
     /* input window */
-    config_color_input_nick = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "input_nick", "color",
-        N_("text color for nick name in input line"),
-        NULL, -1, 0, "lightcyan", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_input_text_not_found = config_file_new_option (
         weechat_config_file, ptr_section,
         "input_text_not_found", "color",
@@ -1784,12 +1782,6 @@ config_weechat_init_options ()
         N_("text color for '+' when scrolling nicks in nicklist"),
         NULL, -1, 0, "lightmagenta", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_nicklist_separator = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "nicklist_separator", "color",
-        N_("text color for nicklist separator"),
-        NULL, -1, 0, "blue", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
     
     /* completion */
     ptr_section = config_file_new_section (weechat_config_file, "completion",

src/core/wee-config.h

@@ -114,6 +114,7 @@ extern struct t_config_option *config_look_save_config_on_exit;
 extern struct t_config_option *config_look_save_layout_on_exit;
 extern struct t_config_option *config_look_scroll_amount;
 extern struct t_config_option *config_look_scroll_page_percent;
+extern struct t_config_option *config_look_search_text_not_found_alert;
 extern struct t_config_option *config_look_set_title;
 
 extern struct t_config_option *config_color_separator;
@@ -150,7 +151,6 @@ extern struct t_config_option *config_color_status_data_private;
 extern struct t_config_option *config_color_status_data_highlight;
 extern struct t_config_option *config_color_status_data_other;
 extern struct t_config_option *config_color_status_more;
-extern struct t_config_option *config_color_input_nick;
 extern struct t_config_option *config_color_input_text_not_found;
 extern struct t_config_option *config_color_input_actions;
 extern struct t_config_option *config_color_nicklist_group;
@@ -161,7 +161,6 @@ extern struct t_config_option *config_color_nicklist_prefix3;
 extern struct t_config_option *config_color_nicklist_prefix4;
 extern struct t_config_option *config_color_nicklist_prefix5;
 extern struct t_config_option *config_color_nicklist_more;
-extern struct t_config_option *config_color_nicklist_separator;
 
 extern struct t_config_option *config_completion_default_template;
 extern struct t_config_option *config_completion_nick_add_space;

src/core/wee-hook.c

@@ -1231,7 +1231,7 @@ hook_process_child (struct t_hook *hook_process)
 
 void
 hook_process_child_read (struct t_hook *hook_process, int fd,
-                         int stdout, struct t_hook **hook_fd)
+                         int out, struct t_hook **hook_fd)
 {
     char buffer[4096];
     int num_read;
@@ -1244,8 +1244,8 @@ hook_process_child_read (struct t_hook *hook_process, int fd,
             (hook_process->callback_data,
              HOOK_PROCESS(hook_process, command),
              WEECHAT_HOOK_PROCESS_RUNNING,
-             (stdout) ? buffer : NULL,
-             (stdout) ? NULL : buffer);
+             (out) ? buffer : NULL,
+             (out) ? NULL : buffer);
     }
     else if (num_read == 0)
     {

src/core/wee-hook.h

@@ -160,8 +160,8 @@ struct t_hook_fd
 /* hook process */
 
 typedef int (t_hook_callback_process)(void *data, const char *command,
-                                      int return_code, const char *stdout,
-                                      const char *stderr);
+                                      int return_code, const char *out,
+                                      const char *err);
 
 struct t_hook_process
 {

src/core/wee-utf8.c

@@ -457,10 +457,12 @@ utf8_charcasecmp (const char *string1, const char *string2)
         return (string1) ? 1 : ((string2) ? -1 : 0);
     
     wchar1 = utf8_wide_char (string1);
-    wchar1 = towlower (wchar1);
+    if ((wchar1 >= 'A') && (wchar1 <= 'Z'))
+        wchar1 += ('a' - 'A');
     
     wchar2 = utf8_wide_char (string2);
-    wchar2 = towlower (wchar2);
+    if ((wchar2 >= 'A') && (wchar2 <= 'Z'))
+        wchar2 += ('a' - 'A');
     
     return (wchar1 < wchar2) ? -1 : ((wchar1 == wchar2) ? 0 : 1);
 }

src/gui/curses/gui-curses-bar-window.c

@@ -607,7 +607,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
     
     /* move cursor if it was asked in an item content (input_text does that
        to move cursor in user input text) */
-    if (window && (gui_current_window == window)
+    if ((!window || (gui_current_window == window))
         && (bar_window->cursor_x >= 0) && (bar_window->cursor_y >= 0))
     {
         move (bar_window->cursor_y, bar_window->cursor_x);

src/gui/curses/gui-curses-window.c

@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <libgen.h>
 #include <sys/ioctl.h>
 

src/gui/gui-buffer.c

@@ -1122,6 +1122,30 @@ gui_buffer_set_pointer (struct t_gui_buffer *buffer, const char *property,
     }
 }
 
+/*
+ * gui_buffer_compute_num_displayed: compute "num_displayed" for all buffers
+ */
+
+void
+gui_buffer_compute_num_displayed ()
+{
+    struct t_gui_buffer *ptr_buffer;
+    struct t_gui_window *ptr_window;
+    
+    for (ptr_buffer = gui_buffers; ptr_buffer;
+         ptr_buffer = ptr_buffer->next_buffer)
+    {
+        ptr_buffer->num_displayed = 0;
+    }
+    
+    for (ptr_window = gui_windows; ptr_window;
+         ptr_window = ptr_window->next_window)
+    {
+        if (ptr_window->buffer)
+            ptr_window->buffer->num_displayed++;
+    }
+}
+
 /*
  * gui_buffer_add_value_num_displayed: add value to "num_displayed" variable
  *                                     for a buffer (value can be negative)
@@ -1449,7 +1473,7 @@ gui_buffer_close (struct t_gui_buffer *buffer)
     {
         (void)(buffer->close_callback) (buffer->close_callback_data, buffer);
     }
-
+    
     /* first unmerge buffer if it is merged to at least one other buffer */
     if (gui_buffer_count_merged_buffers (buffer->number) > 1)
         gui_buffer_unmerge (buffer, -1);
@@ -1839,6 +1863,8 @@ gui_buffer_merge (struct t_gui_buffer *buffer,
         ptr_buffer->number--;
     }
     
+    gui_buffer_compute_num_displayed ();
+    
     gui_window_ask_refresh (1);
     
     hook_signal_send ("buffer_merged",
@@ -1949,6 +1975,8 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number)
         ptr_buffer->number++;
     }
     
+    gui_buffer_compute_num_displayed ();
+    
     gui_window_ask_refresh (1);
     
     hook_signal_send ("buffer_unmerged",

src/gui/gui-completion.c

@@ -1536,7 +1536,7 @@ gui_completion_find_context (struct t_gui_completion *completion,
     /* look for context */
     gui_completion_free_data (completion);
     gui_completion_buffer_init (completion, completion->buffer);
-    command = ((data[0] == '/') && (data[1] != '/')) ? 1 : 0;
+    command = (data[0] == '/') ? 1 : 0;
     command_arg = 0;
     i = 0;
     while (i < pos)
@@ -1545,7 +1545,10 @@ gui_completion_find_context (struct t_gui_completion *completion,
         {
             command_arg++;
             i++;
-            while ((i < pos) && (data[i] == ' ')) i++;
+            while ((i < pos) && (data[i] == ' '))
+            {
+                i++;
+            }
             if (!completion->args)
                 completion->args = strdup (data + i);
         }
@@ -1582,23 +1585,33 @@ gui_completion_find_context (struct t_gui_completion *completion,
             {
                 i--;
                 while ((i >= 0) && (data[i] != ' '))
+                {
                     i--;
+                }
                 pos_start = i + 1;
             }
         }
         else
         {
             while ((i >= 0) && (data[i] != ' '))
+            {
                 i--;
+            }
             pos_start = i + 1;
         }
         i = pos;
         while ((i < size) && (data[i] != ' '))
+        {
             i++;
+        }
         pos_end = i - 1;
 
         if (completion->context == GUI_COMPLETION_COMMAND)
+        {
             pos_start++;
+            if (data[pos_start] == '/')
+                pos_start++;
+        }
         
         completion->base_word_pos = pos_start;
         
@@ -1607,7 +1620,9 @@ gui_completion_find_context (struct t_gui_completion *completion,
             completion->position_replace = pos_start;
             completion->base_word = malloc (pos_end - pos_start + 2);
             for (i = pos_start; i <= pos_end; i++)
+            {
                 completion->base_word[i - pos_start] = data[i];
+            }
             completion->base_word[pos_end - pos_start + 1] = '\0';
         }
     }
@@ -1620,19 +1635,27 @@ gui_completion_find_context (struct t_gui_completion *completion,
     {
         pos_start = 0;
         while ((pos_start < size) && (data[pos_start] != '/'))
+        {
             pos_start++;
+        }
         if (data[pos_start] == '/')
         {
             pos_start++;
+            if (data[pos_start] == '/')
+                pos_start++;
             pos_end = pos_start;
             while ((pos_end < size) && (data[pos_end] != ' '))
+            {
                 pos_end++;
+            }
             if (data[pos_end] == ' ')
                 pos_end--;
             
             completion->base_command = malloc (pos_end - pos_start + 2);
             for (i = pos_start; i <= pos_end; i++)
+            {
                 completion->base_command[i - pos_start] = data[i];
+            }
             completion->base_command[pos_end - pos_start + 1] = '\0';
             gui_completion_build_list (completion);
         }

src/gui/gui-line.c

@@ -1067,8 +1067,8 @@ gui_lines_print_log (struct t_gui_lines *lines)
         log_printf ("    first_line . . . . . : 0x%lx", lines->first_line);
         log_printf ("    last_line. . . . . . : 0x%lx", lines->last_line);
         log_printf ("    last_read_line . . . : 0x%lx", lines->last_read_line);
-        log_printf ("    lines_count. . . . . . : %d",  lines->lines_count);
-        log_printf ("    first_line_not_read. . : %d",  lines->first_line_not_read);
+        log_printf ("    lines_count. . . . . : %d",    lines->lines_count);
+        log_printf ("    first_line_not_read. : %d",    lines->first_line_not_read);
         log_printf ("    lines_hidden . . . . : %d",    lines->lines_hidden);
         log_printf ("    buffer_max_length. . : %d",    lines->buffer_max_length);
         log_printf ("    prefix_max_length. . : %d",    lines->prefix_max_length);

src/gui/gui-window.c

@@ -889,7 +889,14 @@ gui_window_search_restart (struct t_gui_window *window)
     if (gui_window_search_text (window))
         window->buffer->text_search_found = 1;
     else
+    {
+        if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert)
+            && window->buffer->input_buffer && window->buffer->input_buffer[0])
+        {
+            printf ("\a");
+        }
         gui_buffer_ask_chat_refresh (window->buffer, 2);
+    }
 }
 
 /*

src/gui/qt/Makefile.am

@@ -13,3 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+EXTRA_DIST = gui-qt.c \
+             gui-qt.h

src/plugins/aspell/weechat-aspell-config.c

@@ -273,7 +273,7 @@ weechat_aspell_config_init ()
     weechat_aspell_config_look_color = weechat_config_new_option (
         weechat_aspell_config_file, ptr_section,
         "color", "color",
-        N_("color used for mispelled words"),
+        N_("color used for misspelled words"),
         NULL, 0, 0, "lightred", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     
     /* check */
@@ -302,7 +302,7 @@ weechat_aspell_config_init ()
         "default_dict", "string",
         N_("default dictionary (or comma separated list of dictionaries) to "
            "use when buffer has no dictionary defined (leave blank to disable "
-           "aspell on buffers for which you didn't explicitely enabled it)"),
+           "aspell on buffers for which you didn't explicitly enabled it)"),
         NULL, 0, 0, "", NULL, 0,
         NULL, NULL, &weechat_aspell_config_change_default_dict, NULL, NULL, NULL);
     weechat_aspell_config_check_during_search = weechat_config_new_option (

src/plugins/aspell/weechat-aspell.c

@@ -608,7 +608,7 @@ weechat_aspell_string_is_simili_number (const char *word)
 
 /*
  * weechat_aspell_check_word: spell check a word
- *                            return 1 if word is ok, 0 if word is mispelled
+ *                            return 1 if word is ok, 0 if word is misspelled
  */
 
 int
@@ -814,7 +814,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
             strcpy (result + index_result, ptr_string);
             index_result += length_word;
             
-            /* add normal color (after mispelled word) */
+            /* add normal color (after misspelled word) */
             if (!word_ok)
             {
                 strcpy (result + index_result, color_normal);

src/plugins/irc/irc-channel.c

@@ -116,14 +116,22 @@ irc_channel_move_near_server (struct t_irc_server *server, int channel_type,
                     number_found = number_last_channel + 1;
                 break;
         }
-        
-        /* switch to number found */
-        if ((number_found >= 1) && (number_found != number))
+    }
+    else
+    {
+        if (weechat_config_integer (irc_config_look_server_buffer) ==
+            IRC_CONFIG_LOOK_SERVER_BUFFER_INDEPENDENT)
         {
-            snprintf (str_number, sizeof (str_number), "%d", number_found);
-            weechat_buffer_set (buffer, "number", str_number);
+            number_found = weechat_buffer_get_integer (server->buffer, "number") + 1;
         }
     }
+    
+    /* switch to number found */
+    if ((number_found >= 1) && (number_found != number))
+    {
+        snprintf (str_number, sizeof (str_number), "%d", number_found);
+        weechat_buffer_set (buffer, "number", str_number);
+    }
 }
 
 /*

src/plugins/irc/irc-command.c

@@ -1545,7 +1545,7 @@ int
 irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
                   char **argv, char **argv_eol)
 {
-    IRC_GET_SERVER(buffer);
+    IRC_GET_SERVER_CHANNEL(buffer);
     IRC_COMMAND_CHECK_SERVER("join", 1);
     
     /* make C compiler happy */
@@ -1556,7 +1556,15 @@ irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
         irc_command_join_server (ptr_server, argv_eol[1]);
     else
     {
-        IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "join");
+        if (ptr_channel && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
+            && !ptr_channel->nicks)
+        {
+            irc_command_join_server (ptr_server, ptr_channel->name);
+        }
+        else
+        {
+            IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "join");
+        }
     }
     
     return WEECHAT_RC_OK;
@@ -3822,7 +3830,7 @@ irc_command_init ()
                           "%(nicks)|%*", &irc_command_ison, NULL);
     weechat_hook_command ("join",
                           N_("join a channel"),
-                          N_("channel[,channel] [key[,key]]"),
+                          N_("[channel[,channel] [key[,key]]]"),
                           N_("channel: channel name to join\n"
                              "    key: key to join the channel"),
                           "%(irc_channels)", &irc_command_join, NULL);

src/plugins/irc/irc-display.c

@@ -40,10 +40,11 @@
 void
 irc_display_hide_password (char *string, int look_for_nickserv)
 {
-    char *pos_nickserv, *pos, *pos_pwd;
-
+    char *pos_nickserv, *pos, *pos_pwd, *pos_space;
+    int char_size;
+    
     pos = string;
-    while (1)
+    while (pos)
     {
         if (look_for_nickserv)
         {
@@ -52,9 +53,23 @@ irc_display_hide_password (char *string, int look_for_nickserv)
                 return;
             pos = pos_nickserv + 9;
             while (pos[0] == ' ')
+            {
                 pos++;
-            if ((strncmp (pos, "identify ", 9) == 0)
-                || (strncmp (pos, "register ", 9) == 0))
+            }
+            if (strncmp (pos, "identify ", 9) == 0)
+            {
+                pos_pwd = pos + 9;
+                pos_space = strchr (pos_pwd, ' ');
+                if (pos_space)
+                {
+                    pos_pwd = pos_space + 1;
+                    while (pos_pwd[0] == ' ')
+                    {
+                        pos_pwd++;
+                    }
+                }
+            }
+            else if (strncmp (pos, "register ", 9) == 0)
                 pos_pwd = pos + 9;
             else
                 pos_pwd = NULL;
@@ -62,24 +77,43 @@ irc_display_hide_password (char *string, int look_for_nickserv)
         else
         {
             pos_pwd = strstr (pos, "identify ");
-            if (!pos_pwd)
+            if (pos_pwd)
+            {
+                pos_pwd += 9;
+                pos_space = strchr (pos_pwd, ' ');
+                if (pos_space)
+                {
+                    pos_pwd = pos_space + 1;
+                    while (pos_pwd[0] == ' ')
+                    {
+                        pos_pwd++;
+                    }
+                }
+            }
+            else
+            {
                 pos_pwd = strstr (pos, "register ");
+                if (pos_pwd)
+                    pos_pwd += 9;
+            }
             if (!pos_pwd)
                 return;
-            pos_pwd += 9;
         }
 
         if (pos_pwd)
         {
             while (pos_pwd[0] == ' ')
-                pos_pwd++;
-            
-            while (pos_pwd[0] && (pos_pwd[0] != ';') && (pos_pwd[0] != ' ')
-                   && (pos_pwd[0] != '"'))
             {
-                pos_pwd[0] = '*';
                 pos_pwd++;
             }
+            
+            while (pos_pwd && pos_pwd[0] && (pos_pwd[0] != ' '))
+            {
+                char_size = weechat_utf8_char_size (pos_pwd);
+                if (char_size > 0)
+                    memset (pos_pwd, '*', char_size);
+                pos_pwd = weechat_utf8_next_char (pos_pwd);
+            }
             pos = pos_pwd;
         }
     }
@@ -90,7 +124,8 @@ irc_display_hide_password (char *string, int look_for_nickserv)
  */
 
 void
-irc_display_away (struct t_irc_server *server, const char *string1, const char *string2)
+irc_display_away (struct t_irc_server *server, const char *string1,
+                  const char *string2)
 {
     struct t_irc_channel *ptr_channel;
     
@@ -99,15 +134,16 @@ irc_display_away (struct t_irc_server *server, const char *string1, const char *
     {
         if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
         {
-            weechat_printf (ptr_channel->buffer,
-                            "%s[%s%s%s %s: %s%s]",
-                            IRC_COLOR_CHAT_DELIMITERS,
-                            IRC_COLOR_CHAT_NICK,
-                            server->nick,
-                            IRC_COLOR_CHAT,
-                            string1,
-                            string2,
-                            IRC_COLOR_CHAT_DELIMITERS);
+            weechat_printf_tags (ptr_channel->buffer,
+                                 "away_info",
+                                 "%s[%s%s%s %s: %s%s]",
+                                 IRC_COLOR_CHAT_DELIMITERS,
+                                 IRC_COLOR_CHAT_NICK,
+                                 server->nick,
+                                 IRC_COLOR_CHAT,
+                                 string1,
+                                 string2,
+                                 IRC_COLOR_CHAT_DELIMITERS);
         }
     }
 }

src/plugins/irc/irc-info.c

@@ -183,7 +183,8 @@ irc_info_get_infolist_cb (void *data, const char *infolist_name,
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
     struct t_irc_ignore *ptr_ignore;
-    char *pos_comma, *server_name;
+    char **argv;
+    int argc;
     
     /* make C compiler happy */
     (void) data;
@@ -277,53 +278,67 @@ irc_info_get_infolist_cb (void *data, const char *infolist_name,
         {
             ptr_server = NULL;
             ptr_channel = NULL;
-            pos_comma = strchr (arguments, ',');
-            if (pos_comma)
+            argv = weechat_string_split (arguments, ",", 0, 0, &argc);
+            if (argv)
             {
-                server_name = weechat_strndup (arguments, pos_comma - arguments);
-                if (server_name)
+                if (argc >= 2)
                 {
-                    ptr_server = irc_server_search (server_name);
-                    if (ptr_server)
+                    ptr_server = irc_server_search (argv[0]);
+                    if (!ptr_server)
                     {
-                        ptr_channel = irc_channel_search (ptr_server,
-                                                          pos_comma + 1);
+                        weechat_string_free_split (argv);
+                        return NULL;
                     }
-                    free (server_name);
-                }
-            }
-            if (ptr_server && ptr_channel)
-            {
-                if (pointer && !irc_nick_valid (ptr_channel, pointer))
-                    return NULL;
-                
-                ptr_infolist = weechat_infolist_new ();
-                if (ptr_infolist)
-                {
-                    if (pointer)
+                    ptr_channel = irc_channel_search (ptr_server, argv[1]);
+                    if (!ptr_channel)
                     {
-                        /* build list with only one nick */
-                        if (!irc_nick_add_to_infolist (ptr_infolist, pointer))
+                        weechat_string_free_split (argv);
+                        return NULL;
+                    }
+                    if (!pointer && (argc >= 3))
+                    {
+                        pointer = irc_nick_search (ptr_channel, argv[2]);
+                        if (!pointer)
                         {
-                            weechat_infolist_free (ptr_infolist);
+                            weechat_string_free_split (argv);
                             return NULL;
                         }
-                        return ptr_infolist;
                     }
-                    else
+                }
+                weechat_string_free_split (argv);
+                if (ptr_server && ptr_channel)
+                {
+                    if (pointer && !irc_nick_valid (ptr_channel, pointer))
+                        return NULL;
+                    
+                    ptr_infolist = weechat_infolist_new ();
+                    if (ptr_infolist)
                     {
-                        /* build list with all nicks of channel */
-                        for (ptr_nick = ptr_channel->nicks; ptr_nick;
-                             ptr_nick = ptr_nick->next_nick)
+                        if (pointer)
                         {
-                            if (!irc_nick_add_to_infolist (ptr_infolist,
-                                                           ptr_nick))
+                            /* build list with only one nick */
+                            if (!irc_nick_add_to_infolist (ptr_infolist, pointer))
                             {
                                 weechat_infolist_free (ptr_infolist);
                                 return NULL;
                             }
+                            return ptr_infolist;
+                        }
+                        else
+                        {
+                            /* build list with all nicks of channel */
+                            for (ptr_nick = ptr_channel->nicks; ptr_nick;
+                                 ptr_nick = ptr_nick->next_nick)
+                            {
+                                if (!irc_nick_add_to_infolist (ptr_infolist,
+                                                               ptr_nick))
+                                {
+                                    weechat_infolist_free (ptr_infolist);
+                                    return NULL;
+                                }
+                            }
+                            return ptr_infolist;
                         }
-                        return ptr_infolist;
                     }
                 }
             }

src/plugins/irc/irc-protocol.c

@@ -834,7 +834,7 @@ irc_protocol_cmd_notice (struct t_irc_server *server, const char *command,
             ptr_channel = irc_channel_search (server, pos_target);
             ptr_nick = irc_nick_search (ptr_channel, nick);
             weechat_printf_tags ((ptr_channel) ? ptr_channel->buffer : server->buffer,
-                                 irc_protocol_tags (command, NULL),
+                                 irc_protocol_tags (command, "notify_message"),
                                  "%s%sNotice%s(%s%s%s)%s: %s",
                                  weechat_prefix ("network"),
                                  IRC_COLOR_NOTICE,

src/plugins/irc/irc-server.c

@@ -965,7 +965,10 @@ irc_server_parse_message (const char *message, char **nick, char **host,
         *channel = NULL;
     if (arguments)
         *arguments = NULL;
-    
+
+    /* we'll use this message as example:
+       :FlashCode!n=FlashCod@host.com PRIVMSG #channel :hello!
+    */
     if (message[0] == ':')
     {
         pos2 = strchr (message, '!');
@@ -991,7 +994,8 @@ irc_server_parse_message (const char *message, char **nick, char **host,
     }
     else
         pos = message;
-    
+
+    /* pos is pointer on PRIVMSG #channel :hello! */
     if (pos && pos[0])
     {
         while (pos[0] == ' ')
@@ -1001,6 +1005,7 @@ irc_server_parse_message (const char *message, char **nick, char **host,
         pos2 = strchr (pos, ' ');
         if (pos2)
         {
+            /* pos2 is pointer on #channel :hello! */
             if (command)
                 *command = weechat_strndup (pos, pos2 - pos);
             pos2++;
@@ -1028,13 +1033,10 @@ irc_server_parse_message (const char *message, char **nick, char **host,
                     pos3 = strchr (pos2, ' ');
                     if (nick && !*nick)
                     {
-                        if (nick)
-                        {
-                            if (pos3)
-                                *nick = weechat_strndup (pos2, pos3 - pos2);
-                            else
-                                *nick = strdup (pos2);
-                        }
+                        if (pos3)
+                            *nick = weechat_strndup (pos2, pos3 - pos2);
+                        else
+                            *nick = strdup (pos2);
                     }
                     if (pos3)
                     {
@@ -1382,7 +1384,7 @@ irc_server_msgq_flush ()
     char *ptr_data, *new_msg, *ptr_msg, *pos;
     char *nick, *host, *command, *channel;
     char *msg_decoded, *msg_decoded_without_color;
-    char str_modifier[64], modifier_data[256], *ptr_chan_nick;
+    char str_modifier[64], modifier_data[256];
     
     while (irc_recv_msgq)
     {
@@ -1437,22 +1439,31 @@ irc_server_msgq_flush ()
                                                   NULL);
                         
                         /* convert charset for message */
-                        ptr_chan_nick = (channel) ? channel : nick;
-                        if (ptr_chan_nick
-                            && (!nick || !host || (strcmp (nick, host) != 0)))
+                        if (channel)
                         {
                             snprintf (modifier_data, sizeof (modifier_data),
                                       "%s.%s.%s",
                                       weechat_plugin->name,
                                       irc_recv_msgq->server->name,
-                                      ptr_chan_nick);
+                                      channel);
                         }
                         else
                         {
-                            snprintf (modifier_data, sizeof (modifier_data),
-                                      "%s.%s",
-                                      weechat_plugin->name,
-                                      irc_recv_msgq->server->name);
+                            if (nick && (!host || (strcmp (nick, host) != 0)))
+                            {
+                                snprintf (modifier_data, sizeof (modifier_data),
+                                          "%s.%s.%s",
+                                          weechat_plugin->name,
+                                          irc_recv_msgq->server->name,
+                                          nick);
+                            }
+                            else
+                            {
+                                snprintf (modifier_data, sizeof (modifier_data),
+                                          "%s.%s",
+                                          weechat_plugin->name,
+                                          irc_recv_msgq->server->name);
+                            }
                         }
                         msg_decoded = weechat_hook_modifier_exec ("charset_decode",
                                                                   modifier_data,

src/plugins/plugin.c

@@ -187,6 +187,11 @@ plugin_load (const char *filename)
                          _("%sError: unable to load plugin \"%s\": %s"),
                          gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                          full_name, dlerror());
+        gui_chat_printf (NULL,
+                         _("%sIf you're trying to load a script and not a C "
+                           "plugin, try command to load scripts (/perl, "
+                           "/python, ...)"),
+                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
         free (full_name);
         return NULL;
     }

src/plugins/scripts/lua/weechat-lua-api.c

@@ -3432,7 +3432,7 @@ weechat_lua_api_hook_fd (lua_State *L)
 int
 weechat_lua_api_hook_process_cb (void *data,
                                  const char *command, int return_code,
-                                 const char *stdout, const char *stderr)
+                                 const char *out, const char *err)
 {
     struct t_script_callback *script_callback;
     char *lua_argv[6], str_rc[32], empty_arg[1] = { '\0' };
@@ -3447,8 +3447,8 @@ weechat_lua_api_hook_process_cb (void *data,
         lua_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
         lua_argv[1] = (command) ? (char *)command : empty_arg;
         lua_argv[2] = str_rc;
-        lua_argv[3] = (stdout) ? (char *)stdout : empty_arg;
-        lua_argv[4] = (stderr) ? (char *)stderr : empty_arg;
+        lua_argv[3] = (out) ? (char *)out : empty_arg;
+        lua_argv[4] = (err) ? (char *)err : empty_arg;
         lua_argv[5] = NULL;
         
         rc = (int *) weechat_lua_exec (script_callback->script,

src/plugins/scripts/perl/weechat-perl-api.c

@@ -2886,7 +2886,7 @@ static XS (XS_weechat_api_hook_fd)
 int
 weechat_perl_api_hook_process_cb (void *data,
                                   const char *command, int return_code,
-                                  const char *stdout, const char *stderr)
+                                  const char *out, const char *err)
 {
     struct t_script_callback *script_callback;
     char *perl_argv[6], str_rc[32], empty_arg[1] = { '\0' };
@@ -2901,8 +2901,8 @@ weechat_perl_api_hook_process_cb (void *data,
         perl_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
         perl_argv[1] = (command) ? (char *)command : empty_arg;
         perl_argv[2] = str_rc;
-        perl_argv[3] = (stdout) ? (char *)stdout : empty_arg;
-        perl_argv[4] = (stderr) ? (char *)stderr : empty_arg;
+        perl_argv[3] = (out) ? (char *)out : empty_arg;
+        perl_argv[4] = (err) ? (char *)err : empty_arg;
         perl_argv[5] = NULL;
         
         rc = (int *) weechat_perl_exec (script_callback->script,

src/plugins/scripts/python/weechat-python-api.c

@@ -3050,7 +3050,7 @@ weechat_python_api_hook_fd (PyObject *self, PyObject *args)
 int
 weechat_python_api_hook_process_cb (void *data,
                                     const char *command, int return_code,
-                                    const char *stdout, const char *stderr)
+                                    const char *out, const char *err)
 {
     struct t_script_callback *script_callback;
     char *python_argv[6], str_rc[32], empty_arg[1] = { '\0' };
@@ -3065,8 +3065,8 @@ weechat_python_api_hook_process_cb (void *data,
         python_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
         python_argv[1] = (command) ? (char *)command : empty_arg;
         python_argv[2] = str_rc;
-        python_argv[3] = (stdout) ? (char *)stdout : empty_arg;
-        python_argv[4] = (stderr) ? (char *)stderr : empty_arg;
+        python_argv[3] = (out) ? (char *)out : empty_arg;
+        python_argv[4] = (err) ? (char *)err : empty_arg;
         python_argv[5] = NULL;
         
         rc = (int *) weechat_python_exec (script_callback->script,

src/plugins/scripts/ruby/weechat-ruby-api.c

@@ -3524,7 +3524,7 @@ weechat_ruby_api_hook_fd (VALUE class, VALUE fd, VALUE read, VALUE write,
 int
 weechat_ruby_api_hook_process_cb (void *data,
                                   const char *command, int return_code,
-                                  const char *stdout, const char *stderr)
+                                  const char *out, const char *err)
 {
     struct t_script_callback *script_callback;
     char *ruby_argv[6], str_rc[32], empty_arg[1] = { '\0' };
@@ -3539,8 +3539,8 @@ weechat_ruby_api_hook_process_cb (void *data,
         ruby_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
         ruby_argv[1] = (command) ? (char *)command : empty_arg;
         ruby_argv[2] = str_rc;
-        ruby_argv[3] = (stdout) ? (char *)stdout : empty_arg;
-        ruby_argv[4] = (stderr) ? (char *)stderr : empty_arg;
+        ruby_argv[3] = (out) ? (char *)out : empty_arg;
+        ruby_argv[4] = (err) ? (char *)err : empty_arg;
         ruby_argv[5] = NULL;
         
         rc = (int *) weechat_ruby_exec (script_callback->script,

src/plugins/scripts/script-api.c

@@ -887,8 +887,8 @@ script_api_hook_process (struct t_weechat_plugin *weechat_plugin,
                          int (*callback)(void *data,
                                          const char *command,
                                          int return_code,
-                                         const char *stdout,
-                                         const char *stderr),
+                                         const char *out,
+                                         const char *err),
                          const char *function,
                          const char *data)
 {

src/plugins/scripts/script-api.h

@@ -158,8 +158,8 @@ extern struct t_hook *script_api_hook_process (struct t_weechat_plugin *weechat_
                                                int (*callback)(void *data,
                                                                const char *command,
                                                                int return_code,
-                                                               const char *stdout,
-                                                               const char *stderr),
+                                                               const char *out,
+                                                               const char *err),
                                                const char *function,
                                                const char *data);
 extern struct t_hook *script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,

src/plugins/scripts/tcl/CMakeLists.txt

@@ -22,7 +22,6 @@ SET_TARGET_PROPERTIES(tcl PROPERTIES PREFIX "")
 IF(TCL_FOUND)
   SET(CMAKE_REQUIRED_INCLUDES "${TCL_INCLUDE_PATH}")
   SET(CMAKE_REQUIRED_LIBRARIES "${TCL_LIBRARY}")
-  CHECK_SYMBOL_EXISTS(Tcl_CreateNamespace tcl.h HAVE_TCL_CREATE_NS)
 
   INCLUDE_DIRECTORIES(${TCL_INCLUDE_PATH})
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${TCL_LFLAGS}")

src/plugins/scripts/tcl/weechat-tcl-api.c

@@ -3284,7 +3284,7 @@ weechat_tcl_api_hook_fd (ClientData clientData, Tcl_Interp *interp,
 int
 weechat_tcl_api_hook_process_cb (void *data,
                                  const char *command, int return_code,
-                                 const char *stdout, const char *stderr)
+                                 const char *out, const char *err)
 {
     struct t_script_callback *script_callback;
     char *tcl_argv[6], str_rc[32], empty_arg[1] = { '\0' };
@@ -3299,8 +3299,8 @@ weechat_tcl_api_hook_process_cb (void *data,
         tcl_argv[0] = (script_callback->data) ? script_callback->data : empty_arg;
         tcl_argv[1] = (command) ? (char *)command : empty_arg;
         tcl_argv[2] = str_rc;
-        tcl_argv[3] = (stdout) ? (char *)stdout : empty_arg;
-        tcl_argv[4] = (stderr) ? (char *)stderr : empty_arg;
+        tcl_argv[3] = (out) ? (char *)out : empty_arg;
+        tcl_argv[4] = (err) ? (char *)err : empty_arg;
         tcl_argv[5] = NULL;
         
         rc = (int *) weechat_tcl_exec (script_callback->script,

src/plugins/weechat-plugin.h

@@ -385,8 +385,8 @@ struct t_weechat_plugin
                                     int (*callback)(void *data,
                                                     const char *command,
                                                     int return_code,
-                                                    const char *stdout,
-                                                    const char *stderr),
+                                                    const char *out,
+                                                    const char *err),
                                     void *callback_data);
     struct t_hook *(*hook_connect) (struct t_weechat_plugin *plugin,
                                     const char *proxy,

src/plugins/xfer/xfer-network.c

@@ -101,7 +101,7 @@ xfer_network_child_read_cb (void *arg_xfer, int fd)
     if (num_read > 0)
     {
         error = NULL;
-        xfer->pos = strtol (bufpipe + 2, &error, 10);
+        xfer->pos = (unsigned long)(strtoll (bufpipe + 2, &error, 10));
         xfer->last_activity = time (NULL);
         xfer_file_calculate_speed (xfer, 0);