Version 0.3.8-rc1

The function config_file_write_internal now performs an overwrite-by-rename
(call to "rename" only) instead of calls to "unlink" then "rename".

CMakeLists.txt

@@ -33,7 +33,7 @@ ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "7")
+SET(VERSION_PATCH "8-rc1")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")

ChangeLog

@@ -1,15 +1,94 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7, 2012-02-26
+v0.3.8-rc1, 2012-05-15
 
 
+Version 0.3.8 (under dev!)
+--------------------------
+
+* core: support lines of 16 Kb long in configuration files (instead of 1 Kb)
+* core: fix crash in focus hook for nicklist (bug #36271)
+* core: fix truncated configuration files (zero-length) after system crash
+  (bug #36383)
+* core: fix display bugs and crashs with small windows (bug #36107)
+* core: convert options weechat.look.prefix_align_more and
+  weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
+* core: fix display bug with prefix when length is greater than max and prefix
+  is ending with a wide char (bug #36032)
+* core: add option weechat.look.prefix_same_nick (hide or change prefix on
+  messages whose nick is the same as previous message) (task #11965)
+* core: convert tabs to spaces in text pasted (bug #25028)
+* core: add a connection timeout for child process in hook_connect (bug #35966)
+* core: follow symbolic links when writing configuration files (.conf)
+  (task #11779)
+* core: fix lost scroll when switching to a buffer with a pending search
+* core: add support of terminal "bracketed paste mode", new options
+  weechat.look.paste_bracketed and weechat.look.paste_bracketed_timer_delay
+  (task #11316)
+* core: fix display of wide chars on last column of chat area (patch #7733)
+* api: display warning in scripts when invalid pointers (malformed strings) are
+  given to plugin API functions (warning displayed if debug for plugin is >= 1)
+* api: add list "gui_buffer_last_displayed" in hdata "buffer"
+* scripts: fix type of argument "rc" in callback of hook_process (from string to
+  integer)
+* guile: add missing function "hook_process_hashtable" in API
+* irc: update channel modes by using chanmodes from message 005 (do not send
+  extra command "MODES" to server), fix parsing of modes (bug #36215)
+* irc: add option "fakerecv" for command /server to simulate a received IRC
+  message (not documented, for debug only)
+* irc: hide everything after "identify" or "register" in messages to nickserv
+  when option irc.look.hide_nickserv_pwd is on (bug #36362)
+* irc: add option "-pending" for command /disconnect (cancel auto-reconnection
+  on servers currently reconnecting) (task #11985)
+* irc: set user modes only if target nick is self nick in message 221
+  (patch #7754)
+* irc: force the clear of nicklist when joining a channel (nicklist was not sync
+  after znc reconnection) (bug #36008)
+* irc: allow more than one nick in command /invite
+* irc: do not send command "MODE #channel" on manual /names (do it only when
+  names are received on join of channel) (bug #35930)
+* irc: do not allow the creation of two servers with same name but different
+  case (fix error when writing file irc.conf) (bug #35840)
+* irc: update away flag for nicks on manual /who
+* irc: display privmsg messages to "@#channel" and "+#channel" in channel buffer
+  (bug #35331)
+* irc: fix redirection of message when message is queued for sending on server
+* irc: add signals and tags in messages for irc notify (task #11887)
+* irc: check notify immediately when adding a nick to notify list, improve
+  first notify message for a nick (bug #35731)
+* irc: fix display of color in hostname (join/part/quit messages)
+* irc: compute hash to find nick color for nick in server message when nick
+  is not in nicklist
+* irc: add support of "external" SASL mechanism (task #11864)
+* irc: close server buffer when server is deleted
+* irc: add search for lower case nicks in option irc.look.nick_color_force
+* logger: fix charset of lines displayed in backlog when terminal charset is
+  different from UTF-8 (bug #36379)
+* logger: add colors for backlog lines and end of backlog, new options:
+  logger.color.backlog_line and logger.color.backlog_end (task #11966)
+* perl: fix compilation on OS X (bug #30701)
+* perl: fix crash on quit on OS X
+* relay: redirect some irc messages from clients to hide output (messages: mode,
+  ison, list, names, topic, who, whois, whowas, time, userhost) (bug #33516)
+* relay: add "date_printed" and "highlight" in signal "_buffer_line_added"
+  (WeeChat protocol)
+* rmodifier: add default rmodifier "quote_pass" to hide password in command
+  "/quote pass" (bug #36250)
+* rmodifier: add default rmodifier "server" to hide passwords in commands
+  /server and /connect (task #11993)
+* rmodifier: add option "release" in default rmodifier "nickserv" (used to hide
+  passwords in command "/msg nickserv") (bug #35705)
+* tcl: add missing function "hdata_char" in API
+* tcl: fix pointer sent to function hook_signal_send when type of data is
+  a pointer
+
 Version 0.3.7 (2012-02-26)
 --------------------------
 
 * core: add japanese translations
-* core: fix expand of path "~" to home of user in function string_expand_home
-  ("~/xxx" was ok, but not "~")
+* core: fix expand of path `~` to home of user in function string_expand_home
+  (`~/xxx` was ok, but not `~`)
 * core: fix memory leak when closing buffer
 * core: fix memory leak in function util_search_full_lib_name
 * core: automatically add newline char after last pasted line (when pasting many

NEWS

@@ -1,12 +1,36 @@
-WeeChat News
-============
+WeeChat Release Notes
+=====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7, 2012-02-26
+v0.3.8-rc1, 2012-05-15
 
 
+Version 0.3.8 (under dev!)
+--------------------------
+
+Important release notes:
+
+* options weechat.look.prefix_align_more and weechat.look.prefix_buffer_align_more
+  have been converted from type boolean to string:
+** if the value was on (default), new value is "+" and you can now customize
+   this char
+** if the value was off, you have to set " " (string with one space)
+* option weechat.look.paste_max_lines can now be used with value 0 to detect
+  paste with one line (only if terminal "bracketed paste mode" is enabled when
+  option 'weechat.look.paste_bracketed' is on); so now the value -1 is used
+  to disable paste detection: if your value was 0, you should set it to -1:
+** `weechat.look.paste_max_lines -1`
+* rmodifier "nickserv" has a new default regex which includes option "release"
+  for command "/msg nickserv". If you never added/changed rmodifiers, you can
+  just reset all rmodifiers (command: `/rmodifier default -yes`).
+  If you added/changed some rmodifiers, do it manually with these two commannds:
+** `/rmodifier del nickserv`
+** `/rmodifier add nickserv history_add,input_text_display 1,4* ^(/(msg|quote) +nickserv +(id|identify|ghost \S+|release \S+) +)(.*)`
+
 Version 0.3.7 (2012-02-26)
 --------------------------
 
+Important release notes:
+
 * option `scroll_unread` has been moved from command `/input` to `/window`,
   therefore default command of key alt-u has been updated. To bind key with new
   default value:

configure.in

@@ -24,10 +24,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.7, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.8-rc1, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.7])
+AM_INIT_AUTOMAKE([weechat], [0.3.8-rc1])
 LICENSE="GPL3"
 
 # Checks for programs

debian/changelog

@@ -1,3 +1,16 @@
+weechat (0.3.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.3
+  * Update debian/copyright: new year
+  * Add new doc-base files:
+    - Developer's Guide in English
+    - Relay Protocol in English
+    - Quickstart in Spanish
+  * Update Vcs-Git and Vcs-Browser fields
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 26 Feb 2012 10:32:35 +0000
+
 weechat (0.3.6-2) unstable; urgency=low
 
   * Update debian/rules to use build flags from dpkg-buildflags when it's

debian/control

@@ -5,12 +5,12 @@ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends-Indep: asciidoc (>= 8.5), source-highlight
 Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
  ruby1.9.1, ruby1.9.1-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, guile-1.8-dev, libgcrypt11-dev, libgnutls-dev, zlib1g-dev,
- libcurl4-gnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.9.2
+ tcl8.5-dev, guile-1.8-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
+ zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config
+Standards-Version: 3.9.3
 Homepage: http://weechat.org/
-Vcs-Git: git://git.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://git.debian.org/?p=users/kolter/weechat.git
+Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
+Vcs-Browser: http://anonscm.debian.org/git/users/kolter/weechat.git
 
 Package: weechat
 Architecture: all
@@ -28,7 +28,7 @@ Description: Fast, light and extensible chat client
   - 256 colors support
   - incremental text search
   - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
   - spell checking
   - highly customizable and extensible
   - and much more!
@@ -52,7 +52,7 @@ Description: Fast, light and extensible chat client - console client
   - 256 colors support
   - incremental text search
   - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
   - spell checking
   - highly customizable and extensible
   - and much more!
@@ -82,7 +82,7 @@ Description: Fast, light and extensible chat client - plugins
  .
  This package provides some plugins to enhance WeeChat. It currently
  ships the following plugins:
-  - Perl, Python, Ruby, Lua, Tcl, and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
   - Spell checking (thanks to aspell)
   - FIFO pipe for remote control
   - IRC proxy

debian/copyright

@@ -11,7 +11,7 @@ License: GPL-3+
 
 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2011, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2012, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+
 
 License: GPL-3+

debian/weechat-doc.doc-base.dev-en

@@ -2,7 +2,7 @@ Document: weechat-dev-en
 Title: WeeChat Developer's Guide (English)
 Author: Sebastien Helleu
 Abstract: This manual describes WeeChat internals and
-how to contribute to WeeChat (English version).
+ how to contribute to WeeChat (English version).
 Section: Network/Communication
 
 Format: HTML

debian/weechat-doc.doc-base.quickstart-es

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-es
+Title: WeeChat Quickstart (Spanish)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (Spanish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.es.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.es.html

debian/weechat-doc.doc-base.relay-protocol-en

@@ -2,7 +2,7 @@ Document: weechat-relay-protocol-en
 Title: WeeChat Relay Protocol (English)
 Author: Sebastien Helleu
 Abstract: This manual describes WeeChat Relay Protocol, used by
-remote GUI to communicate with Relay plugin (English version).
+ remote GUI to communicate with Relay plugin (English version).
 Section: Network/Communication
 
 Format: HTML

debian/weechat-plugins.install

@@ -1,10 +1,10 @@
 usr/lib/weechat/plugins/aspell.so
 usr/lib/weechat/plugins/fifo.so
+usr/lib/weechat/plugins/guile.so
 usr/lib/weechat/plugins/perl.so
 usr/lib/weechat/plugins/python.so
 usr/lib/weechat/plugins/ruby.so
 usr/lib/weechat/plugins/lua.so
 usr/lib/weechat/plugins/tcl.so
-usr/lib/weechat/plugins/guile.so
 usr/lib/weechat/plugins/relay.so
 usr/lib/weechat/plugins/rmodifier.so

doc/asciidoc.css

@@ -7,6 +7,9 @@ div.sectionbody {
 h5 {
     font-size: 0.95em;
 }
+tt {
+    font-family: monospace;
+}
 span.command {
     background: #EEEEFF;
     border: solid 1px #BBBBDD;

doc/de/autogen/plugin_api/completions.txt

@@ -80,7 +80,7 @@
 
 | weechat | config_options | Konfigurationsoptionen
 
-| weechat | cursor_areas | Bereiche  ("chat" oder Name einer Bar) in denen der Cursor frei bewegt werden kann
+| weechat | cursor_areas | Bereiche in denen der Cursor frei bewegt werden kann ("chat" oder Name einer Bar)
 
 | weechat | filename | Dateinamen
 

doc/de/autogen/plugin_api/hdata.txt

@@ -9,6 +9,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
+  'names_received' (integer) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -78,6 +79,7 @@
   'string' (string) +
   'timeout' (integer) +
   'command' (string) +
+  'assigned_to_command' (integer) +
   'start_time' (time) +
   'cmd_start' (hashtable) +
   'cmd_stop' (hashtable) +
@@ -286,6 +288,7 @@
   'local_variables' (hashtable) +
   'prev_buffer' (pointer, hdata: 'buffer') +
   'next_buffer' (pointer, hdata: 'buffer') |
+  'gui_buffer_last_displayed' +
   'gui_buffers' +
   'last_gui_buffer'
 
@@ -412,6 +415,7 @@
   'area_name' (pointer) +
   'area_key' (string) +
   'command' (string) +
+  'score' (integer) +
   'prev_key' (pointer, hdata: 'key') +
   'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +

doc/de/autogen/plugin_api/infolists.txt

@@ -16,7 +16,7 @@
 
 | irc | irc_server | Liste der IRC-Server | Server Pointer (optional) | Servername (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
-| logger | logger_buffer | Liste der protokollierten Buffer | Logger Pointer (optional) | -
+| logger | logger_buffer | Auflistung der protokollierten Buffer | Logger Pointer (optional) | -
 
 | lua | lua_script | Liste der Skripten | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
@@ -34,15 +34,15 @@
 
 | weechat | bar | Auflistung der Bars | Bar Pointer (optional) | Bar Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
-| weechat | bar_item | Liste der Bar-Items | Bar Item Pointer (optional) | Bar-Item Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | bar_item | Auflistung der Bar-Items | Bar Item Pointer (optional) | Bar-Item Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
-| weechat | bar_window | Liste der Bar-Fenster | Bar-Fenster Pointer (optional) | -
+| weechat | bar_window | Auflistung der Bar-Fenster | Bar-Fenster Pointer (optional) | -
 
-| weechat | buffer | Liste der Buffer | Buffer Pointer (optional) | Name des Buffers (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | buffer | Auflistung der Buffer | Buffer Pointer (optional) | Name des Buffers (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | buffer_lines | Zeilen des Buffers | Buffer Pointer | -
 
-| weechat | filter | Liste der Filter | - | Name des Filters (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | filter | Auflistung der Filter | - | Name des Filters (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -
 
@@ -54,14 +54,14 @@
 
 | weechat | nicklist | Nicks in Nickliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)
 
-| weechat | option | Liste der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | option | Auflistung der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | Name einer Erweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | url_options | Optionen für URL | - | -
 
-| weechat | window | Auflistung der Windows | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)
+| weechat | window | Auflistung der Fenster | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)
 
-| xfer | xfer | Transfer-Liste | Transfer-Pointer (optional) | -
+| xfer | xfer | Transferliste | Transferpointer (optional) | -
 
 |========================================

doc/de/autogen/plugin_api/infos.txt

@@ -32,7 +32,7 @@
 
 | weechat | date | Datum der WeeChat Kompilierung | -
 
-| weechat | dir_separator | Verzeichnis-Trennzeichen | -
+| weechat | dir_separator | Trennzeichen für Verzeichnis | -
 
 | weechat | filters_enabled | 1, falls Filter aktiviert sind | -
 
@@ -54,6 +54,6 @@
 
 | weechat | weechat_site_download | Download-Seite von WeeChat | -
 
-| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl  `/upgrade`) | -
+| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`) | -
 
 |========================================

doc/de/autogen/user/irc_commands.txt

@@ -143,11 +143,12 @@ Ziel: Servername
 [[command_irc_disconnect]]
 [command]*`disconnect`* Verbindung zu einem oder mehreren IRC-Server(n) trennen::
 ........................................
-/disconnect  [<server>|-all [<reason>]]
+/disconnect  [<server>|-all|-pending [<reason>]]
 
-server: Name des Servers zu dem die Verbindung getrennt werden soll
-  -all: Verbindung zu allen Servern trennen
-reason: Begründung der Trennung
+  server: server name to disconnect
+    -all: disconnect from all servers
+-pending: cancel auto-reconnection on servers currently reconnecting
+  reason: reason for quit
 ........................................
 
 [[command_irc_halfop]]
@@ -194,7 +195,7 @@ Ziel: Servername
 [[command_irc_invite]]
 [command]*`invite`* Jemanden in einen Channel einladen::
 ........................................
-/invite  <nick> <channel>
+/invite  <nick> [<nick>...] [<channel>]
 
    nick: Nick welcher eingeladen werden soll
 channel: Channel für den die Einladung gelten soll
@@ -315,18 +316,18 @@ Message: zu sendende Nachricht
 
 Channel-Modi:
   channel: zu ändernder Channel (standardmäßig der erste Channel)
-  o: vergebe/nehme Operator Privilegien
+  o: vergebt oder entzieht Operator Privilegien
   p: privater Channel
   s: geheimer Channel
   i: geschlossener Channel (Zutritt nur mit Einladung)
   t: nur Operatoren dürfen das Thema setzen
-  n: keine Channeln-Nachrichten von außerhalb des Channels
+  n: keine Nachrichten von außerhalb des Channels zulassen
   m: moderierter Channel (schreiben nur mit Voice)
   l: maximale Anzahl an Usern im Channel festlegen
   b: Bannmaske für zu sperrende User (in nick!ident@host-Form)
-  e: lege Ausnahmemaske fest
-  v: vergebe/nehme Voice (d.h. schreibrechte bei moderierten Channels)
-  k: lege ein Passwort für den Channel fest
+  e: legt Ausnahmemaske fest
+  v: vergibt oder entzieht Voice (d.h. Schreibrechte bei moderierten Channels)
+  k: legt ein Passwort für den Channel fest
 User-Modi:
   nick: zu ändernder Nickname
   i: User als unsichtbar kennzeichnen
@@ -337,9 +338,9 @@ User-Modi:
 Die Liste der hier dargestellten Modi ist nicht vollständig. Es sollte die Dokumentation des jeweiligen Servers zu Rate gezogen werden um alle verfügbaren Modi zu erfahren.
 
 Beispiele:
-  Schützt das Thema des Channels #weechat:
+  schützt das Thema des Channels #weechat:
     /mode #weechat +t
-  sich auf dem Server unsichtbar machen:
+  um sich auf dem Server unsichtbar machen:
     /mode nick +i
 ........................................
 
@@ -529,7 +530,7 @@ new_nick: neuer Nickname
 ........................................
 
 [[command_irc_sapart]]
-[command]*`sapart`* Zwingt einen User den/die Channel(s) zu verlassen::
+[command]*`sapart`* Zwingt einen User den oder die Channel(s) zu verlassen::
 ........................................
 /sapart  <nick> <channel>[,<channel>...]
 
@@ -538,7 +539,7 @@ channel: Name des Channels
 ........................................
 
 [[command_irc_saquit]]
-[command]*`saquit`* Zwingt einen User den Server zu verlassen, mit Begründung::
+[command]*`saquit`* Zwingt einen User den Server mit Begründung zu verlassen::
 ........................................
 /saquit  <nick> <reason>
 
@@ -555,7 +556,7 @@ reason: Grund der Abmeldung
          del|keep <server>
          deloutq|jump|raw
 
-    list: listet Server auf (Standardaufruf)
+    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
 listfull: listet Server mit detaillierten Informationen über jeden einzelnen Server auf
      add: erstellt einen neuen Server
   server: Servername, dient der internen Nutzung und zur Darstellung

doc/de/autogen/user/irc_options.txt

@@ -34,7 +34,7 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `red`)
 
 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** Beschreibung: `ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Integerwerte zwischen -1 (nicht angegeben) und 15, als Werte sind die Farbnamen oder Farbnummer von WeeChat möglich (Format ist: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt Schwarz auf jedem Hintergrund durch "darkgray" und Schwarz auf Blau durch "white,blue"; Stardard-IRC-Farben Tabelle von WeeChat: 0:weiß, 1:schwarz, 2:blau, 3:grün, 4:hellrot, 5:rot, 6:violett, 7:braun, 8:gelb, 9: hellgrün, 10:türkis, 11:helltürkis, 12:hellblau, 13:hellviolett, 14:grau, 15:weiß`
+** Beschreibung: `remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"1,-1:darkgray"`)
 
@@ -44,7 +44,7 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `green`)
 
 * [[option_irc.color.nick_prefixes]] *irc.color.nick_prefixes*
-** Beschreibung: `Farben für Nick Prefix  für das Modus-Symbol (o=op, h=halfop, v=voice, ..), Format ist: "o:color1;h:color2;v:color3" (falls ein Modus nicht gefunden wird versucht WeeChat die nächsten Modi die der Server sendet ("PREFIX"); ein spezieller Modus "*" kann als Standardfarbe genutzt werden falls kein Modus in der Liste gefunden wurde)`
+** Beschreibung: `Farben für Nick Prefix für das Modus-Symbol (o=op, h=halfop, v=voice, ..), Format ist: "o:color1;h:color2;v:color3" (falls ein Modus nicht gefunden wird versucht WeeChat die nächsten Modi die der Server sendet ("PREFIX"); ein spezieller Modus "*" kann als Standardfarbe genutzt werden falls kein Modus in der Liste gefunden wurde)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"`)
 
@@ -159,22 +159,22 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
-** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die im Channel-Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; desweiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, daß diese Option keinen direkten Einfluß auf schon geöffnete Buffer nimmt. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
+** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die im Channel-Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_pv]] *irc.look.highlight_pv*
-** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die in einem privaten Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; desweiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, daß diese Option keinen direkten Einfluß auf schon geöffnete Buffer nimmt. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
+** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die in einem privaten Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_server]] *irc.look.highlight_server*
-** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die im Serverbuffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; desweiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, daß diese Option keinen direkten Einfluß auf schon geöffnete Buffer nimmt. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
+** Beschreibung: `Durch Kommata getrennte Liste von Wörtern die im Serverbuffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_tags]] *irc.look.highlight_tags*
-** Beschreibung: `Eine durch Kommata getrennte Liste von Tags die bei einer Nachricht selbige hervorhebt (Highlight). (normalerweise trifft dies auf jede Nachricht eines Users zu, ausgenommen Nachrichten vom Server,..)`
+** Beschreibung: `Eine durch Kommata getrennte Liste von Schlagwörtern welche eine Nachricht hervorheben sollen (Highlight)  (normalerweise trifft dies auf jede Nachricht eines Users zu, ausgenommen Nachrichten vom Server,..)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"irc_privmsg,irc_notice"`)
 
@@ -224,7 +224,7 @@
 ** Werte: none, next, near_server (Standardwert: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** Beschreibung: `Erzwingt für einen Nick eine spezielle Farbe. Die mittels Streuwertfunktion aus dem Nicknamen generierte Nickfarbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2")`
+** Beschreibung: `Erzwingt für einen Nick eine spezielle Farbe. Die mittels Streuwertfunktion aus dem Nicknamen generierte Nickfarbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2"). Bei der Schreibweise der Nicks wird sowohl nach Groß- und Kleinschreibung unterschieden und ebenso kann man die Nicks nur mit Kleinbuchstaben schreiben.`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -254,12 +254,12 @@
 ** Werte: auto, never, always (Standardwert: `auto`)
 
 * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison*
-** Beschreibung: `Durch Kommata getrennte Liste von Tags die in der Nachricht von notify ausgegeben werden sollen falls sich ein Nick beim Server an- oder abmeldet (Rückgabe vom Befehl ison), zum Beispiel: "notify_highlight","notify_message" oder "notify_private"`
+** Beschreibung: `Durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen falls sich ein Nick beim Server an- oder abmeldet (Rückgabe vom Befehl ison), zum Beispiel: "notify_highlight","notify_message" oder "notify_private"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`)
 
 * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois*
-** Beschreibung: `Durch Kommata getrennte Liste von Tags die in der Nachricht von notify ausgegeben werden sollen falls ein Nick den Befehl away nutzt (Rückgabe vom Befehl whois), zum Beispiel: "notify_highlight", "notify_message" oder "notify_private"`
+** Beschreibung: `Durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen falls ein Nick den Befehl away nutzt (Rückgabe vom Befehl whois), zum Beispiel: "notify_highlight", "notify_message" oder "notify_private"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`)
 
@@ -279,7 +279,7 @@
 ** Werte: merge_with_core, merge_without_core, independent (Standardwert: `merge_with_core`)
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** Beschreibung: `Filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter im tag "irc_smart_filter" erstellt werden.`
+** Beschreibung: `Filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden.`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -374,7 +374,7 @@
 ** Werte: 0 .. 60 (Standardwert: `2`)
 
 * [[option_irc.server_default.anti_flood_prio_low]] *irc.server_default.anti_flood_prio_low*
-** Beschreibung: `Anti-Flood für weniger dringliche Inhalte: Zeit in Sekunden zwischen zwei Benutzernachrichten, die zum IRC Server versendet wurden. Beispiel: automatische CTCP Antworten. (0 = Anti-Flood deaktivieren)`
+** Beschreibung: `Anti-Flood für weniger dringliche Inhalte: Zeit in Sekunden zwischen zwei Benutzernachrichten, die zum IRC Server versendet wurden. Beispiel: automatische CTCP Antworten (0 = Anti-Flood deaktivieren).`
 ** Typ: integer
 ** Werte: 0 .. 60 (Standardwert: `2`)
 
@@ -484,9 +484,9 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** Beschreibung: `Vorrichtung zur SASL Authentifizierung`
+** Beschreibung: `Verfahren welches bei einer SASL Authentifizierung angewandt werden soll: "plain" Passwort liegt in Klarschrift vor, "dh-blowfish" Passwort wird verschlüsselt, "external" SSL Zertifikat welches auf Client Seite vorliegt`
 ** Typ: integer
-** Werte: plain, dh-blowfish (Standardwert: `plain`)
+** Werte: plain, dh-blowfish, external (Standardwert: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
 ** Beschreibung: `Passwort für SASL Authentifizierung`
@@ -494,7 +494,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_irc.server_default.sasl_timeout]] *irc.server_default.sasl_timeout*
-** Beschreibung: `Zeitüberschreitung (in Sekunden) bis zum Abbruch der SASL Authentifizierung`
+** Beschreibung: `Zeitüberschreitung bis zum Abbruch der SASL Authentifizierung (in Sekunden)`
 ** Typ: integer
 ** Werte: 1 .. 3600 (Standardwert: `15`)
 

doc/de/autogen/user/logger_options.txt

@@ -1,5 +1,15 @@
+* [[option_logger.color.backlog_end]] *logger.color.backlog_end*
+** Beschreibung: `color for line ending the backlog`
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`)
+
+* [[option_logger.color.backlog_line]] *logger.color.backlog_line*
+** Beschreibung: `color for backlog lines`
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`)
+
 * [[option_logger.file.auto_log]] *logger.file.auto_log*
-** Beschreibung: `Speichert automatisch den Inhalt eines Buffers in eine Datei (sofern das Protokollieren für den Buffer nicht deaktiviert sein sollte)`
+** Beschreibung: `speichert automatisch den Inhalt eines Buffers in eine Datei (sofern das Protokollieren für den Buffer nicht deaktiviert sein sollte)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -9,17 +19,17 @@
 ** Werte: 0 .. 3600 (Standardwert: `120`)
 
 * [[option_logger.file.info_lines]] *logger.file.info_lines*
-** Beschreibung: `Fügt eine Information in die Protokoll-Datei ein, falls die Protokollierung gestartet oder beendet wird`
+** Beschreibung: `Fügt eine Information in die Protokoll-Datei ein, wenn die Protokollierung gestartet oder beendet wird`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_logger.file.mask]] *logger.file.mask*
-** Beschreibung: `Standardmaske für Protokolldateien (Format: "Verzeichnis/zu/Datei" oder "Datei", ohne ein führendes "/", da die "Verzeichnis" Option genutzt wird um vollständige Verzeichnisstrukturen zu erstellen); lokale Buffer Variablen und Datumsspezifikationen (siehe: man strftime) sind zulässig`
+** Beschreibung: `Standardmaske für Protokolldateien (Format: "Verzeichnis/zur/Datei" oder "Datei", ohne ein führendes "/", da die "Verzeichnis" Option genutzt wird um vollständige Verzeichnisstrukturen zu erstellen); lokale Buffer Variablen und Datumsspezifikationen (siehe: man strftime) sind zulässig`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$plugin.$name.weechatlog"`)
 
 * [[option_logger.file.name_lower_case]] *logger.file.name_lower_case*
-** Beschreibung: `Benutze ausschließlich Kleinschreibung für Protokoll-Dateien`
+** Beschreibung: `Protokolldateien werden ausschließlich in Kleinschreibung erstellt`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -39,7 +49,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"%Y-%m-%d %H:%M:%S"`)
 
 * [[option_logger.look.backlog]] *logger.look.backlog*
-** Beschreibung: `maximale Anzahl der Zeilen die aus der Protokoll-Datei dargestellt werden sollen, wenn ein Buffer geöffnet wird (0 = kein Darstellung)`
+** Beschreibung: `maximale Anzahl der letzten Zeilen die aus der Protokolldatei dargestellt werden sollen, sobald ein Buffer geöffnet wird (0 = kein Darstellung)`
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `20`)
 

doc/de/autogen/user/relay_options.txt

@@ -49,7 +49,7 @@
 ** Werte: 0 .. 65535 (Standardwert: `256`)
 
 * [[option_relay.network.allowed_ips]] *relay.network.allowed_ips*
-** Beschreibung: `regulärer Ausdruck für IP Adressen die auf das Relay zugreifen dürfen (zwischen Groß- und Kleinschreibung nicht dabei nicht unterschieden. Um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden) , Beispiel:  "^(123.45.67.89|192.160.*)$"`
+** Beschreibung: `regulärer Ausdruck für IP Adressen die auf das Relay zugreifen dürfen (zwischen Groß- und Kleinschreibung nicht dabei nicht unterschieden. Um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden) , Beispiel: "^(123.45.67.89|192.160.*)$"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 

doc/de/autogen/user/weechat_commands.txt

@@ -71,8 +71,8 @@ Beispiele:
          get <property>
          <number>|<name>
 
-    list: alle geöffneten Buffer werden aufgelistet (Standardvorgabe)
-   clear: leert den Bufferinhalt. (entweder durch Angabe der entsprechenden Nummer des Buffers, -merged für zusammengefügte Buffer, -all für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht)
+    list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
+   clear: leert den Inhalt des Buffers (entweder durch Angabe der entsprechenden Nummer des Buffers oder "-merged " für zusammengefügte Buffer oder "-all" für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht)
     move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1)
    merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht ein Mix aus beiden Buffern
          (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden)
@@ -188,61 +188,61 @@ Beispiele:
 infolists: zeigt Information über die Infolists an
    memory: gibt Informationen über den genutzten Speicher aus
     mouse: schaltet den debug-Modus für den Maus-Modus ein/aus
-     tags: zeigt für jede einzelne Zeile die dazugehörigen Tags an
+     tags: zeigt für jede einzelne Zeile die dazugehörigen Schlagwörter an
      term: gibt Informationen über das Terminal und verfügbare Farben aus
   windows: zeigt die Fensterstruktur an
 ........................................
 
 [[command_weechat_filter]]
-[command]*`filter`* Filterfunktion um Nachrichten in Buffern zu aus- oder einzublenden, dazu können Tags oder regulären Ausdrücken verwendet werden::
+[command]*`filter`* Filterfunktion um Nachrichten in Buffern aus- oder einzublenden, dazu können Schlagwörter oder reguläre Ausdrücke verwendet werden::
 ........................................
 /filter  list
          enable|disable|toggle [<name>]
          add <name> <buffer>[,<buffer>...] <tags> <regex>
          del <name>|-all
 
-   list: alle Filter auflisten
- enable: Filter wird aktiviert (Filter werden standardmäßig aktiviert)
-disable: Filter deaktivieren
- toggle: Filter de-/aktivieren
-   name: Name des Filters
-    add: Filter hinzufügen
-    del: Filter entfernen
-   -all: entfernt alle Filter
- buffer: durch Kommata getrennte Liste von Buffern in denen der Filter aktiv sein soll:
-         - ist der vollständige Name eines Buffers inklusive seiner Erweiterung (Beispiel: "irc.freenode.#weechat")
-         - "*" anwenden auf alle Buffer
-         - beginnt ein Name mit '!' wird für diesen Buffer kein Filter genutzt
-         - ein Name darf mit '*' beginnen oder enden um mehrere Buffer auszuwählen
-   tags: durch Kommata  getrennte Liste mit Tags. Zum Beispiel: "irc_join,irc_part,irc_quit"
-  regex: regulärer Ausdruck um in einer Zeile zu suchen
-         - das Präfix (z.B. Nick) wird mittels '\t' von der Nachricht getrennt. Sonderzeichen wie '|' müssen mit einer Escapesequenz : '\|' eingebunden werden)
-         - wird ein regulärer Ausdruck mit '!' eingeleitet dann wird das übereinstimmende Ergebnis umgekehrt  (nutze '\!' um mit '!' zu beginnen)
-         - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht
-         - reguläre Ausdrücke unterscheiden nicht zwischen Groß- und Kleinschreibung. Um zwischen Groß- und Kleinschreibung zu unterscheiden müssen diese mit "(?-i)" eingeleitet werden.
+   list: list all filters
+ enable: enable filters (filters are enabled by default)
+disable: disable filters
+ toggle: toggle filters
+   name: filter name
+    add: add a filter
+    del: delete a filter
+   -all: delete all filters
+ buffer: comma separated list of buffers where filter is active:
+         - this is full name including plugin (example: "irc.freenode.#weechat")
+         - "*" means all buffers
+         - a name starting with '!' is excluded
+         - name can start or end with '*' to match many 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, special chars like '|' must be escaped: '\|'
+         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
+         - two regular expressions are created: one for prefix and one for message
+         - regex are case insensitive, they can start by "(?-i)" to become case sensitive
 
-Die Tastenvoreinstellung alt+'=' schaltet die Filterfunktion an/aus.
+The default key alt+'=' toggles filtering on/off.
 
-Die am häufigsten gebrauchten Tags lauten:
-  no_filter, no_highlight, no_log, log0..log9 (log Level),
+Tags most commonly used:
+  no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx ist durch den Nicknamen zu ersetzen),
-  irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw)
+  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
+  irc_xxx (xxx is command name or number, see /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
-Mittels "/debug tags" kann man sich die Tags jeder einzelnen Zeile darstellen zu lassen.
+To see tags for lines in buffers: /debug tags
 
-Beispiele:
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten für alle Buffer:
+Examples:
+  use IRC smart filter on all buffers:
     /filter add irc_smart * irc_smart_filter *
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten der für alle Buffer genutzt wird, außer Buffer die "#weechat" im Namen tragen:
+  use IRC smart filter on all buffers except those with "#weechat" in name:
     /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filtert alle IRC join/part/quit Nachrichten:
+  filter all IRC join/part/quit messages:
     /filter add joinquit * irc_join,irc_part,irc_quit *
-  filtert Nicks wenn diese den Channel betreten oder durch den Befehl "/names:" angezeigt werden:
+  filter nicks displayed when joining channels or with /names:
     /filter add nicks * irc_366 *
-  filtert Nick "toto" im IRC Channel #weechat:
+  filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
-  filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten:
+  filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ........................................
 
@@ -253,7 +253,7 @@ Beispiele:
        <command>
        <option>
 
-    -list: zeigt alle Befehle, nach Erweiterungen sortiert (ohne Angabe von Argumente wird diese Liste ausgegeben)
+    -list: zeigt alle Befehle, nach Erweiterungen sortiert (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
 -listfull: zeigt alle Befehle mit Beschreibung, nach Erweiterung
    plugin: zeigt Befehle explizit für diese Erweiterung an
   command: Name eines Befehls
@@ -320,6 +320,8 @@ Auflistung der möglichen Funktionen:
   switch_active_buffer: springt zum nächsten zusammengefügten Buffer
   switch_active_buffer_previous: springt zum vorherigen zusammengefügten Buffer
   insert: fügt einen Text in die Eingabezeile ein
+  paste_start: Einfügen wird gestartet (bracketed paste mode)
+  paste_stop: Einfügen wird beendet (bracketed paste mode)
 
 Dieser Befehl wird sinnvollerweise mittels Tastenbelegungen oder Erweiterungen genutzt.
 ........................................
@@ -337,43 +339,44 @@ Dieser Befehl wird sinnvollerweise mittels Tastenbelegungen oder Erweiterungen g
       resetall -yes [<context>]
       missing [<context>]
 
-       list: zeigt die aktuelle Tastenbelegungen an (Standardaufruf)
-listdefault: zeigt die Standardeinstellung der Tastenbelegung an
-   listdiff: zeigt die Unterschiede zwischen der aktuell genutzten Tastaturbelegung und der Standardbelegung an (hinzugefügte/verändert/gelöschte Tastenbelegungen)
-    context: Name des Kontextes ("default" oder "search")
-       bind: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde (für Kontext  "default")
-   bindctxt: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde, dies trifft für Kontext definierte Tasten zu
-     unbind: hebt eine Tastenbelegung auf (für Kontext "default")
- unbindctxt: hebt eine Tastenbelegung für den angegebenen Kontext auf
-      reset: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt (für Kontext "default")
-  resetctxt: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt, dies trifft für den ausgewählten Kontext zu
-   resetall: die Tastenbelegung wird auf die Standardeinstellungen zurück gesetzt. Dies löscht ALLE persönlichen Tastenbelegungen (Vorsicht!)
-    missing: fügt fehlende Tastenbelegungen hinzu (dazu wird die Standardbelegung genutzt). Dies kann sinnvoll sein wenn man auf eine neue WeeChat Version umgestiegen ist
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-Falls einer Taste ein Befehl zugeordnet werden soll ist es ratsam zuerst mit der Tastenkombination alt+k (oder Esc + k) einen Fangmodus zu aktivieren um damit die neu zu belegende Taste zu greifen. Durch diesen Schritt wird der entsprechende Tasten-Code in die Befehlszeile übernommen.
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-Für Kontext "mouse" (Kontext "cursor" ist auch möglich), hat der zu verwendende Schlüssel folgendes Format: "@area:Schlüssel" oder "@area1>area2:Schlussel". "area" kann folgende Werte habe:
-          *: jedweder Bereich des Bildschirms
-       chat: Chatbereich (für jeden Buffer)
-  chat(xxx): Chatbereich für einen Buffer mit dem Namen "xxx" (vollständiger Name mit Erweiterung. Beispiel: chat(perl.iset):)
-     bar(*): beliebige Bar
-   bar(xxx): Bar mit dem Namen "xxx"
-    item(*): beliebiges Bar-Item
-  item(xxx): Bar-Item mit Namen "xxx"
-Der zu nutzende Schlüssel kann mit '*' beginnen oder enden um mehrere unterschiedliche Mausereignisse auszuwählen.
-Für den Kontext "mouse" kann ein besonderer Übergabewert für den zu nutzenden Befehl verwendet werden, "hsignal:name".  Dieses sendet das hsignal "name" und als Inhalt ein Hashtable als Argument.
-Ein weiterer Übergabewert ist "-" und kann genutzt werden um einen Schlüssel zu deaktivieren (der Schlüssel wird bei der Durchführung übersprungen).
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+The key can start or end with '*' to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-Beispiele:
-  Mit der Tastenkombination "alt-x" wird die Nicklist-Bar an-und aus geschaltet:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  Mit der Tastenkombination "alt-r" wird direkt zum IRC #weechat Buffer gewechselt:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  Die Tastenkombination "alt-r" wird auf die Standardfunktion zurückgesetzt:
+  restore default binding for key alt-r:
     /key reset meta-r
-  "Tab"-Taste nutzen um im Kontext "search" die Suche innerhalb eines Buffers zu beenden:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  Auswahl eines Nicknamens mittels mittlerem Mausknopf zeigt zusätzliche Informationen zu dem Nick an:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ........................................
 
@@ -652,7 +655,7 @@ Beispiele:
          swap [-window <number>] [up|down|left|right]
          zoom[-window <number>]
 
-         list: listet die geöffneten Fenster (ohne Angabe von Parametern wird diese Funktion aufgerufen)
+         list: listet die geöffneten Fenster (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
            -1: springt zum vorherigen Fenster
            +1: springt zum nächsten Fenster
            b#: springt zum nächsten Fenster, welches die Buffer Nummer # besitzt

doc/de/autogen/user/weechat_options.txt

@@ -134,7 +134,7 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `brown`)
 
 * [[option_weechat.color.chat_tags]] *weechat.color.chat_tags*
-** Beschreibung: `Textfarbe für die Anzeige der Tags nach der jeweiligen Nachricht (wird durch den Befehl "/debug tags" angezeigt)`
+** Beschreibung: `Textfarbe in der die Schlagwörter, die nach der jeweiligen Nachricht angezeigt werden, dargestellt werden sollen (wird durch den Befehl "/debug tags" angezeigt)`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `red`)
 
@@ -194,22 +194,22 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `blue`)
 
 * [[option_weechat.color.status_count_highlight]] *weechat.color.status_count_highlight*
-** Beschreibung: `Farbe für die Anzahl der Highlight-Nachrichten die in der Hotlist  (Statusbar) dargestellt werden.`
+** Beschreibung: `Farbe für die Anzahl der Highlight-Nachrichten die in der Hotlist (Statusbar) dargestellt werden.`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `magenta`)
 
 * [[option_weechat.color.status_count_msg]] *weechat.color.status_count_msg*
-** Beschreibung: `Farbe für die Anzahl der Nachrichten die in der Hotlist  (Statusbar) dargestellt werden.`
+** Beschreibung: `Farbe für die Anzahl der Nachrichten die in der Hotlist (Statusbar) dargestellt werden.`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `brown`)
 
 * [[option_weechat.color.status_count_other]] *weechat.color.status_count_other*
-** Beschreibung: `Farbe für die Anzahl aller anderen Nachrichten die in der Hotlist  (Statusbar) dargestellt werden.`
+** Beschreibung: `Farbe für die Anzahl aller anderen Nachrichten die in der Hotlist (Statusbar) dargestellt werden.`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)
 
 * [[option_weechat.color.status_count_private]] *weechat.color.status_count_private*
-** Beschreibung: `Farbe für die Anzahl der privaten Nachrichten die in der Hotlist  (Statusbar) dargestellt werden.`
+** Beschreibung: `Farbe für die Anzahl der privaten Nachrichten die in der Hotlist (Statusbar) dargestellt werden.`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `green`)
 
@@ -264,7 +264,7 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)
 
 * [[option_weechat.completion.base_word_until_cursor]] *weechat.completion.base_word_until_cursor*
-** Beschreibung: `Ist diese Option aktiviert beginnt eine Vervollständigung an der aktuellen Position des Cursors; andernfalls beginnt eine Vervollständigung erst wenn ein Leerzeichen als Trennung zum nächsten Wort vorhanden ist`
+** Beschreibung: `Ist diese Option aktiviert beginnt eine Vervollständigung an der aktuellen Position des Cursors; andernfalls beginnt eine Vervollständigung erst sobald ein Leerzeichen als Trennung zum nächsten Wort vorhanden ist`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -279,7 +279,7 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.completion.nick_completer]] *weechat.completion.nick_completer*
-** Beschreibung: `Nach Nick-Vervollständigung anzufügende Zeichenfolge`
+** Beschreibung: `string inserted after nick completion (when nick is first word on command line)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `":"`)
 
@@ -324,7 +324,7 @@
 ** Werte: 0 .. 2147483647 (Standardwert: `5`)
 
 * [[option_weechat.history.max_buffer_lines_minutes]] *weechat.history.max_buffer_lines_minutes*
-** Beschreibung: `maximale Anzahl in Minuten wie Lange die Zeilen m Verlaufspeicher pro Buffer gehalten werden sollen (0 = unbegrenzt, Beispiele: 1440 = einen Tag, 10080 = eine Woche, 43200 = einen Monat, 525600 = ein Jahr)`
+** Beschreibung: `maximale Anzahl, in Minuten, wie Lange die Zeilen im Verlaufspeicher, pro Buffer, gehalten werden sollen (0 = unbegrenzt, Beispiele: 1440 = einen Tag, 10080 = eine Woche, 43200 = einen Monat, 525600 = ein Jahr)`
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `0`)
 
@@ -339,7 +339,7 @@
 ** Werte: 0 .. 2147483647 (Standardwert: `100`)
 
 * [[option_weechat.history.max_visited_buffers]] *weechat.history.max_visited_buffers*
-** Beschreibung: `maximale Anzahl an besuchten Buffern welche im Speicher gehalten werden sollen`
+** Beschreibung: `maximale Anzahl an besuchten Buffern, welche im Speicher gehalten werden sollen`
 ** Typ: integer
 ** Werte: 0 .. 1000 (Standardwert: `50`)
 
@@ -429,7 +429,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.look.confirm_quit]] *weechat.look.confirm_quit*
-** Beschreibung: `ist diese Option aktiviert,  muss der "/quit" Befehl mit der Option "-yes" ausgeführt werden (siehe /help quit)`
+** Beschreibung: `ist diese Option aktiviert, muss der "/quit" Befehl mit der Option "-yes" ausgeführt werden (siehe /help quit)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
@@ -454,7 +454,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** Beschreibung: `Suchmuster (regulärer Ausdrück) welches genutzt werden soll um zu überprüfen ob eine Nachricht ein Highlight enthält oder nicht. Mindestens eine Zeichenkette muss dabei auf das Suchmuster passen (alphanumerisch, "-", "_" oder "|"), das Suchmuster unterscheidet dabei nicht zwischen Groß-und Kleinschreibung (um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden). Beispiele:  "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** Beschreibung: `Suchmuster (regulärer Ausdrück) welches genutzt werden soll um zu überprüfen ob eine Nachricht ein Highlight enthält oder nicht. Mindestens eine Zeichenkette muss dabei auf das Suchmuster passen (alphanumerisch, "-", "_" oder "|"), das Suchmuster unterscheidet dabei nicht zwischen Groß-und Kleinschreibung (um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden). Beispiele: "flashcode|flashy", "(?-i)FlashCode|flashy"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -578,10 +578,20 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
-* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
-** Beschreibung: `maximale Anzahl der Zeilen die eingefügt werden dürfen ohne dass der Anwender gefragt wird (0 = schaltet diese Funktion ab)`
+* [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
+** Beschreibung: `aktiviert den "bracketed paste mode" des Terminals (wird nicht durch alle Terminals/Multiplexer unterstützt): Dieser Modus erlaubt das Einfügen von Steuersequenzen die in Klammern gesetzt sind.WeeChat kann dadurch ermitteln ob ein Text eingefügt oder geschrieben wurde ("ESC[200~", followed by the pasted text, followed by "ESC[201~")`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
+* [[option_weechat.look.paste_bracketed_timer_delay]] *weechat.look.paste_bracketed_timer_delay*
+** Beschreibung: `erzwingt beim Einfügen von Steuersequenzen, nach einer vorgegeben Zeit (in Sekunden), dessen Ende sofern die Steuersequenz zum Beenden ("ESC[201~") nicht innerhalb dieser Zeitvorgabe empfangen wurde`
 ** Typ: integer
-** Werte: 0 .. 2147483647 (Standardwert: `3`)
+** Werte: 1 .. 60 (Standardwert: `10`)
+
+* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
+** Beschreibung: `maximale Anzahl an Zeilen die eingefügt werden dürfen, ohne dass der Anwender gefragt wird (-1 = schaltet diese Funktion ab)`
+** Typ: integer
+** Werte: -1 .. 2147483647 (Standardwert: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
 ** Beschreibung: `Präfix für Action-Nachrichten`
@@ -604,9 +614,9 @@
 ** Werte: 0 .. 128 (Standardwert: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** Beschreibung: `Anzeige eines '+' falls das Präfix abgeschnitten ist`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
+** Beschreibung: `char to display if prefix is truncated (must be exactly one char on screen)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** Beschreibung: `Einstellung des Präfix für den Buffer-Namen falls viele Buffer zu einem Buffer zusammengefügt wurden (keine = none, links = left, rechts = right (Standardwert))`
@@ -619,9 +629,9 @@
 ** Werte: 0 .. 128 (Standardwert: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** Beschreibung: `Stellt das Symbol '+' dar falls der Buffername gekürzt wurde (wenn mehrere Buffer zusammengefügt wurden und diese somit die selbe Nummer besitzen)`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
+** Beschreibung: `char to display if buffer name is truncated (when many buffers are merged with same number) (must be exactly one char on screen)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** Beschreibung: `Präfix für Fehlermeldungen`
@@ -643,6 +653,11 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"<--"`)
 
+* [[option_weechat.look.prefix_same_nick]] *weechat.look.prefix_same_nick*
+** Beschreibung: `prefix displayed for a message with same nick as previous message: use a space " " to hide prefix, another string to display this string instead of prefix, or an empty string to disable feature (display prefix)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_weechat.look.prefix_suffix]] *weechat.look.prefix_suffix*
 ** Beschreibung: `Nach dem Präfix anzufügende Zeichenfolge`
 ** Typ: Zeichenkette
@@ -713,18 +728,23 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
+** Beschreibung: `Zeitüberschreitung (in Sekunden) für eine Verbindung zu einem entfernten Rechner (mittels einem Kindprozess)`
+** Typ: integer
+** Werte: 1 .. 2147483647 (Standardwert: `60`)
+
 * [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
 ** Beschreibung: `Datei beinhaltet die digitalen Zertifikate ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"/etc/ssl/certs/ca-certificates.crt"`)
 
 * [[option_weechat.network.gnutls_handshake_timeout]] *weechat.network.gnutls_handshake_timeout*
-** Beschreibung: `Zeitüberschreitung (in Sekunden) für gnutls handshake`
+** Beschreibung: `Zeitüberschreitung für gnutls handshake (in Sekunden)`
 ** Typ: integer
 ** Werte: 1 .. 2147483647 (Standardwert: `30`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** Beschreibung: `Eine durch Kommata getrennte Liste der Erweiterungen die beim Programmstart automatisch geladen werden sollen, "*" lädt alle gefundenen Erweiterungen. Beginnt der Name hingegen mit "!" wird die Erweiterung nicht geladen. Suchmuster können mit einem Joker ("*") beginnen oder enden um mehrere Erweiterungen zu laden (Beispiele: "*" oder "*,!lua,!tcl")`
+** Beschreibung: `Eine durch Kommata getrennte Liste der Erweiterungen, die beim Programmstart automatisch geladen werden sollen; "*" lädt alle vorhandenen Erweiterungen. Beginnt der Name hingegen mit "!" wird die Erweiterung nicht geladen. Suchmuster können mit einem Joker ("*") beginnen oder enden, um mehrere Erweiterungen zu laden (Beispiele: "*" oder "*,!lua,!tcl")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)
 
@@ -734,7 +754,7 @@
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_weechat.plugin.extension]] *weechat.plugin.extension*
-** Beschreibung: `Durch Kommata getrennte Liste von Dateinamenerweiterungen welche für die Erweiterungen genutzt werden sollen`
+** Beschreibung: `Durch Kommata getrennte Liste von Dateinamenserweiterungen, welche für die Erweiterungen genutzt werden sollen`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `".so,.dll"`)
 
@@ -744,7 +764,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"%h/plugins"`)
 
 * [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
-** Beschreibung: `Speichere Konfiguration falls Erweiterungen deinstalliert werden`
+** Beschreibung: `speichert Konfigurationen, falls Erweiterungen deinstalliert werden`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 

doc/de/autogen/user/xfer_commands.txt

@@ -7,13 +7,13 @@ Message: zu sendende Nachricht
 ........................................
 
 [[command_xfer_xfer]]
-[command]*`xfer`* Transfer-Steuerung::
+[command]*`xfer`* Kontrolle der Übertragung(en)::
 ........................................
 /xfer  [list|listfull]
 
     list: zeigt Liste der Übertragungen
 listfull: zeigt eine ausführliche Liste der Übertragungen
 
-Ohne Angabe von Argumenten wird ein Buffer, mit Übertragungsliste, geöffnet.
+Ohne Angabe von Argumenten wird der Buffer mit der Übertragungsliste geöffnet.
 ........................................
 

doc/de/autogen/user/xfer_options.txt

@@ -44,27 +44,27 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `white`)
 
 * [[option_xfer.file.auto_accept_chats]] *xfer.file.auto_accept_chats*
-** Beschreibung: `Die Annahme einer Chat-Anfrage wird automatisch akzeptiert (Vorsicht!)`
+** Beschreibung: `Eine Chat-Anfrage wird automatisch akzeptiert (Vorsicht!)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_xfer.file.auto_accept_files]] *xfer.file.auto_accept_files*
-** Beschreibung: `Die Annahme von Daten wird automatisch akzeptiert (Vorsicht!)`
+** Beschreibung: `Eine Datenübertragung wird automatisch angenommen (Vorsicht!)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_xfer.file.auto_rename]] *xfer.file.auto_rename*
-** Beschreibung: `Eingehende Dateien werden automatisch umbenannt um ein Überschreiben zu vermeiden (dabei wird dem Dateinamen  '.1', '.2', ... hinzugefügt)`
+** Beschreibung: `Eingehende Dateien werden automatisch umbenannt um ein Überschreiben zu vermeiden (dabei wird dem Dateinamen '.1', '.2', ... hinzugefügt)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_xfer.file.auto_resume]] *xfer.file.auto_resume*
-** Beschreibung: `Abgebrochene Übertragungen automatisch fortsetzen, falls die Verbindung getrennt wurde`
+** Beschreibung: `Falls eine Verbindung getrennt wurde dann wird eine abgebrochene Übertragungen automatisch fortsetzt`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_xfer.file.convert_spaces]] *xfer.file.convert_spaces*
-** Beschreibung: `Ein Leerzeichen wird in einen Unterstrich gewandelt wenn Daten versendet werden`
+** Beschreibung: `Beim Versenden von Dateien werden Leerzeichen im Dateinamen durch einen Unterstrich ersetzt`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -79,12 +79,12 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"~"`)
 
 * [[option_xfer.file.use_nick_in_filename]] *xfer.file.use_nick_in_filename*
-** Beschreibung: `Nutzt den Nick des Versenders als Präfix für Dateinamen, wenn Daten empfangen werden`
+** Beschreibung: `Beim Empfang von Dateien wird der Nickname des Versenders dem Dateinamen vorangestellt`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_xfer.look.auto_open_buffer]] *xfer.look.auto_open_buffer*
-** Beschreibung: `öffnet automatisch den Übertragungs-Buffer falls eine neue Übertragung hinzugefügt wird`
+** Beschreibung: `öffnet automatisch den Buffer für Übertragungen falls eine neue Übertragung hinzugefügt wird`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -99,7 +99,7 @@
 ** Werte: 1024 .. 102400 (Standardwert: `65536`)
 
 * [[option_xfer.network.fast_send]] *xfer.network.fast_send*
-** Beschreibung: `Wartet beim Versenden von Dateien nicht auf das Bestätigungssignal (ACK)`
+** Beschreibung: `Wartet beim Versenden von Dateien nicht auf ein Bestätigungssignal (ACK)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -109,17 +109,17 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_xfer.network.port_range]] *xfer.network.port_range*
-** Beschreibung: `Schränkt den ausgehenden Datenversand bzw. Chats auf die ausschließliche Nutzung von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) (Syntax: ein einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. 5000-5015. Es wird empfohlen Ports zu nutzen welche Größer als 1024 sind. Denn nur der User "root" kann auf den Port-Bereich <1024 zugreifen)`
+** Beschreibung: `schränkt den ausgehenden Datenversand bzw. die Chats auf die ausschließliche Nutzung von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) (Syntax: ein einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. 5000-5015. Es wird empfohlen Ports zu nutzen welche Größer als 1024 sind. Denn nur der User "root" kann auf den Port-Bereich <1024 zugreifen)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_xfer.network.speed_limit]] *xfer.network.speed_limit*
-** Beschreibung: `Begrenzung der Übertragungsgeschwindigkeit beim Versenden, in Kilo-Bytes pro Sekunde (0 = keine Begrenzung)`
+** Beschreibung: `Begrenzung der Übertragungsgeschwindigkeit beim Versenden, in Kilobytes pro Sekunde (0 = keine Begrenzung)`
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `0`)
 
 * [[option_xfer.network.timeout]] *xfer.network.timeout*
-** Beschreibung: `Zeitüberschreitung bei Transfer-Anfrage (in Sekunden)`
+** Beschreibung: `Zeitüberschreitung bei Transferanfrage (in Sekunden)`
 ** Typ: integer
 ** Werte: 5 .. 2147483647 (Standardwert: `300`)
 

doc/de/weechat_faq.de.txt

@@ -277,6 +277,7 @@ die Ausrichtung der Nicknamen entfernen:
 ----------------------------------------
 /set weechat.bar.nicklist.position top
 /set weechat.look.prefix_align none
+/set weechat.look.align_end_of_lines time
 ----------------------------------------
 
 Ab der WeeChat Version ≥ 0.3.6, kann die Option "eat_newline_glitch" aktiviert

doc/de/weechat_scripting.de.txt

@@ -99,7 +99,7 @@ Argumente:
 * 'version': Version des Skripts (String)
 * 'license': Lizenz für das Skripts (String)
 * 'description': kurze Beschreibung des Skripts (String)
-* 'shutdown_function': Name der Funktion die beim Beenden des Skripts aufgerufen werden soll (String)
+* 'shutdown_function': Name der Funktion die beim Beenden des Skripts aufgerufen werden soll (String, optional)
 * 'charset': Skript Zeichensatz (optional, liegt das Skript im UTF-8 Format vor kann dieser Wert
   leer bleiben. UTF-8 ist der Standardzeichensatz) (String)
 
@@ -391,7 +391,7 @@ Liste der Konstanten in Skript API:
   WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
   WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
   WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
 | hook Signal         |
   WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================

doc/de/weechat_user.de.txt

@@ -14,7 +14,7 @@ Einleitung
 ----------
 
 WeeChat (Wee Enhanced Environment for Chat) ist ein freier, schneller und
-schlanker Chat-Client der für viele Betriebssysteme entwickelt wird.
+schlanker Chat-Client der für unterschiedliche Betriebssysteme entwickelt wird.
 
 [[features]]
 Funktionen
@@ -22,8 +22,8 @@ Funktionen
 
 wesentliche Merkmale:
 
-* Multi-Protokoll fähig (IRC, Jabber)
-* Multi-Server Verbindungen (mittels SSL, IPv6, proxy)
+* mehrere Protokolle werden unterstützt (IRC, Jabber)
+* mehrere Server Verbindungen sind möglich (mittels SSL, IPv6, proxy)
 * klein, schnell und schlank
 * den eigenen persönlichen Bedürfnissen anpassbar und durch Erweiterungen und Skripten in der Funktionalität erweiterbar
 * IRC RFCs konform http://www.ietf.org/rfc/rfc1459.txt[1459],
@@ -45,7 +45,7 @@ Um WeeChat zu installieren wird folgendes benötigt:
 * ein laufendes GNU/Linux System (mit Kompilierungswerkzeugen für Quellpakete),
   oder ein kompatibles OS
 * 'root' Privilegien (um WeeChat im Systemverzeichnis zu installieren)
-* ncurses library
+* ncurses Bibliothek
 
 
 [[install]]
@@ -70,7 +70,7 @@ Binärpakete sind für folgende Distributionen erhältlich:
 zusätzliche Pakete können/sollten installiert werden. Zum Beispiel: weechat-plugins.
 
 Für andere Distributionen schauen Sie bitte in die jeweilige Anleitung,
-wie Pakete zu installieren sind.
+wie Pakete installiert werden können.
 
 [[source_package]]
 Quellpakete
@@ -103,7 +103,7 @@ welche Pakete optional genutzt werden können.
 | tcl-dev                | ≥ 8.5       |          | tcl Erweiterung
 | guile-1.8-dev          |             |          | guile (scheme) Erweiterung
 | asciidoc               | ≥ 8.5.0     |          | erstellt Dokumentation (HTML Dateien)
-| source-highlight       |             |          | Syntax highlight für Quelltext in HTML Dokumentation
+| source-highlight       |             |          | Syntax Highlight für Quelltext in HTML Dokumentation
 |========================================
 
 [NOTE]
@@ -111,8 +111,9 @@ welche Pakete optional genutzt werden können.
 können für andere Distributionen abweichend sein. +
 ^(2)^ WeeChat kann auch mit libncurses5-dev kompiliert werden. Dies wird aber *NICHT* empfohlen (es
 treten dabei Darstellungsfehler mit breiten Zeichen auf). +
-^(3)^ WeeChat kann mit Python 3.x kompiliert werden. Es wird aber empfohlen die Python Version
-2.7 zu nutzen (alle Skripten sind funktionstüchtig unter Version 2.x, aber nicht unter Version 3.x).
+// TRANSLATION MISSING
+^(3)^ Recommended Python version is 2.7 (all scripts run fine with version 2.7,
+but not with versions ≤ 2.6 or ≥ 3.0).
 
 [[compile_with_cmake]]
 Kompilieren mit cmake
@@ -183,7 +184,7 @@ Folgen Sie bitte der Anleitung zur Erstellung aus Quellpaketen (siehe <<source_p
 Abstürze melden
 ~~~~~~~~~~~~~~~
 
-Falls es zu einem Absturz von WeeChat gekommen ist und Sie diesen Fehler melden wollen:
+Falls es zu einem Absturz von WeeChat gekommen ist und Sie diesen Fehler melden möchten:
 
 * kompilieren Sie WeeChat mit Debug-Information (oder installieren Sie das Binärpaket mit Debug-Information)
 * aktivieren Sie 'core' Dateien auf Ihrem System
@@ -1385,17 +1386,19 @@ Für weiterreichende Informationen lesen Sie bitte: http://www.oftc.net/oftc/Nic
 SASL Authentifizierung
 ^^^^^^^^^^^^^^^^^^^^^^
 
-WeeChat unterstützt zwei Möglichkeiten der SASL Authentifizierung:
-"plain" (standard) oder "dh-blowfish" (verschlüsseltes Passwort).
+WeeChat unterstützt drei mögliche Verfahren bei einer SASL Authentifikation:
+"plain" (Passwort liegt in Klarschrift vor), "dh-blowfish" (Passwort wird verschlüsselt)
+oder "external" (SSL Zertifikat welches auf Client Seite vorliegt)
 
 Optionen für Server sind:
 
-* 'sasl_mechanism': Mechanismus welcher genutzt werden soll ("plain" oder "dh-blowfish")
-* 'sasl_timeout': Zeitüberschreitung (in Sekunden) für Authentifizierung
+* 'sasl_mechanism': Mechanismus welcher genutzt werden soll ("plain",
+  "dh-blowfish" oder "external")
+* 'sasl_timeout': Zeitüberschreitung für Authentifizierung (in Sekunden)
 * 'sasl_username': Username (Nickname)
 * 'sasl_password': Passwort
 
-Soll "dh-blowfish" standardmäßig auf allen Servern genutzt werden:
+Soll "dh-blowfish" standardmäßig auf allen Servern angewandt werden:
 
 ----------------------------------------
 /set irc.server_default.sasl_mechanism dh-blowfish
@@ -2062,13 +2065,15 @@ Paket Ersteller::
     Emmanuel Bouthenot (kolter), Julien Louis (ptitlouis), Odin
 
 Übersetzungen::
-    Jiri Golembiovsky, soltys, Nils Görs, rettub, Frank Zacharias,
-    Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi, Marco Paolone,
-    Ivan Sichmann Freitas, Lázaro A.
+    Jiri Golembiovsky (GolemJ), soltys, Nils Görs (nils_2), rettub,
+    Frank Zacharias, Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi,
+    Marco Paolone, Ivan Sichmann Freitas, Lázaro A., Ryuunosuke Ayanokouzi,
+    Quico Noizeux
 
 Patches::
     Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
-    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n
+    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
+    Quentin Glidic (SardemFF7), Simon Kuhnle, Mateusz Poszwa
 
 
 [[support]]

doc/en/autogen/plugin_api/hdata.txt

@@ -9,6 +9,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
+  'names_received' (integer) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -78,6 +79,7 @@
   'string' (string) +
   'timeout' (integer) +
   'command' (string) +
+  'assigned_to_command' (integer) +
   'start_time' (time) +
   'cmd_start' (hashtable) +
   'cmd_stop' (hashtable) +
@@ -286,6 +288,7 @@
   'local_variables' (hashtable) +
   'prev_buffer' (pointer, hdata: 'buffer') +
   'next_buffer' (pointer, hdata: 'buffer') |
+  'gui_buffer_last_displayed' +
   'gui_buffers' +
   'last_gui_buffer'
 
@@ -412,6 +415,7 @@
   'area_name' (pointer) +
   'area_key' (string) +
   'command' (string) +
+  'score' (integer) +
   'prev_key' (pointer, hdata: 'key') +
   'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +

doc/en/autogen/user/irc_commands.txt

@@ -143,11 +143,12 @@ target: server name
 [[command_irc_disconnect]]
 [command]*`disconnect`* disconnect from one or all IRC servers::
 ........................................
-/disconnect  [<server>|-all [<reason>]]
+/disconnect  [<server>|-all|-pending [<reason>]]
 
-server: server name to disconnect
-  -all: disconnect from all servers
-reason: reason for quit
+  server: server name to disconnect
+    -all: disconnect from all servers
+-pending: cancel auto-reconnection on servers currently reconnecting
+  reason: reason for quit
 ........................................
 
 [[command_irc_halfop]]
@@ -194,7 +195,7 @@ target: server name
 [[command_irc_invite]]
 [command]*`invite`* invite a nick on a channel::
 ........................................
-/invite  <nick> <channel>
+/invite  <nick> [<nick>...] [<channel>]
 
    nick: nick to invite
 channel: channel to invite

doc/en/autogen/user/irc_options.txt

@@ -34,7 +34,7 @@
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `red`)
 
 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** description: `remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black on any bg to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
+** description: `remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
 ** type: string
 ** values: any string (default value: `"1,-1:darkgray"`)
 
@@ -224,7 +224,7 @@
 ** values: none, next, near_server (default value: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2")`
+** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); lookup for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option`
 ** type: string
 ** values: any string (default value: `""`)
 
@@ -484,9 +484,9 @@
 ** values: any string (default value: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** description: `mechanism for SASL authentication`
+** description: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for crypted password, "external" for authentication using client side SSL cert`
 ** type: integer
-** values: plain, dh-blowfish (default value: `plain`)
+** values: plain, dh-blowfish, external (default value: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
 ** description: `password for SASL authentication`

doc/en/autogen/user/logger_options.txt

@@ -1,3 +1,13 @@
+* [[option_logger.color.backlog_end]] *logger.color.backlog_end*
+** description: `color for line ending the backlog`
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`)
+
+* [[option_logger.color.backlog_line]] *logger.color.backlog_line*
+** description: `color for backlog lines`
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`)
+
 * [[option_logger.file.auto_log]] *logger.file.auto_log*
 ** description: `automatically save content of buffers to files (unless a buffer disables log)`
 ** type: boolean

doc/en/autogen/user/weechat_commands.txt

@@ -226,7 +226,7 @@ The default key alt+'=' toggles filtering on/off.
 Tags most commonly used:
   no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx is nick in message),
+  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
   irc_xxx (xxx is command name or number, see /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
 To see tags for lines in buffers: /debug tags
@@ -320,6 +320,8 @@ list of actions:
   switch_active_buffer: switch to next merged buffer
   switch_active_buffer_previous: switch to previous merged buffer
   insert: insert text in command line
+  paste_start: start paste (bracketed paste mode)
+  paste_stop: stop paste (bracketed paste mode)
 
 This command is used by key bindings or plugins.
 ........................................
@@ -343,6 +345,7 @@ listdefault: list default keys
     context: name of context ("default" or "search")
        bind: bind a command to a key or display command bound to key (for context "default")
    bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
      unbind: remove a key binding (for context "default")
  unbindctxt: remove a key binding for given context
       reset: reset a key to default binding (for context "default")

doc/en/autogen/user/weechat_options.txt

@@ -279,7 +279,7 @@
 ** values: on, off (default value: `on`)
 
 * [[option_weechat.completion.nick_completer]] *weechat.completion.nick_completer*
-** description: `string inserted after nick completion`
+** description: `string inserted after nick completion (when nick is first word on command line)`
 ** type: string
 ** values: any string (default value: `":"`)
 
@@ -578,10 +578,20 @@
 ** type: boolean
 ** values: on, off (default value: `off`)
 
-* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
-** description: `max number of lines for paste without asking user (0 = disable this feature)`
+* [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
+** description: `enable terminal "bracketed paste mode" (not supported in all terminals/multiplexers): in this mode, pasted text is bracketed with control sequences so that WeeChat can differentiate pasted text from typed-in text ("ESC[200~", followed by the pasted text, followed by "ESC[201~")`
+** type: boolean
+** values: on, off (default value: `off`)
+
+* [[option_weechat.look.paste_bracketed_timer_delay]] *weechat.look.paste_bracketed_timer_delay*
+** description: `force end of bracketed paste after this delay (in seconds) if the control sequence for end of bracketed paste ("ESC[201~") was not received in time`
 ** type: integer
-** values: 0 .. 2147483647 (default value: `3`)
+** values: 1 .. 60 (default value: `10`)
+
+* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
+** description: `max number of lines for paste without asking user (-1 = disable this feature)`
+** type: integer
+** values: -1 .. 2147483647 (default value: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
 ** description: `prefix for action messages`
@@ -604,9 +614,9 @@
 ** values: 0 .. 128 (default value: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** description: `display '+' if prefix is truncated`
-** type: boolean
-** values: on, off (default value: `on`)
+** description: `char to display if prefix is truncated (must be exactly one char on screen)`
+** type: string
+** values: any string (default value: `"+"`)
 
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** description: `prefix alignment for buffer name, when many buffers are merged with same number (none, left, right (default))`
@@ -619,9 +629,9 @@
 ** values: 0 .. 128 (default value: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** description: `display '+' if buffer name is truncated (when many buffers are merged with same number)`
-** type: boolean
-** values: on, off (default value: `on`)
+** description: `char to display if buffer name is truncated (when many buffers are merged with same number) (must be exactly one char on screen)`
+** type: string
+** values: any string (default value: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** description: `prefix for error messages`
@@ -643,6 +653,11 @@
 ** type: string
 ** values: any string (default value: `"<--"`)
 
+* [[option_weechat.look.prefix_same_nick]] *weechat.look.prefix_same_nick*
+** description: `prefix displayed for a message with same nick as previous message: use a space " " to hide prefix, another string to display this string instead of prefix, or an empty string to disable feature (display prefix)`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_weechat.look.prefix_suffix]] *weechat.look.prefix_suffix*
 ** description: `string displayed after prefix`
 ** type: string
@@ -713,6 +728,11 @@
 ** type: string
 ** values: any string (default value: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
+** description: `timeout (in seconds) for connection to a remote host (made in a child process)`
+** type: integer
+** values: 1 .. 2147483647 (default value: `60`)
+
 * [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
 ** description: `file containing the certificate authorities ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
 ** type: string

doc/en/weechat_faq.en.txt

@@ -109,9 +109,9 @@ It's common issue, please read carefully and check *ALL* solutions below:
   distributions but not all): `ldd /path/to/weechat-curses`
 * check that the "Charset" plugin is loaded with `/plugin` command (if it is
   not, then you probably need the "weechat-plugins" package)
-* check the charset line (on server buffer). You should see 'ISO-XXXXXX' or
-  'UTF-8' for terminal charset. If you see 'ANSI_X3.4-1968' or other values,
-  your locale is probably wrong.
+* check the output of command `/charset` (on core buffer). You should see
+  'ISO-XXXXXX' or 'UTF-8' for terminal charset. If you see 'ANSI_X3.4-1968' or
+  other values, your locale is probably wrong (fix your $LANG).
 * setup global decode value, for example:
   `/set charset.default.decode "ISO-8859-15"`
 * if you are using UTF-8 locale:
@@ -265,6 +265,7 @@ remove alignment on nick:
 ----------------------------------------
 /set weechat.bar.nicklist.position top
 /set weechat.look.prefix_align none
+/set weechat.look.align_end_of_lines time
 ----------------------------------------
 
 With WeeChat ≥ 0.3.6, you can enable option "eat_newline_glitch", so that

doc/en/weechat_plugin_api.en.txt

@@ -6153,7 +6153,7 @@ Examples:
 
 Return value:
 
-* string with color code, or a "reset color" code if color is not found
+* string with color code, or an empty string if color is not found
 
 C example:
 
@@ -6306,6 +6306,31 @@ Arguments:
 * 'tags': comma separated list of tags
 * 'message': message to display
 
+Tags commonly used (non-exhaustive list):
+
+[width="70%",cols="1m,4",options="header"]
+|========================================
+| Tag              | Description
+| no_filter        | Line can not be filtered
+| no_highlight     | No highlight is possible on line
+| no_log           | Line is not written in log file
+| log0 ... log9    | Level of log for line (see `/help logger`)
+| notify_none      | Buffer with line is not added to hotlist
+| notify_message   | Buffer with line is added to hotlist with level "message"
+| notify_private   | Buffer with line is added to hotlist with level "private"
+| notify_highlight | Buffer with line is added to hotlist with level "highlight"
+| nick_xxx         | Message is from nick "xxx"
+| prefix_nick_ccc  | Prefix is a nick with color "ccc"
+| irc_xxx          | IRC message "xxx" (can be a command or a 3-digits number)
+| irc_numeric      | IRC numeric message
+| irc_error        | Error from IRC server
+| irc_action       | Action from a nick (command `/me`)
+| irc_ctcp         | CTCP message
+| irc_ctcp_reply   | Reply to CTCP message
+| irc_smart_filter | IRC message that can be filtered with the "smart filter"
+| away_info        | Message with away info
+|========================================
+
 C example:
 
 [source,C]
@@ -6535,17 +6560,21 @@ struct t_hook *my_command_hook =
                           NULL);
 ----------------------------------------
 
-For example, if command called is `/command abc def ghi`, then argv and
-argv_eol contain following values:
+For example, if command called is `/command abc def ghi`, then 'argv' and
+'argv_eol' have following values:
 
 * 'argv':
-** 'argv[0]' == "abc"
-** 'argv[1]' == "def"
-** 'argv[2]' == "ghi"
+** 'argv[0]' == "/command"
+** 'argv[1]' == "abc"
+** 'argv[2]' == "def"
+** 'argv[3]' == "ghi"
 * 'argv_eol':
-** 'argv_eol[0]' == "abc def ghi"
-** 'argv_eol[1]' == "def ghi"
-** 'argv_eol[2]' == "ghi"
+** 'argv_eol[0]' == "/command abc def ghi"
+** 'argv_eol[1]' == "abc def ghi"
+** 'argv_eol[2]' == "def ghi"
+** 'argv_eol[3]' == "ghi"
+
+For scripts, 'args' has value "abc def ghi".
 
 Script (Python):
 
@@ -7090,6 +7119,7 @@ Arguments:
 *** 'WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR': GnuTLS init error
 *** 'WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR': GnuTLS handshake error
 *** 'WEECHAT_HOOK_CONNECT_MEMORY_ERROR': insufficient memory
+*** 'WEECHAT_HOOK_CONNECT_TIMEOUT': timeout
 ** 'gnutls_rc': result value of 'gnutls_handshake()'
 ** 'const char *error': result value of 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address': IP address found
@@ -7139,6 +7169,9 @@ my_connect_cb (void *data, int status, int gnutls_rc, const char *error,
         case WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
             /* ... */
             break;
+        case WEECHAT_HOOK_CONNECT_TIMEOUT:
+            /* ... */
+            break;
     }
     return WEECHAT_RC_OK;
 }
@@ -7179,6 +7212,8 @@ def my_connect_cb(data, status, gnutls_rc, error, ip_address):
         # ...
     elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
+        # ...
     return weechat.WEECHAT_RC_OK
 
 hook = weechat.hook_connect("", "my.server.org", 1234, sock, 0, "",
@@ -7380,6 +7415,31 @@ Arguments:
   - |
   ignore removed
 
+| irc | irc_notify_join +
+  (_new in version 0.3.8_) |
+  string: server name + "," + nick |
+  a nick in notify list has joined server
+
+| irc | irc_notify_quit +
+  (_new in version 0.3.8_) |
+  string: server name + "," + nick |
+  a nick in notify list has quit server
+
+| irc | irc_notify_away +
+  (_new in version 0.3.8_) |
+  string: server name + "," + nick + "," + away message |
+  a nick in notify list is now away on server
+
+| irc | irc_notify_still_away +
+  (_new in version 0.3.8_) |
+  string: server name + "," + nick + "," + away message |
+  a nick in notify list is still away on server (away message has changed)
+
+| irc | irc_notify_back +
+  (_new in version 0.3.8_) |
+  string: server name + "," + nick |
+  a nick in notify list is back (away status removed)
+
 | logger | logger_start |
   pointer: buffer |
   start logging for buffer
@@ -8575,7 +8635,7 @@ Arguments:
 
 Return value:
 
-* string modified, NULL if no changes in string were made by modifier(s)
+* string modified, NULL if error occurred
 
 C example:
 
@@ -9543,7 +9603,9 @@ Arguments:
    buffer)
 ** 'name': name of buffer
 ** 'full_name': full name of buffer ("plugin.name") (_new in version 0.3.7_)
-** 'short_name': short name of buffer
+** 'short_name': short name of buffer (note: used for display only and can be
+   changed by user, this must not be used to find name of buffer, use instead
+   'name', 'full_name' or local variable 'channel')
 ** 'title': title of buffer
 ** 'input': input text
 ** 'text_search_input': input saved before text search
@@ -10214,9 +10276,6 @@ Arguments:
 * 'parent_group': pointer to parent of group, NULL if group has no parent
   (nicklist root)
 * 'name': group name
-* 'visible':
-** '1': group and sub-groups/nicks are visible
-** '0': group and sub-groups/nicks are hidden
 * 'color': color option name:
 ** WeeChat option name, for example 'weechat.color.nicklist_group'
 ** color with optional background, for example 'yellow' or 'yellow,red'
@@ -10224,6 +10283,9 @@ Arguments:
 *** 'bar_fg': foreground color for bar
 *** 'bar_delim': delimiters color for bar
 *** 'bar_bg': background color for bar
+* 'visible':
+** '1': group and sub-groups/nicks are visible
+** '0': group and sub-groups/nicks are hidden
 
 [NOTE]
 The group name can begin with one or more digits, followed by pipe, and then
@@ -12050,7 +12112,7 @@ Script (Python):
 infolist = weechat.infolist_get(infolist_name, pointer, arguments)
 
 # example
-infolist = weechat.infolist_get("irc_server, "", "")
+infolist = weechat.infolist_get("irc_server", "", "")
 ----------------------------------------
 
 weechat_infolist_next

doc/en/weechat_relay_protocol.en.txt

@@ -466,8 +466,8 @@ WeeChat reserved identifiers:
   'number' (integer), 'full_name' (string), 'local_variables' (hashtable)
 
 | _buffer_line_added       | Line added in buffer    | line |
-  'buffer' (pointer), 'date' (time), 'displayed' (char), 'prefix' (string),
-  'message' (string)
+  'buffer' (pointer), 'date' (time), 'date_printed' (time), 'displayed' (char),
+  'highlight' (char), 'prefix' (string), 'message' (string)
 
 | _buffer_closing          | Buffer closing          | buffer |
   'number' (integer), 'full_name' (string)

doc/en/weechat_scripting.en.txt

@@ -99,7 +99,7 @@ Arguments:
 * 'version': string, script version
 * 'license': string, script license
 * 'description': string, short description of script
-* 'shutdown_function': string, name of function called when script is unloaded
+* 'shutdown_function': string, name of function called when script is unloaded (optional)
 * 'charset': string, script charset (optional, if your script is UTF-8, you
   can use blank value here, because UTF-8 is default charset)
 
@@ -385,7 +385,7 @@ List of constants in script API:
   WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
   WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
   WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
 | hook signal         |
   WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================

doc/en/weechat_user.en.txt

@@ -111,8 +111,8 @@ compile WeeChat.
 names may be different in different distributions and versions. +
 ^(2)^ WeeChat can compile with libncurses5-dev, but it is *NOT* recommended (you
 will have display bugs with wide chars). +
-^(3)^ WeeChat can compile with Python 3.x, but recommended Python version is 2.7
-(all scripts run fine with version 2.x, but not with version 3.x).
+^(3)^ Recommended Python version is 2.7 (all scripts run fine with version 2.7,
+but not with versions ≤ 2.6 or ≥ 3.0).
 
 [[compile_with_cmake]]
 Compile with cmake
@@ -1368,12 +1368,13 @@ For more information, look at http://www.oftc.net/oftc/NickServ/CertFP
 SASL authentication
 ^^^^^^^^^^^^^^^^^^^
 
-WeeChat supports SASL authentication, using two mechanisms: "plain" (default)
-or "dh-blowfish" (crypted password).
+WeeChat supports SASL authentication, using three mechanisms: "plain" (plain
+text password), "dh-blowfish" (crypted password) or "external" (client side SSL
+cert).
 
 Options in servers are:
 
-* 'sasl_mechanism': mechanism to use ("plain" or "dh-blowfish")
+* 'sasl_mechanism': mechanism to use ("plain", "dh-blowfish" or "external")
 * 'sasl_timeout': timeout (in seconds) for authentication
 * 'sasl_username': username (nick)
 * 'sasl_password': password
@@ -2032,13 +2033,15 @@ Packagers::
     Emmanuel Bouthenot (kolter), Julien Louis (ptitlouis), Odin
 
 Translations::
-    Jiri Golembiovsky, soltys, Nils Görs, rettub, Frank Zacharias,
-    Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi, Marco Paolone,
-    Ivan Sichmann Freitas, Lázaro A.
+    Jiri Golembiovsky (GolemJ), soltys, Nils Görs (nils_2), rettub,
+    Frank Zacharias, Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi,
+    Marco Paolone, Ivan Sichmann Freitas, Lázaro A., Ryuunosuke Ayanokouzi,
+    Quico Noizeux
 
 Patches::
     Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
-    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n
+    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
+    Quentin Glidic (SardemFF7), Simon Kuhnle, Mateusz Poszwa
 
 
 [[support]]

doc/fr/autogen/plugin_api/hdata.txt

@@ -9,6 +9,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
+  'names_received' (integer) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -78,6 +79,7 @@
   'string' (string) +
   'timeout' (integer) +
   'command' (string) +
+  'assigned_to_command' (integer) +
   'start_time' (time) +
   'cmd_start' (hashtable) +
   'cmd_stop' (hashtable) +
@@ -286,6 +288,7 @@
   'local_variables' (hashtable) +
   'prev_buffer' (pointer, hdata: 'buffer') +
   'next_buffer' (pointer, hdata: 'buffer') |
+  'gui_buffer_last_displayed' +
   'gui_buffers' +
   'last_gui_buffer'
 
@@ -412,6 +415,7 @@
   'area_name' (pointer) +
   'area_key' (string) +
   'command' (string) +
+  'score' (integer) +
   'prev_key' (pointer, hdata: 'key') +
   'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +

doc/fr/autogen/user/alias_commands.txt

@@ -6,7 +6,7 @@
 complétion: complétion pour l'alias (optionnel, par défaut la complétion se fait avec la commande cible)
             note: vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante
      alias: nom de l'alias (peut démarrer ou se terminer par "*" pour une liste d'alias)
-  commande: nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des point-virgules)
+  commande: nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules)
 
 Sans paramètre, cette commande liste tous les alias définis.
 

doc/fr/autogen/user/irc_commands.txt

@@ -143,11 +143,12 @@ cible: nom du serveur
 [[command_irc_disconnect]]
 [command]*`disconnect`* se déconnecter d'un ou de tous les serveurs IRC::
 ........................................
-/disconnect  [<serveur>|-all [<raison>]]
+/disconnect  [<serveur>|-all|-pending [<raison>]]
 
-serveur: nom du serveur pour se déconecter
-   -all: se déconnecter de tous les serveurs
- raison: raison pour le quit
+ serveur: nom du serveur pour se déconecter
+    -all: se déconnecter de tous les serveurs
+-pending: annuler la reconnexion automatique sur les serveurs en cours de reconnexion
+  raison: raison pour le quit
 ........................................
 
 [[command_irc_halfop]]
@@ -194,7 +195,7 @@ cible: nom du serveur
 [[command_irc_invite]]
 [command]*`invite`* inviter un pseudo sur un canal::
 ........................................
-/invite  <pseudo> <canal>
+/invite  <pseudo> [<pseudo>...] [<canal>]
 
 pseudo: pseudo à inviter
  canal: canal pour l'invitation

doc/fr/autogen/user/irc_options.txt

@@ -34,7 +34,7 @@
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `red`)
 
 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** description: `réassigner les couleurs mirc dans les messages en utilisant une hashtable: les clés sont "fg,bg" sous forme d'entiers entre -1 (non spécifié) et 15, les valeurs sont des noms de couleur WeeChat ou nombres (le format est: "1,-1:couleur1;2,7:couleur2"), exemple: "1,-1:darkgray;1,2:white,blue" pour réassigner le noir sur n'importe quel fond en "darkgray" et le noir sur bleu en "white,blue"; les couleurs WeeChat par défaut pour les codes IRC sont: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9:lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
+** description: `réassigner les couleurs mirc dans les messages en utilisant une hashtable: les clés sont "fg,bg" sous forme d'entiers entre -1 (non spécifié) et 15, les valeurs sont des noms de couleur WeeChat ou nombres (le format est: "1,-1:couleur1;2,7:couleur2"), exemple: "1,-1:darkgray;1,2:white,blue" pour réassigner le noir en "darkgray" et le noir sur bleu en "white,blue"; les couleurs WeeChat par défaut pour les codes IRC sont: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9:lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"1,-1:darkgray"`)
 
@@ -224,7 +224,7 @@
 ** valeurs: none, next, near_server (valeur par défaut: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** description: `force la couleur pour certains pseudos: le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "pseudo1:couleur1;pseudo2:couleur2")`
+** description: `force la couleur pour certains pseudos: le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "pseudo1:couleur1;pseudo2:couleur2"); la recherche de pseudos s'effectue avec la casse exacte puis en minuscules, donc il est possible d'utiliser uniquement des minuscules pour les pseudos dans cette option`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
@@ -484,9 +484,9 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** description: `mécanisme pour l'authentification SASL`
+** description: `mécanisme pour l'authentification SASL: "plain" pour un mot de passe en clair, "dh-blowfish" pour un mot de passe chiffré, "external" pour une authentification en utilisant un certificat SSL côté client`
 ** type: entier
-** valeurs: plain, dh-blowfish (valeur par défaut: `plain`)
+** valeurs: plain, dh-blowfish, external (valeur par défaut: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
 ** description: `mot de passe pour l'authentification SASL`

doc/fr/autogen/user/logger_options.txt

@@ -1,3 +1,13 @@
+* [[option_logger.color.backlog_end]] *logger.color.backlog_end*
+** description: `couleur pour la ligne de fin de l'historique`
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`)
+
+* [[option_logger.color.backlog_line]] *logger.color.backlog_line*
+** description: `couleur pour les lignes de l'historique`
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`)
+
 * [[option_logger.file.auto_log]] *logger.file.auto_log*
 ** description: `sauve automatiquement le contenu des tampons dans des fichiers (sauf si un tampon désactive le log)`
 ** type: booléen

doc/fr/autogen/user/weechat_commands.txt

@@ -226,7 +226,7 @@ La touche par défaut alt+'=' active/désactive le filtrage.
 Les tags les plus couramment utilisés:
   no_filter, no_highlight, no_log, log0..log9 (niveau de log),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx est le pseudo dans le message),
+  nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc (ccc est la couleur du pseudo),
   irc_xxx (xxx est un nom de commande ou nombre, voir /server raw),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
 Pour voir les tags des lignes affichées: /debug tags
@@ -320,6 +320,8 @@ list des actions:
   switch_active_buffer: basculer vers le tampon mélangé suivant
   switch_active_buffer_previous: basculer vers le tampon mélangé précédent
   insert: insérer du texte dans la ligne de commande
+  paste_start: début de collage (mode "bracketed paste")
+  paste_stop: fin de collage (mode "bracketed paste")
 
 Cette commande est utilisé par les associations de touches ou les extensions.
 ........................................
@@ -343,6 +345,7 @@ listdefault: afficher les touches par défaut
    contexte: nom du contexte ("default" ou "search")
        bind: associer une commande à une touche ou affiche la commande associée à la touche
    bindctxt: associer une commande à une touche ou affiche la commande associée à la touche pour le contexte donné
+   commande: commande (plusieurs commandes peuvent êtres séparées par des points-virgules)
      unbind: supprimer l'association à une touche
  unbindctxt: supprimer l'association à une touche pour le contexte donné
       reset: réinitialiser une touche à son association par défaut

doc/fr/autogen/user/weechat_options.txt

@@ -279,7 +279,7 @@
 ** valeurs: on, off (valeur par défaut: `on`)
 
 * [[option_weechat.completion.nick_completer]] *weechat.completion.nick_completer*
-** description: `chaîne affichée après la complétion des pseudos`
+** description: `chaîne insérée après la complétion du pseudo (quand le pseudo est le premier mot sur la ligne de commande)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `":"`)
 
@@ -578,10 +578,20 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)
 
-* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
-** description: `nombre maximum de lignes pour la détection de collage sans demander à l'utilisateur (0 = désactiver cette fonctionnalité)`
+* [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
+** description: `activer le mode du terminal "bracketed paste" (pas supporté par tous les terminaux/multiplexeurs): dans ce mode, le texte collé est entouré avec des séquences de contrôle de sorte que WeeChat puisse différencier le texte collé du texté tapé ("ESC[200~", suivi par le texte collé, suivi par "ESC[201~")`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `off`)
+
+* [[option_weechat.look.paste_bracketed_timer_delay]] *weechat.look.paste_bracketed_timer_delay*
+** description: `forcer la fin du "bracketed paste" après ce délai (en secondes) si la séquence de contrôle pour la fin du "bracketed paste" ("ESC[201~") n'a pas été reçue à temps`
 ** type: entier
-** valeurs: 0 .. 2147483647 (valeur par défaut: `3`)
+** valeurs: 1 .. 60 (valeur par défaut: `10`)
+
+* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
+** description: `nombre maximum de lignes pour la détection de collage sans demander à l'utilisateur (-1 = désactiver cette fonctionnalité)`
+** type: entier
+** valeurs: -1 .. 2147483647 (valeur par défaut: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
 ** description: `préfixe pour les messages d'action`
@@ -604,9 +614,9 @@
 ** valeurs: 0 .. 128 (valeur par défaut: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** description: `afficher '+' si le préfixe est tronqué`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
+** description: `caractère à afficher si le préfixe est tronqué (doit être exactement un caractère à l'écran)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"+"`)
 
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** description: `alignement de préfixe pour le nom du tampon, quand plusieurs tampons sont mélangés avec le même numéro (none, left, right (par défaut))`
@@ -619,9 +629,9 @@
 ** valeurs: 0 .. 128 (valeur par défaut: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** description: `afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont mélangés avec le même numéro)`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
+** description: `caractère à afficher si le nom du tampon est tronqué (lorsque plusieurs tampons sont mélangés avec le même numéro) (doit être exactement un caractère à l'écran)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** description: `préfixe pour les messages d'erreur`
@@ -643,6 +653,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"<--"`)
 
+* [[option_weechat.look.prefix_same_nick]] *weechat.look.prefix_same_nick*
+** description: `préfixe affiché pour un message avec le même pseudo que le précédent message: utiliser un espace " " pour cacher le préfixe, une autre chaîne pour l'afficher à la place du préfixe, ou une chaîne vide pour désactiver cette fonctionnalité (afficher le préfixe)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `""`)
+
 * [[option_weechat.look.prefix_suffix]] *weechat.look.prefix_suffix*
 ** description: `chaîne affichée après le préfixe`
 ** type: chaîne
@@ -713,6 +728,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
+** description: `délai d'attente maximum (en secondes) pour la connexion à une machine distante (effectuée dans un processus fils)`
+** type: entier
+** valeurs: 1 .. 2147483647 (valeur par défaut: `60`)
+
 * [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
 ** description: `fichier contenant les autorités de certification ("%h" sera remplacé par le répertoire de base WeeChat, par défaut: "~/.weechat")`
 ** type: chaîne

doc/fr/weechat_faq.fr.txt

@@ -113,9 +113,10 @@ points ci-dessous :
 * vérifiez que l'extension "Charset" est chargée avec la commande `/plugin`
   (s'il ne l'est pas, vous devez peut-être installer le paquet
   "weechat-plugins")
-* vérifiez la ligne charset (sur le tampon serveur), vous devriez voir
-  'ISO-XXXXXX' ou 'UTF-8' pour le charset du terminal. Si vous voyez
-  'ANSI_X3.4-1968' ou d'autres valeurs, votre locale est probablement erronée.
+* vérifiez la sortie de la commande `/charset` (sur le tampon "core"), vous
+  devriez voir 'ISO-XXXXXX' ou 'UTF-8' pour le charset du terminal. Si vous
+  voyez 'ANSI_X3.4-1968' ou d'autres valeurs, votre locale est probablement
+  erronée (corrigez votre $LANG).
 * affectez la valeur pour le décodage global, par exemple :
   `/set charset.default.decode "ISO-8859-15"`
 * si vous utilisez la locale UTF-8 :
@@ -273,6 +274,7 @@ supprimer l'alignement sur les pseudos :
 ----------------------------------------
 /set weechat.bar.nicklist.position top
 /set weechat.look.prefix_align none
+/set weechat.look.align_end_of_lines time
 ----------------------------------------
 
 Avec WeeChat ≥ 0.3.6, vous pouvez activer l'option "eat_newline_glitch", pour

doc/fr/weechat_plugin_api.fr.txt

@@ -6224,8 +6224,8 @@ Exemples :
 
 Valeur de retour :
 
-* chaîne avec le code couleur, ou un code couleur de réinitialisation si la
-  couleur n'a pas été trouvée
+* chaîne avec le code couleur, ou une chaîne vide si la couleur n'a pas été
+  trouvée
 
 Exemple en C :
 
@@ -6384,6 +6384,31 @@ Paramètres :
 * 'tags' : liste d'étiquettes ("tags") séparées par des virgules
 * 'message' : message à afficher
 
+Tags couramment utilisés (liste non exhaustive) :
+
+[width="70%",cols="1m,4",options="header"]
+|========================================
+| Tag              | Description
+| no_filter        | La ligne ne peut pas être filtrée
+| no_highlight     | Aucun highlight n'est possible sur cette ligne
+| no_log           | La ligne n'est pas écrite dans le fichier de log
+| log0 ... log9    | Niveau de log pour la ligne (voir `/help logger`)
+| notify_none      | Le tampon avec la ligne ne sera pas ajouté à la "hotlist"
+| notify_message   | Le tampon avec la ligne sera ajouté à la "hotlist" avec le niveau "message"
+| notify_private   | Le tampon avec la ligne sera ajouté à la "hotlist" avec le niveau "private"
+| notify_highlight | Le tampon avec la ligne sera ajouté à la "hotlist" avec le niveau "highlight"
+| nick_xxx         | Le message vient du pseudo "xxx"
+| prefix_nick_ccc  | Le préfixe est un pseudo avec la couleur "ccc"
+| irc_xxx          | Message IRC "xxx" (peut-être une commande ou un numérique sur 3 chiffres)
+| irc_numeric      | Message IRC numérique
+| irc_error        | Erreur du serveur IRC
+| irc_action       | Action d'un pseudo (commande `/me`)
+| irc_ctcp         | Message CTCP
+| irc_ctcp_reply   | Réponse à un message CTCP
+| irc_smart_filter | Message IRC qui peut être filtré avec le "smart filter" (filtre intelligent)
+| away_info        | Message avec une info d'absence
+|========================================
+
 Exemple en C :
 
 [source,C]
@@ -6620,17 +6645,21 @@ struct t_hook *my_command_hook =
                           NULL);
 ----------------------------------------
 
-Par exemple, si la commande appelée est `/command abc def ghi`, alors argv et
-argv_eol contiendront les valeurs suivantes :
+Par exemple, si la commande appelée est `/command abc def ghi`, alors 'argv' et
+'argv_eol' ont les valeurs suivantes :
 
-* 'argv' :
-** 'argv[0]' == "abc"
-** 'argv[1]' == "def"
-** 'argv[2]' == "ghi"
-* 'argv_eol' :
-** 'argv_eol[0]' == "abc def ghi"
-** 'argv_eol[1]' == "def ghi"
-** 'argv_eol[2]' == "ghi"
+* 'argv':
+** 'argv[0]' == "/command"
+** 'argv[1]' == "abc"
+** 'argv[2]' == "def"
+** 'argv[3]' == "ghi"
+* 'argv_eol':
+** 'argv_eol[0]' == "/command abc def ghi"
+** 'argv_eol[1]' == "abc def ghi"
+** 'argv_eol[2]' == "def ghi"
+** 'argv_eol[3]' == "ghi"
+
+Pour les scripts, 'args' a la valeur "abc def ghi".
 
 Script (Python) :
 
@@ -7196,6 +7225,7 @@ Paramètres :
 *** 'WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR' : erreur avec la
     "poignée de main" GnuTLS
 *** 'WEECHAT_HOOK_CONNECT_MEMORY_ERROR' : mémoire insuffisante
+*** 'WEECHAT_HOOK_CONNECT_TIMEOUT' : temps maximum dépassé
 ** 'gnutls_rc' : valeur retour de 'gnutls_handshake()'
 ** 'const char *error' : valeur retour de 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address' : adresse IP trouvée
@@ -7246,6 +7276,9 @@ my_connect_cb (void *data, int status, int gnutls_rc, const char *error,
         case WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
             /* ... */
             break;
+        case WEECHAT_HOOK_CONNECT_TIMEOUT:
+            /* ... */
+            break;
     }
     return WEECHAT_RC_OK;
 }
@@ -7286,6 +7319,8 @@ def my_connect_cb(data, status, gnutls_rc, error, ip_address):
         # ...
     elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
+        # ...
     return weechat.WEECHAT_RC_OK
 
 hook = weechat.hook_connect("", "my.server.org", 1234, sock, 0, "",
@@ -7490,6 +7525,31 @@ Paramètres :
   - |
   ignore supprimé
 
+| irc | irc_notify_join +
+  (_nouveau dans la version 0.3.8_) |
+  chaîne: nom du serveur + "," + pseudo |
+  un pseudo dans la liste de notifications a rejoint le serveur
+
+| irc | irc_notify_quit +
+  (_nouveau dans la version 0.3.8_) |
+  chaîne: nom du serveur + "," + pseudo |
+  un pseudo dans la liste de notifications a quitté le serveur
+
+| irc | irc_notify_away +
+  (_nouveau dans la version 0.3.8_) |
+  chaîne: nom du serveur + "," + pseudo + "," + message d'absence |
+  un pseudo dans la liste de notifications est maintenant absent sur le serveur
+
+| irc | irc_notify_still_away +
+  (_nouveau dans la version 0.3.8_) |
+  chaîne: nom du serveur + "," + pseudo + "," + message d'absence |
+  un pseudo dans la liste de notifications est toujours absent sur le serveur (le message d'absence a changé)
+
+| irc | irc_notify_back +
+  (_nouveau dans la version 0.3.8_) |
+  chaîne: nom du serveur + "," + pseudo |
+  un pseudo dans la liste de notifications est de retour (statut d'absence supprimé)
+
 | logger | logger_start |
   pointeur : tampon |
   démarrage de l'enregistrement sur disque pour le tampon
@@ -8716,8 +8776,7 @@ Paramètres :
 
 Valeur de retour :
 
-* chaîne modifiée, NULL si aucun changement n'a été fait dans la chaîne par le
-  ou les "modifieurs"
+* chaîne modifiée, NULL en cas d'erreur
 
 Exemple en C :
 
@@ -9705,7 +9764,10 @@ Paramètres :
    principal WeeChat)
 ** 'name' : nom du tampon
 ** 'full_name' : nom complet du tampon ("extension.nom") (_nouveau dans la version 0.3.7_)
-** 'short_name' : nom court du tampon
+** 'short_name' : nom court du tampon (note: utilisé pour l'affichage seulement
+   et peut être changé par l'utilisateur, il ne doit pas être utilisé pour
+   trouver le nom du tampon, utlisez à la place 'name', 'full_name' ou bien la
+   variable locale 'channel')
 ** 'title' : titre du tampon
 ** 'input' : texte saisi
 ** 'text_search_input' : texte saisi sauvegardé avant la recherche de texte
@@ -10399,9 +10461,6 @@ Paramètres :
 * 'parent_group' : pointeur vers le parent du groupe, NULL si le groupe n'a pas
   de parent (racine de la liste des pseudos)
 * 'name' : nom du groupe
-* 'visible' :
-** '1' : le groupe et ses sous-groupes/pseudos sont visibles
-** '0' : le groupe et ses sous-groupes/pseudos sont cachés
 * 'color' : nom de l'option contenant la couleur :
 ** une option WeeChat, par exemple 'weechat.color.nicklist_group'
 ** une couleur avec un fond optionnel, par exemple 'yellow' ou 'yellow,red'
@@ -10409,6 +10468,9 @@ Paramètres :
 *** 'bar_fg' : couleur de texte pour la barre
 *** 'bar_delim' : couleur des délimiteurs pour la barre
 *** 'bar_bg' : couleur de fond pour la barre
+* 'visible' :
+** '1' : le groupe et ses sous-groupes/pseudos sont visibles
+** '0' : le groupe et ses sous-groupes/pseudos sont cachés
 
 [NOTE]
 Le nom du groupe peut commencer par un ou plusieurs chiffres, suivis d'un pipe
@@ -12253,7 +12315,7 @@ Script (Python) :
 infolist = weechat.infolist_get(infolist_name, pointer, arguments)
 
 # exemple
-infolist = weechat.infolist_get("irc_server, "", "")
+infolist = weechat.infolist_get("irc_server", "", "")
 ----------------------------------------
 
 weechat_infolist_next

doc/fr/weechat_scripting.fr.txt

@@ -101,7 +101,7 @@ Paramètres :
 * 'license' : chaîne, licence du script
 * 'description' : chaîne, description courte du script
 * 'shutdown_function' : chaîne, nom de la fonction appelée lorsque le script
-  est déchargé
+  est déchargé (optionnel)
 * 'charset' : chaîne, jeu de caractères du script (optionnel, si votre script
   est UTF-8, vous pouvez utiliser une valeur vide ici, car UTF-8 est le jeu de
   caractères par défaut)
@@ -394,7 +394,7 @@ Liste des constantes de l'API script :
   WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
   WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
   WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
 | hook signal               |
   WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================

doc/fr/weechat_user.fr.txt

@@ -113,9 +113,8 @@ compiler WeeChat.
 nom du paquet peut être différente. +
 ^(2)^ WeeChat peut compiler avec libncurses5-dev, mais ce n'est *PAS* recommandé
 (vous aurez des bugs d'affichage avec les caractères larges). +
-^(3)^ WeeChat peut compiler avec Python 3.x, mais la version de Python
-recommandée est 2.7 (tous les scripts tournent bien avec la version 2.x, mais
-pas avec la version 3.x).
+^(3)^ La version recommandée de Python est 2.7 (tous les scripts tournent bien
+avec la version 2.7, mais pas avec les versions ≤ 2.6 ou ≥ 3.0).
 
 [[compile_with_cmake]]
 Compilation avec cmake
@@ -1412,12 +1411,13 @@ Pour plus d'informations, consulter http://www.oftc.net/oftc/NickServ/CertFP
 Authentification avec SASL
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-WeeChat supporte l'authentification avec SASL, en utilisant deux mécanismes :
-"plain" (par défaut) ou "dh-blowfish" (mot de passe chiffré).
+WeeChat supporte l'authentification avec SASL, en utilisant trois mécanismes :
+"plain" (mot de passe en clair), "dh-blowfish" (mot de passe chiffré) ou
+"external" (certificat SSL côté client).
 
 Les options dans le serveur sont :
 
-* 'sasl_mechanism' : mécanisme à utiliser ("plain" ou "dh-blowfish")
+* 'sasl_mechanism' : mécanisme à utiliser ("plain", "dh-blowfish" ou "external")
 * 'sasl_timeout' : délai d'attente maximum (en secondes) pour l'authentification
 * 'sasl_username' : nom d'utilisateur (pseudo)
 * 'sasl_password' : mot de passe
@@ -2093,13 +2093,15 @@ Empaqueteurs::
     Emmanuel Bouthenot (kolter), Julien Louis (ptitlouis), Odin
 
 Traductions::
-    Jiri Golembiovsky, soltys, Nils Görs, rettub, Frank Zacharias,
-    Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi, Marco Paolone,
-    Ivan Sichmann Freitas, Lázaro A.
+    Jiri Golembiovsky (GolemJ), soltys, Nils Görs (nils_2), rettub,
+    Frank Zacharias, Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi,
+    Marco Paolone, Ivan Sichmann Freitas, Lázaro A., Ryuunosuke Ayanokouzi,
+    Quico Noizeux
 
 Patchs::
     Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
-    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n
+    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
+    Quentin Glidic (SardemFF7), Simon Kuhnle, Mateusz Poszwa
 
 
 [[support]]

doc/it/autogen/plugin_api/hdata.txt

@@ -9,6 +9,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
+  'names_received' (integer) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -78,6 +79,7 @@
   'string' (string) +
   'timeout' (integer) +
   'command' (string) +
+  'assigned_to_command' (integer) +
   'start_time' (time) +
   'cmd_start' (hashtable) +
   'cmd_stop' (hashtable) +
@@ -286,6 +288,7 @@
   'local_variables' (hashtable) +
   'prev_buffer' (pointer, hdata: 'buffer') +
   'next_buffer' (pointer, hdata: 'buffer') |
+  'gui_buffer_last_displayed' +
   'gui_buffers' +
   'last_gui_buffer'
 
@@ -412,6 +415,7 @@
   'area_name' (pointer) +
   'area_key' (string) +
   'command' (string) +
+  'score' (integer) +
   'prev_key' (pointer, hdata: 'key') +
   'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +

doc/it/autogen/user/irc_commands.txt

@@ -143,11 +143,12 @@ destinazione: nome server
 [[command_irc_disconnect]]
 [command]*`disconnect`* disconnette da uno o tutti i server IRC::
 ........................................
-/disconnect  [<server>|-all [<motivo>]]
+/disconnect  [<server>|-all|-pending [<motivo>]]
 
-server: nome del server da cui disconnettersi
-  -all: disconnette da tutti i server
-motivo: motivo per la disconnessione
+  server: nome del server da cui disconnettersi
+    -all: disconnette da tutti i server
+-pending: annulla la riconnessione automatica sui server in fase di riconnessione
+  motivo: motivo per la disconnessione
 ........................................
 
 [[command_irc_halfop]]
@@ -194,7 +195,7 @@ destinazione: nome server
 [[command_irc_invite]]
 [command]*`invite`* invita un nick su un canale::
 ........................................
-/invite  <nick> <canale>
+/invite  <nick> [<nick>...] [<canale>]
 
   nick: nick da invitare
 canale: canale su cui invitare

doc/it/autogen/user/irc_options.txt

@@ -34,7 +34,7 @@
 ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `red`)
 
 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** descrizione: `riordina i colori mirc nei messaggi usando una tabella hash: le chiavi sono "fg,bg" come interi tra -1 (non specificato) e 15, i valori sono i numeri oppure i nomi dei colori di WeeChat (il formato è: "1,-1:colore1;2,7:colore2"), esempio: "1,-1":darkgray;1,2:white,blue" per riordinare dal nero su qualsiasi colore di sfondo a "darkgray" e dal nero su blu a "white,blue"; i colori predefiniti di WeeChat per i codici IRC: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
+** descrizione: `riassegna i colori mirc nei messaggi usando una tabella hash: le chiavi sono "fg,bg" come interi tra -1 (non specificato) e 15, i valori sono i numeri oppure i nomi dei colori di WeeChat (il formato è: "1,-1:colore1;2,7:colore2"), esempio: "1,-1":darkgray;1,2:white,blue" per riassegnare dal nero a "darkgray" e dal nero su blu a "white,blue"; i colori predefiniti di WeeChat per i codici IRC: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9:lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, 15:white`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"1,-1:darkgray"`)
 
@@ -224,7 +224,7 @@
 ** valori: none, next, near_server (valore predefinito: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** descrizione: `forza colore per alcuni nick: l'hash calcolato con il nick per trovare il colore non verrà usato per questi nick (il formato è: "nick1:color1;nick2:color2")`
+** descrizione: `forza colore per alcuni nick: l'hash calcolato con il nick per trovare il colore non verrà usato per questi nick (il formato è: "nick1:color1;nick2:color2"); la ricerca dei nick è prima sensibile alle maiuscole, poi con le minuscole, per cui è possibile usare solo le minuscole per i nick in questa opzione`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
@@ -484,9 +484,9 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** descrizione: `meccanismo per l'autenticazione SASL`
+** descrizione: `meccanismo per l'autenticazione SASL: "plain" per le password in chiaro, "dh-blowfish" per le password cifrate, "external" per l'autenticazione con certificati SSL lato client`
 ** tipo: intero
-** valori: plain, dh-blowfish (valore predefinito: `plain`)
+** valori: plain, dh-blowfish, external (valore predefinito: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
 ** descrizione: `password per l'autenticazione SASL`

doc/it/autogen/user/logger_options.txt

@@ -1,3 +1,13 @@
+* [[option_logger.color.backlog_end]] *logger.color.backlog_end*
+** descrizione: `colore per la riga finale nella cronologia`
+** tipo: colore
+** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`)
+
+* [[option_logger.color.backlog_line]] *logger.color.backlog_line*
+** descrizione: `colore per la cronologia`
+** tipo: colore
+** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`)
+
 * [[option_logger.file.auto_log]] *logger.file.auto_log*
 ** descrizione: `salva automaticamente il contenuto dei buffer su file (a meno che un buffer disabiliti il log)`
 ** tipo: bool
@@ -39,7 +49,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `"%Y-%m-%d %H:%M:%S"`)
 
 * [[option_logger.look.backlog]] *logger.look.backlog*
-** descrizione: `numero massimo di righe da visualizzare dal file di log alla creazione di un nuovo buffer (0 = nessun backlog)`
+** descrizione: `numero massimo di righe da visualizzare dal file di log alla creazione di un nuovo buffer (0 = nessuna cronologia)`
 ** tipo: intero
 ** valori: 0 .. 2147483647 (valore predefinito: `20`)
 

doc/it/autogen/user/weechat_commands.txt

@@ -227,7 +227,7 @@ Il tasto predefinito alt+'=' abilita/disabilita il filtro.
 Tag usati di frequente:
   no_filter, no_highlight, no_log, log0..log9 (livello di log),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx è il nick nel messaggio),
+  nick_xxx (xxx è il nick nel messaggio) prefix_nick_ccc (ccc è il colore del nick),
   irc_xxx (xxx è il nome comando o il numero, consultare /server raw),   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
 Per mostrare i tag per le righe nei buffer: /debug tags
 
@@ -320,6 +320,8 @@ elenco di azioni:
   switch_active_buffer: passa al successivo buffer incollato
   switch_active_buffer_previous: passa al precedente buffer incollato
   insert: inserisci testo nella riga di comando
+  paste_start: inizio testo da incollare (modalità "bracketed paste")
+  paste_stop: fine testo da incollare (modalità "bracketed paste")
 
 Questo comando viene usato dalla combinazioni tasti o dai plugin.
 ........................................
@@ -337,43 +339,44 @@ Questo comando viene usato dalla combinazioni tasti o dai plugin.
       resetall -yes [<contesto>]
       missing [<contesto>]
 
-       list: elenca tutti i tasti correnti (senza argomento, viene visualizzata questa lista)
-listdefault: elenca i tasti predefiniti
-   listdiff: elenca le differenze tra tasti attuali e predefiniti (tasti aggiunti, ridefiniti o eliminati)
-   contesto: nome del contesto ("default" oppure "search")
-       bind: associa un comando ad un tasto o visualizza il comando associato al tasto (per il contesto "default")
-   bindctxt: associa un comando ad un tasto o mostra il comando associato al tasto, per il contesto fornito
-     unbind: rimuove una combinazione di tasti (per il contesto "default")
- unbindctxt: rimuove la combinazione tasti per il contesto fornito
-      reset: ripristina un tasto all'assegnazione predefinita
-  resetctxt: ripristina un tasto alla combinazione predefinita per il contesto fornito
-   resetall: ripristina le combinazioni ai valori predefiniti ed elimina TUTTE le combinazioni personalizzate (usare con cautela!)
-    missing: aggiunge tasti mancanti (usando le combinazioni predefinite), utile dopo l'installazione di una nuova versione di WeeChat
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-Al momento di associare un comando ad un tasto si raccomanda di usare il tasto alt+k (oppure Esc e k), e digitare il tasto da associare: il codice tasto verrà inserito nella riga di comando.
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-Per il contesto "mouse" (possibile anche nel contesto "cursor"), il formato del tasto è: "@area:tasto" oppure "@area1>area2:tasto" dove area può essere:
-          *: qualunque area sullo schermo
-       chat: area di chat (qualunque buffer)
-  chat(xxx): area di chat per il buffer con il nome "xxx" (nome completo includendo il plugin)
-     bar(*): qualunque barra
-   bar(xxx): barra "xxx"
-    item(*): qualunque elemento barra
-  item(xxx): elemento barra "xxx"
-Il tasto può iniziare o terminare con '*' per corrispondere a più eventi del mouse.
-Un valore speciale per questo comando con il formato "hsignal:nome" può essere usato per il contesto del mouse, e invierà hsignal "nome" con la tabella hash di focuse come argomento.
-Può essere usato un altro valore speciale "-" per disabilitare il tasto (verrà ignorato quando si cercano i tasti).
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+The key can start or end with '*' to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-Esempi:
-  il tasto alt-x per alternare la barra della nicklist:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  il tasto alt-r per passare al canale IRC #weechat:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  ripristinare la combinazione predefinita per il tasto alt-r:
+  restore default binding for key alt-r:
     /key reset meta-r
-  il tasto "tab" per fermare la ricerca nel buffer:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  il tasto centrale del mouse su un nick per ottenere le informazioni:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ........................................
 

doc/it/autogen/user/weechat_options.txt

@@ -279,7 +279,7 @@
 ** valori: on, off (valore predefinito: `on`)
 
 * [[option_weechat.completion.nick_completer]] *weechat.completion.nick_completer*
-** descrizione: `stringa inserita dopo il completamento del nick`
+** descrizione: `stringa inserita dopo il completamento del nick (quando il nick è la prima parola sulla riga di comando)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `":"`)
 
@@ -309,7 +309,7 @@
 ** valori: on, off (valore predefinito: `off`)
 
 * [[option_weechat.completion.partial_completion_count]] *weechat.completion.partial_completion_count*
-** descrizione: `visualizza contatore per ogni completamento parziale nella barra degli oggetti`
+** descrizione: `mostra contatore per ogni completamento parziale nella barra degli oggetti`
 ** tipo: bool
 ** valori: on, off (valore predefinito: `on`)
 
@@ -578,10 +578,20 @@
 ** tipo: bool
 ** valori: on, off (valore predefinito: `off`)
 
-* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
-** descrizione: `numero massimo di righe da incollare senza conferma dell'utente (0 = disabilita questa caratteristica)`
+* [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
+** descrizione: `abilita la modalità "bracketed paste" per il terminale (non supportata da tutti i terminali/multiplexer): in questa modalità, il testo incollato viene circondato da sequenze di controllo in modo che WeeChat possa differenziare il testo incollato dal testo digitato ("ESC[200~", seguito dal testo incollato, seguito da "ESC[201~")`
+** tipo: bool
+** valori: on, off (valore predefinito: `off`)
+
+* [[option_weechat.look.paste_bracketed_timer_delay]] *weechat.look.paste_bracketed_timer_delay*
+** descrizione: `forza la fine della modalità "bracketed paste" dopo questo ritardo (in secondi) se la sequenza di controllo per la fine del "bracketed paste" ("ESC[201~") non è stata ricevuta in tempo`
 ** tipo: intero
-** valori: 0 .. 2147483647 (valore predefinito: `3`)
+** valori: 1 .. 60 (valore predefinito: `10`)
+
+* [[option_weechat.look.paste_max_lines]] *weechat.look.paste_max_lines*
+** descrizione: `numero massimo di righe da incollare senza conferma dell'utente (-1 = disabilita questa caratteristica)`
+** tipo: intero
+** valori: -1 .. 2147483647 (valore predefinito: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
 ** descrizione: `prefisso per i messaggi di azione`
@@ -604,9 +614,9 @@
 ** valori: 0 .. 128 (valore predefinito: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** descrizione: `mostra '+' se il prefisso è troncato`
-** tipo: bool
-** valori: on, off (valore predefinito: `on`)
+** descrizione: `carattere da mostrare se il prefisso è troncato (deve essere esattamente un carattere sullo schermo)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"+"`)
 
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** descrizione: `prefisso di allineamento per il nome del buffer, quando più buffer vengono uniti con lo stesso numero (none (nessuno), left(sinistra), right(destra - predefinito)`
@@ -619,9 +629,9 @@
 ** valori: 0 .. 128 (valore predefinito: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** descrizione: `visualizza '+' se il nome del buffer è troncato (quando più buffer sono uniti con lo stesso numero)`
-** tipo: bool
-** valori: on, off (valore predefinito: `on`)
+** descrizione: `carattere da mostrare se il nome del buffer è troncato (quando più buffer vengono uniti con lo stesso numero) (deve essere esattamente un carattere su schermo)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** descrizione: `prefisso per i messaggi di errore`
@@ -643,6 +653,11 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"<--"`)
 
+* [[option_weechat.look.prefix_same_nick]] *weechat.look.prefix_same_nick*
+** descrizione: `prefisso mostrato per un messaggio con lo stesso nick del messaggio precedente: usare uno spazio " " per nascondere il prefisso, un'altra stringa per mostrare la stringa invece del prefisso, o una stringa vuota per disabilitare questa funzionalità (mostra prefisso)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `""`)
+
 * [[option_weechat.look.prefix_suffix]] *weechat.look.prefix_suffix*
 ** descrizione: `stringa visualizzata dopo il prefisso`
 ** tipo: stringa
@@ -713,8 +728,13 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
+** descrizione: `timeout (in secondi) per la connessione ad un host remoto (eseguita in un processo figlio)`
+** tipo: intero
+** valori: 1 .. 2147483647 (valore predefinito: `60`)
+
 * [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** descrizione: `file contenente le autorità certificative ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)`
+** descrizione: `file contenente le autorità certificative ("%h" sarà sostituito dalla home di WeeChat, predefinita: "~/.weechat)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"/etc/ssl/certs/ca-certificates.crt"`)
 

doc/it/weechat_faq.it.txt

@@ -111,9 +111,10 @@ soluzione tra quelle elencate:
   necessario su molte distribuzioni ma non tutte): `ldd /percorso/di/weechat-curses`
 * verificare che il plugin "charset" sia caricato con il comando `plugin` (se non
   lo è, probabilmente è necessario il pacchetto "weechat-plugins")
-* controllare la riga del set caratteri (sul buffer del server). Dovrebbe essere
-  possibile vedere 'ISO-XXXXXX' oppure 'UTF-8' per il set caratteri del terminale.
-  Se compare 'ANSI_X3.4-1968" o un altro valore, il proprio locale è errato.
+* verificare l'output del comando `/charset` (sul buffer core). Dovrebbero essere
+  visualizzati 'ISO-XXXXXX' oppure 'UTF-8' per il set caratteri del terminale.
+  Se invece compaiono 'ANSI_X3.4-1968' o altri valori, il locale probabilmente
+  non è esatto (correggere la variabile $LANG).
 * impostare il valore di decodifica globale, per esempio:
   `/set charset.default.decode = ISO-8859-15`
 * se si usa la localizzazione UTF-8:
@@ -272,6 +273,7 @@ l'allineamento sul nick:
 ----------------------------------------
 /set weechat.bar.nicklist.position top
 /set weechat.look.prefix_align none
+/set weechat.look.align_end_of_lines time
 ----------------------------------------
 
 Con WeeChat ≥ 0.3.6, si può abilitare l'opzione "eat_newline_glitch", in

doc/it/weechat_plugin_api.it.txt

@@ -6156,7 +6156,8 @@ Esempi:
 
 Valore restituito:
 
-* stringa con codice colore, o un codice "reset color" se il colore non è stato trovato
+// TRANSLATION MISSING
+* string with color code, or an empty string if color is not found
 
 Esempio in C:
 
@@ -6313,6 +6314,33 @@ Argomenti:
 * 'tags': lista di tag separati da virgole
 * 'message': messaggio da visualizzare
 
+// TRANSLATION MISSING
+Tags commonly used (non-exhaustive list):
+
+// TRANSLATION MISSING
+[width="70%",cols="1m,4",options="header"]
+|========================================
+| Tag              | Description
+| no_filter        | Line can not be filtered
+| no_highlight     | No highlight is possible on line
+| no_log           | Line is not written in log file
+| log0 ... log9    | Level of log for line (see `/help logger`)
+| notify_none      | Buffer with line is not added to hotlist
+| notify_message   | Buffer with line is added to hotlist with level "message"
+| notify_private   | Buffer with line is added to hotlist with level "private"
+| notify_highlight | Buffer with line is added to hotlist with level "highlight"
+| nick_xxx         | Message is from nick "xxx"
+| prefix_nick_ccc  | Prefix is a nick with color "ccc"
+| irc_xxx          | IRC message "xxx" (can be a command or a 3-digits number)
+| irc_numeric      | IRC numeric message
+| irc_error        | Error from IRC server
+| irc_action       | Action from a nick (command `/me`)
+| irc_ctcp         | CTCP message
+| irc_ctcp_reply   | Reply to CTCP message
+| irc_smart_filter | IRC message that can be filtered with the "smart filter"
+| away_info        | Message with away info
+|========================================
+
 Esempio in C:
 
 [source,C]
@@ -6546,16 +6574,21 @@ struct t_hook *my_command_hook =
 ----------------------------------------
 
 Ad esempio, se il comando chiamato è `/comando abc def ghi`, allora
-argv e argv_eol contengono i seguenti valori:
+'argv' e 'argv_eol' contengono i seguenti valori:
 
 * 'argv':
-** 'argv[0]' == "abc"
-** 'argv[1]' == "def"
-** 'argv[2]' == "ghi"
+** 'argv[0]' == "/command"
+** 'argv[1]' == "abc"
+** 'argv[2]' == "def"
+** 'argv[3]' == "ghi"
 * 'argv_eol':
-** 'argv_eol[0]' == "abc def ghi"
-** 'argv_eol[1]' == "def ghi"
-** 'argv_eol[2]' == "ghi"
+** 'argv_eol[0]' == "/command abc def ghi"
+** 'argv_eol[1]' == "abc def ghi"
+** 'argv_eol[2]' == "def ghi"
+** 'argv_eol[3]' == "ghi"
+
+// TRANSLATION MISSING
+For scripts, 'args' has value "abc def ghi".
 
 Script (Python):
 
@@ -7114,6 +7147,7 @@ Argomenti:
 *** 'WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR': errore inizializzazione GnuTLS
 *** 'WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR': errore di handshake GnuTLS
 *** 'WEECHAT_HOOK_CONNECT_MEMORY_ERROR': memoria insufficiente
+*** 'WEECHAT_HOOK_CONNECT_TIMEOUT': timeout
 ** 'gnutls_rc': valore del risultato di 'gnutls_handshake()'
 ** 'const char *error': valore del risultato di 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address': indirizzo IP trovato
@@ -7163,6 +7197,9 @@ my_connect_cb (void *data, int status, int gnutls_rc, const char *error,
         case WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
             /* ... */
             break;
+        case WEECHAT_HOOK_CONNECT_TIMEOUT:
+            /* ... */
+            break;
     }
     return WEECHAT_RC_OK;
 }
@@ -7203,6 +7240,8 @@ def my_connect_cb(data, status, gnutls_rc, error, ip_address):
         # ...
     elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
+        # ...
     return weechat.WEECHAT_RC_OK
 
 hook = weechat.hook_connect("", "my.server.org", 1234, sock, 0, "",
@@ -7410,6 +7449,31 @@ Argomenti:
   - |
   ignore rimosso
 
+| irc | irc_notify_join +
+  (_novità nella versione 0.3.8_) |
+  string: nome server + "," + nick |
+  un nick nella lista notifiche è entrato sul server
+
+| irc | irc_notify_quit +
+  (_novità nella versione 0.3.8_) |
+  string: nome server + "," + nick |
+  un nick nella lista notifiche è uscito dal server
+
+| irc | irc_notify_away +
+  (_novità nella versione 0.3.8_) |
+  string: nome server + "," + nick + "," + messaggio di assenza |
+  un nick nella lista notifiche è ora assente sul server
+
+| irc | irc_notify_still_away +
+  (_novità nella versione 0.3.8_) |
+  string: nome server + "," + nick + "," + messaggio di assenza |
+  un nick nella lista notifiche è ancora assente sul server (messaggio di assenza cambiato)
+
+| irc | irc_notify_back +
+  (_novità nella versione 0.3.8_) |
+  string: nome server + "," + nick |
+  un nick nella lista notifiche è tornato (messaggio di assenza rimosso)
+
 | logger | logger_start |
   puntatore: buffer |
   avvia il logging per il buffer
@@ -8624,8 +8688,7 @@ Argomenti:
 
 Valore restituito:
 
-* stringa modificata, NULL se nessun cambiamento nella stringa è
-  stato effettuato dal modificatore(i).
+* stringa modificata, NULL in caso di errore
 
 Esempio in C:
 
@@ -9606,7 +9669,10 @@ Argomenti:
    per il buffer principale di WeeChat)
 ** 'name': nome del buffer
 ** 'full_name': nome completo del buffer ("plugin.nome") (_novità nella versione 0.3.7_)
-** 'short_name': nome breve del buffer
+// TRANSLATION MISSING
+** 'short_name': nome breve del buffer (note: used for display only and can be
+   changed by user, this must not be used to find name of buffer, use instead
+   'name', 'full_name' or local variable 'channel')
 ** 'title': titolo del buffer
 ** 'input': testo in ingresso
 ** 'text_search_input': input salvato prima della ricerca nel testo
@@ -10291,9 +10357,6 @@ Argomenti:
 * 'parent_group': puntatore al genitore del gruppo, NULL se il gruppo non ha genitore
   (lista nick radice)
 * 'name': nome del gruppo
-* 'visible':
-** '1': gruppi e sottogruppi/nick sono visibili
-** '0': gruppi e sottogruppi/nick sono nascosti
 * 'color': nome per l'opzione colore:
 ** nome opzione per WeeChat, ad esempio 'weechat.color.nicklist_group'
 ** colore con sfondo opzionale, ad esempio 'yellow' o 'yellow,red'
@@ -10301,6 +10364,9 @@ Argomenti:
 *** 'bar_fg': colore di primo piando per la barra
 *** 'bar_delim': colore dei delimitatori per la barra
 *** 'bar_bg': colore di sfondo per la barra
+* 'visible':
+** '1': gruppi e sottogruppi/nick sono visibili
+** '0': gruppi e sottogruppi/nick sono nascosti
 
 [NOTE]
 Il nome del gruppo può iniziare con uno o più numeri, seguiti da una pipe, e
@@ -12147,7 +12213,7 @@ Script (Python):
 infolist = weechat.infolist_get(infolist_name, pointer, arguments)
 
 # esempio
-infolist = weechat.infolist_get("irc_server, "", "")
+infolist = weechat.infolist_get("irc_server", "", "")
 ----------------------------------------
 
 weechat_infolist_next

doc/it/weechat_scripting.it.txt

@@ -101,7 +101,7 @@ Argomenti:
 * 'license': stringa, licenza dello script
 * 'description': stringa, breve descrizione dello script
 * 'shutdown_function': stringa, nome della funzione chiamata quando lo script
-  viene scaricato
+  viene scaricato (opzionale)
 * 'charset': stringa, set caratteri dello script (opzionale, se il proprio script è in UTF-8,
   è possibile utilizzare un valore nullo qui, dato che UTF-8 è il set caratteri predefinito)
 
@@ -393,7 +393,7 @@ Elenco di costanti nelle API per gli script:
   WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
   WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
   WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
 | hook su segnale        |
   WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================

doc/it/weechat_user.it.txt

@@ -115,9 +115,9 @@ compilare WeeChat.
 potrebbero essere differenti in versioni e distribuzioni differenti. +
 ^(2)^ WeeChat può essere compilato con libncurses5-dev, ma *NON* è raccomandato
 (potrebbero verificarsi bug di visualizzazione). +
-^(3)^ WeeChat può compilare con Python 3.x, ma si raccomanda di usare la
-versione 2.7 (tutti gli script vengono eseguiti correttamente con la versione
-2.x, ma non con la 3.x).
+// TRANSLATION MISSING
+^(3)^ Recommended Python version is 2.7 (all scripts run fine with version 2.7,
+but not with versions ≤ 2.6 or ≥ 3.0).
 
 [[compile_with_cmake]]
 Compilazione con cmake
@@ -1396,12 +1396,13 @@ Per maggiori informazioni consultare http://www.oftc.net/oftc/NickServ/CertFP
 Autenticazione SASL
 ^^^^^^^^^^^^^^^^^^^
 
-WeeChat supporta l'autenticazione SASL, usando due meccanismi: "plain"
-(predefinito) o "dh-blowfish" (password codificata).
+WeeChat supporta l'autenticazione SASL, usando tre meccanismi: "plain" (password
+in chiaro), "dh-blowfish" (password cifrata)" o "external" (certificato SSL da
+lato client).
 
 Le opzioni nel server sono:
 
-* 'sasl_mechanism': meccanismo da usare ("plain" o "dh-blowfish")
+* 'sasl_mechanism': meccanismo da usare ("plain", "dh-blowfish" o "external")
 * 'sasl_timeout': timeout (in secondi) per l'autenticazione
 * 'sasl_username': nome utente (nick)
 * 'sasl_password': password
@@ -1427,7 +1428,7 @@ utenti e gruppi di migliorare la propria privacy e la sicurezza su Internet.
 Per prima cosa, assicurarsi che WeeChat sia compilato con
 <<dependencies,libgcrypt11-dev>> (se compilato da sorgenti); non è
 obbligatorio, ma "dh-blowfish" assicura una maggiore sicurezza rispetto al
-sistema di autenticazione con SASL.
+sistema di autenticazione "plain" (in chiaro) con SASL.
 
 Il primo passo consiste nell'installare TOR. Per Debian (e derivate):
 
@@ -2078,13 +2079,15 @@ Packagers::
     Emmanuel Bouthenot (kolter), Julien Louis (ptitlouis), Odin
 
 Traduzioni::
-    Jiri Golembiovsky, soltys, Nils Görs, rettub, Frank Zacharias,
-    Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi, Marco Paolone,
-    Ivan Sichmann Freitas, Lázaro A.
+    Jiri Golembiovsky (GolemJ), soltys, Nils Görs (nils_2), rettub,
+    Frank Zacharias, Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi,
+    Marco Paolone, Ivan Sichmann Freitas, Lázaro A., Ryuunosuke Ayanokouzi,
+    Quico Noizeux
 
 Patches::
     Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
-    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n
+    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
+    Quentin Glidic (SardemFF7), Simon Kuhnle, Mateusz Poszwa
 
 
 [[support]]

doc/pl/weechat_faq.pl.txt

@@ -110,9 +110,10 @@ Jest to częsty problem, przeczytaj i sprawdź *WSZYSTKIE* poniższe rozwiązani
   większości dystrybucji ale nie wszystkich): `ldd /ścieżka/do/weechat-curses`
 * sprawdź czy wtyczka "Charset" jest załadowana za pomocą komendy `/plugin`
   (jeśli nie jest, to najprawdopodobniej potrzebujesz pakietu "weechat-plugins")
-* sprawdź ustawienia kodowania (w buforze serwera). Powinieneś ujrzeć 'ISO-XXXXXX'
-  lub 'UTF-8' dla kodowania terminala. Jeśli zobaczysz 'ANSI_X3.4-1968' lub inna
-  wartość to twoje locale są prawdopodobnie złe.
+// TRANSLATION MISSING
+* check the output of command `/charset` (on core buffer). You should see
+  'ISO-XXXXXX' or 'UTF-8' for terminal charset. If you see 'ANSI_X3.4-1968' or
+  other values, your locale is probably wrong (fix your $LANG).
 * ustaw globalną wartość dekodowania, na przykład:
   `/set charset.default.decode "ISO-8859-2"`
 * jeśli korzystasz z UTF-8:
@@ -266,6 +267,7 @@ na górę oraz usunąć wyrównanie nicków:
 ----------------------------------------
 /set weechat.bar.nicklist.position top
 /set weechat.look.prefix_align none
+/set weechat.look.align_end_of_lines time
 ----------------------------------------
 
 W WeeChat ≥ 0.3.6 można włączyć opcję "eat_newline_glitch", dzięki której znaki

doc/pl/weechat_scripting.pl.txt

@@ -100,6 +100,7 @@ Argumenty:
 * 'licencja': string, licencja
 * 'opis': string, krótki opis skryptu
 * 'funkcja_wyłączająca': string, nazwa funkcji wywoływanej podczas wyładowania skryptu
+  (opcjonalne)
 * 'kodowanie': string, kodowane skryptu (opcjonalne, jeśli skrypt jest napisany
   w UTF-8 można nie podawać tej wartości - UTF-8 to domyślne kodowanie)
 
@@ -383,7 +384,7 @@ Lista stałych w API skryptów:
   WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
   WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
   WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
 | hook signal         |
   WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================

po/cs.po

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:03+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Czech\n"
@@ -1218,7 +1218,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1383,6 +1384,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1454,6 +1457,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2512,7 +2516,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "maximální počet řádků pro vložení bez dotazování uživatele (0 = vypnout tuto "
 "vlastnost)"
@@ -2541,8 +2558,9 @@ msgstr "maximální velikost prefixu (0 = žádná maximální velikost)"
 msgid "min size for prefix"
 msgstr "minimální velikost prefixu"
 
-msgid "display '+' if prefix is truncated"
-msgstr "zobrazit '+' pokud je prefix zkrácen"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2558,13 +2576,20 @@ msgstr ""
 "maximální velikost jména bufferu, při spojení více bufferů se stejným číslem "
 "(0 = žádná maximální velikost)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "zobrazit '+' pokud je jméno bufferu zkráceno (při spojení vice bufferů se "
 "stejným číslem)"
 
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+
 msgid "string displayed after prefix"
 msgstr "řetězec zobrazený za prefixem"
 
@@ -2832,8 +2857,13 @@ msgstr ""
 "přidat mezeru za přezdívku po doplnění (pokud není přezdívka první slovo na "
 "příkazovém řádku)"
 
-msgid "string inserted after nick completion"
-msgstr "řetězec vložený za přezdívku po doplnění"
+#, fuzzy
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"přidat mezeru za přezdívku po doplnění (pokud není přezdívka první slovo na "
+"příkazovém řádku)"
 
 msgid "complete only with first nick found"
 msgstr "dokončit pouze s prvním nalezenou přezdívkou"
@@ -2891,6 +2921,12 @@ msgstr ""
 "maximální počet příkazů, který zobrazit jako výchozí v seznamu historie (0 = "
 "nekonečno)"
 
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "časový limit (v sekundách) pro gnutls handshake"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3311,9 +3347,12 @@ msgstr ""
 msgid "Bar \"%s\" updated"
 msgstr "Pole \"%s\" zaktualizováno"
 
-#, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne"
+#, fuzzy, c-format
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne"
+msgstr[1] "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne"
+msgstr[2] "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne"
 
 msgid "Text search"
 msgstr "Vyhledávání textu"
@@ -3358,14 +3397,6 @@ msgstr[2] "normálních"
 msgid "Debug disabled for cursor mode"
 msgstr "Ladění vypnuto pro \"%s\""
 
-#, fuzzy, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Ladění vypnuto pro \"%s\""
-
-#, fuzzy
-msgid "Debug disabled for mouse"
-msgstr "Ladění vypnuto pro \"%s\""
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Chyba: nedostatek paměti pro přidáni bufferu do hotlistu"
 
@@ -3396,6 +3427,14 @@ msgstr "výchozí příkaz:"
 msgid "Not enough memory for new line"
 msgstr "Nedostatek paměti pro nový řádek"
 
+#, fuzzy, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Ladění vypnuto pro \"%s\""
+
+#, fuzzy
+msgid "Debug disabled for mouse"
+msgstr "Ladění vypnuto pro \"%s\""
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: chyba, cyklický odkaz při volání aliasu \"%s\""
@@ -4332,14 +4371,15 @@ msgid "disconnect from one or all IRC servers"
 msgstr "odpojit z IRC serveru/serverů"
 
 #, fuzzy
-msgid "[<server>|-all [<reason>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr "[[<server>] <maska_serveru>]"
 
 #, fuzzy
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 "server: jméno serveru pro odpojení\n"
 "  -all: odpojit se od všech serverů"
@@ -4402,8 +4442,9 @@ msgstr "získat informace popisující server"
 msgid "invite a nick on a channel"
 msgstr "pozvat přezdívku na kanál"
 
-msgid "<nick> <channel>"
-msgstr "<přezdívka> <kanál>"
+#, fuzzy
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<přezdívka> [<přezdívka>...]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5328,8 +5369,11 @@ msgid ""
 "available (example: \"multi-prefix,extended-join\")"
 msgstr ""
 
-msgid "mechanism for SASL authentication"
-msgstr "mechanismu pro SASL autentizaci"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 msgid "username for SASL authentication"
 msgstr "uživatelské jméno pro SASL autentizaci"
@@ -5513,9 +5557,12 @@ msgstr "text pro zobrazení před přezdívkou v okně rozhovoru"
 msgid "text to display after nick in chat window"
 msgstr "text pro zobrazení za přezdívkou v okně rozhovoru"
 
+#, fuzzy
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "vynutit barvu u některých přezdívek: hash spočítaný z přezdívky pro nalezení "
 "barvy nebude použit pro tyto přezdívky (formát je: \"přezdívka1:barva1;"
@@ -5709,9 +5756,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -6034,6 +6081,11 @@ msgstr "%s%s: nejste připojen k serveru"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: tenhle buffer není kanál!"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(neznámý)"
+
 msgid "offline"
 msgstr "offline"
 
@@ -6053,12 +6105,20 @@ msgstr "Seznam notifikací pro všechny servery:"
 msgid "Notify list is empty on all servers"
 msgstr "Seznam notifikací na všech serverech je prázdný"
 
-#, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is connected"
 msgstr "%snotifikace: %s%s%s se připojil %s%s"
 
-#, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is offline"
+msgstr "%snotifikace: %s%s%s se připojil %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%snotifikace: %s%s%s se připojil %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%snotifikace: %s%s%s odešel %s%s"
 
 #, c-format
@@ -6573,6 +6633,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: nedostatek paměti"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -6748,8 +6812,8 @@ msgstr "logování nebylo spuštěno"
 msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => úroveň %d"
 
-#, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+#, fuzzy, c-format
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr "===\t========== Konec zpětného logu (%d řádků) =========="
 
 msgid "logger plugin configuration"
@@ -6833,6 +6897,14 @@ msgstr ""
 "maximální počet řádek zobrazených z logovacího souboru při vytvořezí nového "
 "bufferu (0 = žádný zpětný log)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "barva položek, které jsou pryč"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "barva přezdívky ve vstupním poli"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7809,6 +7881,11 @@ msgstr ""
 "jméno skriptu (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s%s: špatné parametry pro funkci \"%s\" (skript: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr "%s: chyba načítání skriptu \"%s\" (špatné jméno, mezery jsou zakázány)"
@@ -8273,3 +8350,15 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "řetězec vložený za přezdívku po doplnění"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "zobrazit '+' pokud je prefix zkrácen"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<přezdívka> <kanál>"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "mechanismu pro SASL autentizaci"

po/es.po

@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2009 Roberto González Cardenete <robert.glez@gmail.com>
-# Copyright (C) 2009-2011 Elián Hanisch <lambdae2@gmail.com>
+# Copyright (C) 2009-2012 Elián Hanisch <lambdae2@gmail.com>
+# Copyright (C) 2012 Quico Noizeux <keecoh@gmail.com>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -19,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:03+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-04-25 19:20-0300\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Spanish\n"
@@ -363,7 +364,7 @@ msgid ""
 msgstr ""
 "un nombre de color de WeeChat (default, black, (dark)gray, white, (light)"
 "red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), "
-"un número de color de la terminal ó un alias; atributos delante del color "
+"un número de color de la terminal o un alias; atributos delante del color "
 "están permitidos (solamente para color de texto , no de fondo): \"*\" para "
 "negrita, \"!\" para revertir, \"_\" para subrayado."
 
@@ -1001,7 +1002,7 @@ msgstr ""
 "para buffers unidos, -all para todos los buffers, o nada para el buffer "
 "actual)\n"
 "    move: mueve un buffer en la lista (puede ser relativo, por ejemplo -1)\n"
-"   merge: une el buffer actual con otro (el área de chat sería una mezcla "
+"   merge: une el buffer actual con otro (el área de charla sería una mezcla "
 "entre ambos buffers)\n"
 "          (por defecto con ctrl-x se cambia entre buffer unidos)\n"
 " unmerge: despega el buffer de otros buffers unidos\n"
@@ -1071,14 +1072,14 @@ msgstr ""
 "terminal, comúnmente 63 o 255)\n"
 " nombre: alias para el color (por ejemplo: \"naranja\")\n"
 "  reset: reinicia todos los pares de colores (necesario cuando no hay "
-"disponibles más pares si el reset automático está desactivado, mira la "
+"disponibles más pares si el reinicio automático está desactivado, mira la "
 "opción weechat.look.color_pairs_auto_reset)\n"
 "\n"
 "Sin argumentos, este comando muestra los colores en un nuevo buffer.\n"
 "\n"
 "Ejemplos:\n"
 "  agregar el alias \"naranja\" para el color 214:\n"
-"    /color add 214 naranja\n"
+"    /color alias 214 naranja\n"
 "  borrar color 214:\n"
 "    /color unalias 214"
 
@@ -1129,7 +1130,7 @@ msgid ""
 "  go to coordinates x=10, y=5:\n"
 "    /cursor go 10,5"
 msgstr ""
-"  go: mueve el cursor al área de chat, una barra (usando el nombre) o "
+"  go: mueve el cursor al área de charla, una barra (usando el nombre) o "
 "coordenadas \"x,y\"\n"
 "move: mueve el cursor en una dirección\n"
 "stop: detiene el modo cursor\n"
@@ -1241,7 +1242,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1262,7 +1264,7 @@ msgid ""
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
-"         list: lista todos los filtros\n"
+"         list: muestra todos los filtros\n"
 "       enable: activa los filtros (por defecto)\n"
 "      disable: desactiva los filtros\n"
 "       toggle: alterna el estado de los filtros\n"
@@ -1270,10 +1272,10 @@ msgstr ""
 "          add: agrega un filtro\n"
 "          del: borra un filtro\n"
 "         -all: borra todos los filtros\n"
-"       buffer: lista separadas por comas de buffers donde el filtro está "
+"       buffer: lista separadas por comas de los buffers donde el filtro está "
 "activo:\n"
-"               - esto es el nombre completo incluyendo el plugin (ejemplo: "
-"\"irc.freenode.#weechat\")\n"
+"               - es el nombre completo incluyendo el plugin (ejemplo: \"irc."
+"freenode.#weechat\")\n"
 "               - \"*\" significa todos los buffers\n"
 "               - un nombre empezando con '!' es excluido\n"
 "               - el nombre puede empezar o terminar con '*' para coincidir "
@@ -1288,14 +1290,15 @@ msgstr ""
 "               - dos expresiones regulares son creadas: una para el prefijo "
 "y otra para el mensaje\n"
 "               - las expresiones son insensibles a las mayúsculas, pueden "
-"empezar con \"(?-i)\" para sean sensibles a estas.\n"
+"empezar con \"(?-i)\" para que sean sensibles a estas.\n"
 "\n"
 "Por predeterminado, el atajo alt+'=' activa o desactiva el filtrado.\n"
 "\n"
 "Etiquetas más comúnmente usadas:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (nivel de registro),\n"
-"  notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx es el apodo en el mensaje),\n"
+"  notify_none, notify_message, notify_private, notify_highlight,\n"
+"  nick_xxx (xxx es el apodo en el mensaje), prefix_nick_ccc (ccc es el color "
+"del apodo),\n"
 "  irc_xxx (xxx es el nombre del comando o un número, ver /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1405,6 +1408,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1456,9 +1461,11 @@ msgstr ""
 "actual\n"
 "  switch_active_buffer: cambiar al buffer fusionado siguiente\n"
 "  switch_active_buffer_previous: cambiar al buffer fusionado anterior\n"
-"  insert: insertar texto en la línea de comando\n"
+"  insert: insertar texto en la línea de comandos\n"
+"  paste_start: iniciar pegar (modo pegado entre paréntesis)\n"
+"  paste_stop: parar pegar (modo pegado entre paréntesis)\n"
 "\n"
-"Este comando es usado para atajos de teclas o plugins."
+"Este comando es usado para atajos de teclado o plugins."
 
 msgid "bind/unbind keys"
 msgstr "crear/deshacer atajos"
@@ -1475,6 +1482,7 @@ msgstr ""
 "resetctxt <contexto> <tecla> || resetall -yes [<contexto>] || missing "
 "[<contexto>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1486,6 +1494,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2379,8 +2388,8 @@ msgid ""
 "than 16 colors)"
 msgstr ""
 "fuerza el atributo \"bold\" (negrita) para colores \"light*\" y \"darkgray\" "
-"in basic colors (this option is disabled by default: bold is used only if "
-"terminal has less than 16 colors)"
+"en los colores básicos (esta opción está desactivada por defecto: negrita "
+"sólo se usa si la terminal tiene menos de 16 colores)"
 
 msgid ""
 "use a different color for lines in inactive window (when window is not "
@@ -2474,7 +2483,7 @@ msgid ""
 "because it can cause serious display bugs)"
 msgstr ""
 "si es verdadero, el eat_newline_glitch será desactivado; esto se usa para no "
-"agregar un nuevo caracter de retorno al final de cada línea, y no cortar "
+"agregar un nuevo carácter de retorno al final de cada línea, y no cortar "
 "texto cuando uno copia y pega texto desde WeeChat a otra aplicación (esta "
 "opción está desactivada por defecto porque puede causar serios errores de "
 "visualización)"
@@ -2651,10 +2660,30 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostrar un espacio si el modo de usuario no es (semi-)op/voz"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
 msgstr ""
-"número máximo de líneas que el usuario puede pegar sin pedir confirmación (0 "
-"= deshabilitar esta funcionalidad)"
+"activar terminal \"pegar modo paréntesis\" (no soportado en todos los "
+"terminales/multiplexers): en este modo, el texto pegado entre paréntesis con "
+"control de secuencias de manera que WeeChat puede diferenciarlo del "
+"introducido (\"ESC[200~\", seguido por el texto pegado, seguido de \"ESC[201~"
+"\")"
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+"forzar fin del \"pegar modo paréntesis\" después de este retraso (en "
+"segundos) si la secuencia de control para el fin de pegar modo paréntesis "
+"(\"ESC[201~\") no se ha recibido a tiempo"
+
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
+msgstr ""
+"número máximo de líneas que el usuario puede pegar sin pedir confirmación "
+"(-1 = deshabilitar esta función)"
 
 msgid "prefix for error messages"
 msgstr "prefijo para mensajes de error"
@@ -2681,8 +2710,11 @@ msgstr "tamaño máximo para el prefijo (0 = no hay límite)"
 msgid "min size for prefix"
 msgstr "tamaño mínimo para el prefijo"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostrar '+' si el prefijo ha sido truncado"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
+"carácter para mostrar si el prefijo esta truncado (debe ser exactamente un "
+"carácter en pantalla)"
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2699,11 +2731,22 @@ msgstr ""
 "fusionados con el mismo número (0 = sin tamaño máximo)"
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
-"muestra '+' si el nombre es truncado (cuando varios buffers están fusionados "
-"con el mismo número)"
+"carácter a mostrar si el nombre del buffer es acortado (cuando hay muchos "
+"buffers unidos con el mismo número) (tiene que ser exactamente un carácter "
+"en pantalla)"
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+"prefijo mostrado por un mensaje con el mismo nick que en el mensaje previo: "
+"usar un espacio \" \" para ocultar el prefijo, una cadena para mostrar esta "
+"en lugar del prefijo, o una cadena vacía para desactivar esta característica "
+"(mostrar prefijo)"
 
 msgid "string displayed after prefix"
 msgstr "cadena mostrada después del prefijo"
@@ -2995,8 +3038,12 @@ msgstr ""
 "agregar espacio después de autocompletar un apodo (cuando el apodo no es la "
 "primera palabra en la línea de comandos)"
 
-msgid "string inserted after nick completion"
-msgstr "cadena insertada después de auto-completar un apodo"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"cadena insertada después de autocompletar un apodo (cuando el apodo es la "
+"primera palabra en la línea de comandos)"
 
 msgid "complete only with first nick found"
 msgstr "completar únicamente con el primer apodo encontrado"
@@ -3054,6 +3101,13 @@ msgstr ""
 "número máximo de comandos para mostrar por defecto en el listado del "
 "historial (0 = ilimitado)"
 
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr ""
+"tiempo de espera (en segundos) para la conexión al servidor remoto (por un "
+"subproceso)"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3481,8 +3535,10 @@ msgid "Bar \"%s\" updated"
 msgstr "Barra \"%s\" actualizada"
 
 #, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sPegar %d líneas ? [ctrl-Y] Sí [ctrl-N] No"
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sPegar %d línea ? [ctrl-Y] Sí [ctrl-N] No"
+msgstr[1] "%sPegar %d líneas ? [ctrl-Y] Sí [ctrl-N] No"
 
 msgid "Text search"
 msgstr "Búsqueda de texto"
@@ -3526,13 +3582,6 @@ msgstr[1] "normales"
 msgid "Debug disabled for cursor mode"
 msgstr "Depurado para el modo cursor desactivado"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Depurado para el modo cursor activado (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Depurado para el ratón desactivado"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 "Error: no hay suficiente memoria para agregar el buffer a la lista de "
@@ -3564,6 +3613,13 @@ msgstr "Ejecutando el comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "No hay suficiente memoria para una línea nueva"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Depurado para el modo cursor activado (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Depurado para el ratón desactivado"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: error, referencia circular al ejecutar el alias \"%s\""
@@ -4518,16 +4574,19 @@ msgstr "objetivo: nombre del servidor"
 msgid "disconnect from one or all IRC servers"
 msgstr "desconectarse de un o todos los servidores IRC"
 
-msgid "[<server>|-all [<reason>]]"
-msgstr "[<servidor>|-all [<razón>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
+msgstr "[<servidor>|-all|-pending [<razón>]]"
 
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 "servidor: nombre del servidor a desconectar\n"
 "    -all: desconectar de todos los servidores\n"
+"-pending: cancelar las reconexiones automáticas a los servidores que están "
+"reconectando\n"
 "   razón: razón de la salida"
 
 msgid "give channel half-operator status to nick(s)"
@@ -4589,8 +4648,8 @@ msgstr "obtener información describiendo al servidor"
 msgid "invite a nick on a channel"
 msgstr "invitar a un apodo a un canal"
 
-msgid "<nick> <channel>"
-msgstr "<apodo> <canal>"
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<apodo> [<apodo>...] [<canal>]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5524,8 +5583,14 @@ msgstr ""
 "\") para habilitar  en el servidor si están disponibles (ejemplo: \"multi-"
 "prefix,extended-join\")"
 
-msgid "mechanism for SASL authentication"
-msgstr "mecanismo para la autenticación SASL"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
+"mecanismo de autenticación SASL: \"plain\" para contraseñas en texto plano, "
+"\"dh-blowfish\" para contraseña encriptada, \"external\" para autentificar "
+"utilizando un certificado SSL del cliente"
 
 msgid "username for SASL authentication"
 msgstr "nombre de usuario para la autenticación SASL"
@@ -5716,10 +5781,14 @@ msgstr "texto a mostrar tras el apodo en la ventana de charla"
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
-"fuerza color para algunos apodos: no se computará el hash usado para elegir "
-"el color en estos apodos (el formato es: \"apodo1:color1;apodo2:color2\")"
+"fuerza color para algunos apodos: hash calculado con el apodo para encontrar "
+"el color no se utilizará para los siguientes apodos (el formato es: \"apodo1:"
+"color1;apodo2:color2\"); búsquedas de apodos son exactamente igual que en "
+"minúsculas, así que es posible usar minúsculas para apodos con esta opción"
 
 msgid ""
 "chars used to stop in nick when computing color with letters of nick (at "
@@ -5937,21 +6006,20 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
 "remapear colores mirc en mensajes usando una tabla hash: claves son \"fg,bg"
-"\" con números entre -1 (no color especificado) y 15, valores son los "
-"nombres de color de WeeChat o número (con el formato: \"1,-1:color1;2,7:"
-"color2\"), ejemplo: \"1,-1:darkgray;1,2:white,blue\" para remapear negro en "
-"cualquier fondo al color \"darkgray\" y negro en azul a color \"white,blue"
-"\"; los colores por defecto de WeeChat con sus códigos IRC son: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
-"lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
-"15:white"
+"\" con números entre -1 (no especificado) y 15, los valores son los nombres "
+"de color de WeeChat o números (con el formato: \"1,-1:color1;2,7:color2\"), "
+"ejemplo: \"1,-1:darkgray;1,2:white,blue\" para remapear negro en \"darkgray"
+"\" y negro en azul a \"white,blue\"; los colores por defecto de WeeChat para "
+"los códigos IRC son: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:"
+"magenta, 7:brown, 8:yellow, 9: lightgreen, 10:cyan, 11:lightcyan, 12:"
+"lightblue, 13:lightmagenta, 14:gray, 15:white"
 
 msgid ""
 "color for nick prefixes using mode char (o=op, h=halfop, v=voice, ..), "
@@ -6273,6 +6341,10 @@ msgstr "%s%s: no estas conectado a ningún servidor"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: ¡este buffer no es un canal!"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+msgid "unknown"
+msgstr "desconocido"
+
 msgid "offline"
 msgstr "fuera de línea"
 
@@ -6293,12 +6365,20 @@ msgid "Notify list is empty on all servers"
 msgstr "Lista de notificaciones vacía en todos los servidores"
 
 #, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
-msgstr "%saviso: %s%s%s se ha unido a %s%s"
+msgid "%snotify: %s%s%s is connected"
+msgstr "%saviso: %s%s%s está conectado"
 
 #, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
-msgstr "%saviso: %s%s%s ha salido de %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr "%saviso: %s%s%s está desconectado"
+
+#, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%saviso: %s%s%s se ha unido"
+
+#, c-format
+msgid "%snotify: %s%s%s has quit"
+msgstr "%saviso: %s%s%s ha salido"
 
 #, c-format
 msgid "%snotify: %s%s%s is now away: \"%s\""
@@ -6808,6 +6888,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: no hay suficiente memoria"
 
+#, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: agotado tiempo de espera"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr "gnutls: conectado usando %d-bit Diffie-Hellman"
@@ -6993,8 +7077,8 @@ msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => nivel %d"
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
-msgstr "===\t========== Fin del último registro (%d líneas) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
+msgstr "%s===\t%s========== Fin del último registro (%d líneas) =========="
 
 msgid "logger plugin configuration"
 msgstr "configuración del plugin de registro"
@@ -7081,6 +7165,12 @@ msgstr ""
 "máximo número de líneas a mostrar del registro cuando se crea un buffer "
 "nuevo (0 = no mostrar nada)"
 
+msgid "color for backlog lines"
+msgstr "color para las líneas del último registro"
+
+msgid "color for line ending the backlog"
+msgstr "color para el final de línea del último registro"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7092,7 +7182,7 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 "número de segundos entre escritura de los archivos de registro (0 = escribir "
-"los archivos immediatamente por cada línea)"
+"los archivos inmediatamente por cada línea)"
 
 msgid "use only lower case for log filenames"
 msgstr "usar solamente minúsculas para el nombre de los archivos"
@@ -8060,6 +8150,12 @@ msgstr ""
 "nombre del script (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
 
+#, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr ""
+"%s%s: atención, puntero inválido (\"%s\") para la función \"%s\" (script: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -8537,3 +8633,15 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Constantes"
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "cadena insertada después de auto-completar un apodo"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostrar '+' si el prefijo ha sido truncado"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<apodo> <canal>"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "mecanismo para la autenticación SASL"

po/fr.po

@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:03+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-05-05 19:52+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1242,7 +1242,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1296,7 +1297,8 @@ msgstr ""
 "Les tags les plus couramment utilisés:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (niveau de log),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx est le pseudo dans le message),\n"
+"  nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc (ccc est la "
+"couleur du pseudo),\n"
 "  irc_xxx (xxx est un nom de commande ou nombre, voir /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1407,6 +1409,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1463,6 +1467,8 @@ msgstr ""
 "  switch_active_buffer: basculer vers le tampon mélangé suivant\n"
 "  switch_active_buffer_previous: basculer vers le tampon mélangé précédent\n"
 "  insert: insérer du texte dans la ligne de commande\n"
+"  paste_start: début de collage (mode \"bracketed paste\")\n"
+"  paste_stop: fin de collage (mode \"bracketed paste\")\n"
 "\n"
 "Cette commande est utilisé par les associations de touches ou les extensions."
 
@@ -1491,6 +1497,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -1544,6 +1551,8 @@ msgstr ""
 "associée à la touche\n"
 "   bindctxt: associer une commande à une touche ou affiche la commande "
 "associée à la touche pour le contexte donné\n"
+"   commande: commande (plusieurs commandes peuvent êtres séparées par des "
+"points-virgules)\n"
 "     unbind: supprimer l'association à une touche\n"
 " unbindctxt: supprimer l'association à une touche pour le contexte donné\n"
 "      reset: réinitialiser une touche à son association par défaut\n"
@@ -2661,10 +2670,30 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "afficher un espace si le mode du pseudo n'est pas (half)op/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+"activer le mode du terminal \"bracketed paste\" (pas supporté par tous les "
+"terminaux/multiplexeurs): dans ce mode, le texte collé est entouré avec des "
+"séquences de contrôle de sorte que WeeChat puisse différencier le texte "
+"collé du texté tapé (\"ESC[200~\", suivi par le texte collé, suivi par \"ESC"
+"[201~\")"
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+"forcer la fin du \"bracketed paste\" après ce délai (en secondes) si la "
+"séquence de contrôle pour la fin du \"bracketed paste\" (\"ESC[201~\") n'a "
+"pas été reçue à temps"
+
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "nombre maximum de lignes pour la détection de collage sans demander à "
-"l'utilisateur (0 = désactiver cette fonctionnalité)"
+"l'utilisateur (-1 = désactiver cette fonctionnalité)"
 
 msgid "prefix for error messages"
 msgstr "préfixe pour les messages d'erreur"
@@ -2690,8 +2719,11 @@ msgstr "taille maximum pour le préfixe (0 = pas de taille maximum)"
 msgid "min size for prefix"
 msgstr "taille minimum pour le préfixe"
 
-msgid "display '+' if prefix is truncated"
-msgstr "afficher '+' si le préfixe est tronqué"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
+"caractère à afficher si le préfixe est tronqué (doit être exactement un "
+"caractère à l'écran)"
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2708,11 +2740,22 @@ msgstr ""
 "avec le même numéro (0 = pas de taille maximum)"
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
-"afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont "
-"mélangés avec le même numéro)"
+"caractère à afficher si le nom du tampon est tronqué (lorsque plusieurs "
+"tampons sont mélangés avec le même numéro) (doit être exactement un "
+"caractère à l'écran)"
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+"préfixe affiché pour un message avec le même pseudo que le précédent "
+"message: utiliser un espace \" \" pour cacher le préfixe, une autre chaîne "
+"pour l'afficher à la place du préfixe, ou une chaîne vide pour désactiver "
+"cette fonctionnalité (afficher le préfixe)"
 
 msgid "string displayed after prefix"
 msgstr "chaîne affichée après le préfixe"
@@ -3018,8 +3061,12 @@ msgstr ""
 "ajouter un espace après la complétion du pseudo (quand le pseudo n'est pas "
 "le premier mot sur la ligne de commande)"
 
-msgid "string inserted after nick completion"
-msgstr "chaîne affichée après la complétion des pseudos"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"chaîne insérée après la complétion du pseudo (quand le pseudo est le premier "
+"mot sur la ligne de commande)"
 
 msgid "complete only with first nick found"
 msgstr "compléter seulement avec le premier pseudo trouvé"
@@ -3081,6 +3128,13 @@ msgstr ""
 "nombre maximum de commandes à afficher par défaut dans le listing "
 "d'historique (0 = sans limite)"
 
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr ""
+"délai d'attente maximum (en secondes) pour la connexion à une machine "
+"distante (effectuée dans un processus fils)"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3514,8 +3568,10 @@ msgid "Bar \"%s\" updated"
 msgstr "Barre \"%s\" mise à jour"
 
 #, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sColler %d lignes ? [ctrl-Y] Oui [ctrl-N] Non"
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sColler %d ligne ? [ctrl-Y] Oui [ctrl-N] Non"
+msgstr[1] "%sColler %d lignes ? [ctrl-Y] Oui [ctrl-N] Non"
 
 msgid "Text search"
 msgstr "Recherche texte"
@@ -3560,13 +3616,6 @@ msgstr[1] "normaux"
 msgid "Debug disabled for cursor mode"
 msgstr "Debug désactivé pour le mode curseur"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debug activé pour la souris (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debug désactivé pour la souris"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Erreur: impossible d'ajouter le tampon à la liste des tampons actifs"
 
@@ -3596,6 +3645,13 @@ msgstr "Lancement de la commande: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Pas assez de mémoire pour une nouvelle ligne"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debug activé pour la souris (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debug désactivé pour la souris"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: erreur, référence circulaire lors de l'appel à l'alias \"%s\""
@@ -3677,7 +3733,7 @@ msgstr ""
 "     alias: nom de l'alias (peut démarrer ou se terminer par \"*\" pour une "
 "liste d'alias)\n"
 "  commande: nom de la commande avec les paramètres (plusieurs commandes "
-"peuvent être séparées par des point-virgules)\n"
+"peuvent être séparées par des points-virgules)\n"
 "\n"
 "Sans paramètre, cette commande liste tous les alias définis.\n"
 "\n"
@@ -4559,17 +4615,20 @@ msgstr "cible: nom du serveur"
 msgid "disconnect from one or all IRC servers"
 msgstr "se déconnecter d'un ou de tous les serveurs IRC"
 
-msgid "[<server>|-all [<reason>]]"
-msgstr "[<serveur>|-all [<raison>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
+msgstr "[<serveur>|-all|-pending [<raison>]]"
 
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
-"serveur: nom du serveur pour se déconecter\n"
-"   -all: se déconnecter de tous les serveurs\n"
-" raison: raison pour le quit"
+" serveur: nom du serveur pour se déconecter\n"
+"    -all: se déconnecter de tous les serveurs\n"
+"-pending: annuler la reconnexion automatique sur les serveurs en cours de "
+"reconnexion\n"
+"  raison: raison pour le quit"
 
 msgid "give channel half-operator status to nick(s)"
 msgstr "donner le statut de demi-opérateur à un/des pseudo(s)"
@@ -4631,8 +4690,8 @@ msgstr "voir les informations décrivant le serveur"
 msgid "invite a nick on a channel"
 msgstr "inviter un pseudo sur un canal"
 
-msgid "<nick> <channel>"
-msgstr "<pseudo> <canal>"
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<pseudo> [<pseudo>...] [<canal>]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5567,8 +5626,14 @@ msgstr ""
 "à activer sur le serveur si elles sont disponibles (exemple: \"multi-prefix,"
 "extended-join\")"
 
-msgid "mechanism for SASL authentication"
-msgstr "mécanisme pour l'authentification SASL"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
+"mécanisme pour l'authentification SASL: \"plain\" pour un mot de passe en "
+"clair, \"dh-blowfish\" pour un mot de passe chiffré, \"external\" pour une "
+"authentification en utilisant un certificat SSL côté client"
 
 msgid "username for SASL authentication"
 msgstr "nom d'utilisateur pour l'authentification SASL"
@@ -5760,11 +5825,15 @@ msgstr "texte à afficher après le pseudo dans la fenêtre de discussion"
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "force la couleur pour certains pseudos: le hash calculé avec le pseudo pour "
 "trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "
-"\"pseudo1:couleur1;pseudo2:couleur2\")"
+"\"pseudo1:couleur1;pseudo2:couleur2\"); la recherche de pseudos s'effectue "
+"avec la casse exacte puis en minuscules, donc il est possible d'utiliser "
+"uniquement des minuscules pour les pseudos dans cette option"
 
 msgid ""
 "chars used to stop in nick when computing color with letters of nick (at "
@@ -5988,9 +6057,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -5998,11 +6067,11 @@ msgstr ""
 "les clés sont \"fg,bg\" sous forme d'entiers entre -1 (non spécifié) et 15, "
 "les valeurs sont des noms de couleur WeeChat ou nombres (le format est: "
 "\"1,-1:couleur1;2,7:couleur2\"), exemple: \"1,-1:darkgray;1,2:white,blue\" "
-"pour réassigner le noir sur n'importe quel fond en \"darkgray\" et le noir "
-"sur bleu en \"white,blue\"; les couleurs WeeChat par défaut pour les codes "
-"IRC sont: 0:white, 1:black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:"
-"brown, 8:yellow, 9:lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:"
-"lightmagenta, 14:gray, 15:white"
+"pour réassigner le noir en \"darkgray\" et le noir sur bleu en \"white,blue"
+"\"; les couleurs WeeChat par défaut pour les codes IRC sont: 0:white, 1:"
+"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9:"
+"lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
+"15:white"
 
 msgid ""
 "color for nick prefixes using mode char (o=op, h=halfop, v=voice, ..), "
@@ -6324,6 +6393,10 @@ msgstr "%s%s: vous n'êtes pas connecté au serveur"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: ce tampon n'est pas un canal !"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+msgid "unknown"
+msgstr "inconnu"
+
 msgid "offline"
 msgstr "déconnecté"
 
@@ -6344,12 +6417,20 @@ msgid "Notify list is empty on all servers"
 msgstr "La liste de notifications est vide sur tous les serveurs"
 
 #, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
-msgstr "%snotify: %s%s%s a rejoint %s%s"
+msgid "%snotify: %s%s%s is connected"
+msgstr "%snotify: %s%s%s est connecté"
 
 #, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
-msgstr "%snotify: %s%s%s a quitté %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr "%snotify: %s%s%s est déconnecté"
+
+#, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%snotify: %s%s%s a rejoint"
+
+#, c-format
+msgid "%snotify: %s%s%s has quit"
+msgstr "%snotify: %s%s%s a quitté"
 
 #, c-format
 msgid "%snotify: %s%s%s is now away: \"%s\""
@@ -6862,6 +6943,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: pas assez de mémoire"
 
+#, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: délai d'attente dépassé"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -7040,8 +7125,8 @@ msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => niveau %d"
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
-msgstr "===\t========== Fin de l'historique (%d lignes) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
+msgstr "%s===\t%s========== Fin de l'historique (%d lignes) =========="
 
 msgid "logger plugin configuration"
 msgstr "configuration de l'extension logger"
@@ -7127,6 +7212,12 @@ msgstr ""
 "nombre maximum de lignes à afficher du fichier de log lors de l'ouverture du "
 "tampon (0 = ne rien afficher)"
 
+msgid "color for backlog lines"
+msgstr "couleur pour les lignes de l'historique"
+
+msgid "color for line ending the backlog"
+msgstr "couleur pour la ligne de fin de l'historique"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -8112,6 +8203,13 @@ msgstr ""
 "nom de script (peut démarrer ou se terminer par \"*\" comme joker) "
 "(optionnel)"
 
+#, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr ""
+"%s%s: attention, pointeur invalide (\"%s\") pour la fonction \"%s\" (script: "
+"%s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -8590,3 +8688,31 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Constantes"
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "chaîne affichée après la complétion des pseudos"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "afficher '+' si le préfixe est tronqué"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<pseudo> <canal>"
+
+#~ msgid ""
+#~ "delay (in seconds) to wait for control sequence ending a bracketed paste "
+#~ "(\"ESC[201~\"); if the control sequence is not received and that delay is "
+#~ "reached, WeeChat will end the bracketed paste"
+#~ msgstr ""
+#~ "délai (en secondes) à attendre pour la séquence de contrôle qui termine "
+#~ "le mode \"bracketed paste\" (\"ESC[201~\"); si la séquence de contrôle "
+#~ "n'est pas reçue et que ce délai est atteint, WeeChat terminera le "
+#~ "\"bracketed paste\""
+
+#~ msgid ""
+#~ "enable bracketed paste mode (if available, only some terminals support it)"
+#~ msgstr ""
+#~ "activer le mode \"bracketed paste\" (si disponible, seulement quelques "
+#~ "terminaux le supportent)"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "mécanisme pour l'authentification SASL"

po/hu.po

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Hungarian\n"
@@ -1152,7 +1152,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1261,6 +1262,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1290,6 +1293,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2152,7 +2156,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "maximálisan beilleszthető sorok száma a felhasználó megkérdezése nélkül (0 = "
 "szolgáltatás kikapcsolása)"
@@ -2187,7 +2204,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr "névkiegészítés után beszúrt szöveg"
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -2201,8 +2219,14 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
+msgstr ""
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
 msgstr ""
 
 #, fuzzy
@@ -2499,7 +2523,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "string inserted after nick completion"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
 msgstr "névkiegészítés után beszúrt szöveg"
 
 msgid "complete only with first nick found"
@@ -2557,6 +2583,12 @@ msgstr ""
 "megjeleníthető parancsok maximális száma előzmények listázásakor ( 0 = "
 "korlátlan)"
 
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "SSL használata a a kapcsolathoz"
+
 #, fuzzy
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
@@ -2980,8 +3012,10 @@ msgid "Bar \"%s\" updated"
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
 
 #, fuzzy, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "  Beszúrható %d sor? [ctrl-Y] Igen  [ctrl-N] Nem"
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "  Beszúrható %d sor? [ctrl-Y] Igen  [ctrl-N] Nem"
+msgstr[1] "  Beszúrható %d sor? [ctrl-Y] Igen  [ctrl-N] Nem"
 
 #, fuzzy
 msgid "Text search"
@@ -3027,13 +3061,6 @@ msgstr[1] "normál"
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 #, fuzzy
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "%s nincs elég memória az ignore elkészítéséhez\n"
@@ -3065,6 +3092,13 @@ msgstr "%s belső parancsok:\n"
 msgid "Not enough memory for new line"
 msgstr "Nincs elég memória az új sorhoz\n"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n"
@@ -3940,14 +3974,20 @@ msgid "disconnect from one or all IRC servers"
 msgstr "kilépés a szerver(ek)ről"
 
 #, fuzzy
-msgid "[<server>|-all [<reason>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr "[[szerver] szerver_maszk]"
 
+#, fuzzy
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
+"-all: újracsatlakozás minden szerverhez\n"
+"szervernév: újracsatlakozás a megadott szerverhez\n"
+"-nojoin: ne lépjen be semmilyen szobába (még ha az automatikus belépés be is "
+"van kapcsolva a szerveren)"
 
 #, fuzzy
 msgid "give channel half-operator status to nick(s)"
@@ -3989,8 +4029,8 @@ msgid "invite a nick on a channel"
 msgstr "felhasználó meghívása szobából"
 
 #, fuzzy
-msgid "<nick> <channel>"
-msgstr "név szoba"
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "név [név...]"
 
 #, fuzzy
 msgid ""
@@ -4927,9 +4967,11 @@ msgid ""
 "available (example: \"multi-prefix,extended-join\")"
 msgstr ""
 
-#, fuzzy
-msgid "mechanism for SASL authentication"
-msgstr "SSL használata a a kapcsolathoz"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 #, fuzzy
 msgid "username for SASL authentication"
@@ -5110,7 +5152,9 @@ msgstr "a név után megjelenítendő szöveg a beszédablakban"
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 
 msgid ""
@@ -5285,9 +5329,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -5617,6 +5661,11 @@ msgstr "%s nincs csatlakozva szerverhez!\n"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "Ez az ablak nem egy szoba!\n"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(ismeretlen)"
+
 msgid "offline"
 msgstr ""
 
@@ -5638,11 +5687,19 @@ msgid "Notify list is empty on all servers"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+msgid "%snotify: %s%s%s is connected"
 msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
 
 #, fuzzy, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
 
 #, fuzzy, c-format
@@ -6136,6 +6193,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "Nincs elég memória az új sorhoz\n"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -6312,7 +6373,7 @@ msgid "%s: \"%s\" => level %d"
 msgstr "A \"%s\" aliasz eltávolítva\n"
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr ""
 
 #, fuzzy
@@ -6367,6 +6428,14 @@ msgid ""
 msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "távollevő felhasználók nevének színe"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "nevek színe"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7314,6 +7383,11 @@ msgstr ""
 msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -7797,3 +7871,11 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "<nick> <channel>"
+#~ msgstr "név szoba"
+
+#, fuzzy
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "SSL használata a a kapcsolathoz"

po/it.po

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-04-15 17:41+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -1231,7 +1231,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1285,7 +1286,8 @@ msgstr ""
 "Tag usati di frequente:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (livello di log),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx è il nick nel messaggio),\n"
+"  nick_xxx (xxx è il nick nel messaggio) prefix_nick_ccc (ccc è il colore "
+"del nick),\n"
 "  irc_xxx (xxx è il nome comando o il numero, consultare /server raw),   "
 "irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1396,6 +1398,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1450,6 +1454,8 @@ msgstr ""
 "  switch_active_buffer: passa al successivo buffer incollato\n"
 "  switch_active_buffer_previous: passa al precedente buffer incollato\n"
 "  insert: inserisci testo nella riga di comando\n"
+"  paste_start: inizio testo da incollare (modalità \"bracketed paste\")\n"
+"  paste_stop: fine testo da incollare (modalità \"bracketed paste\")\n"
 "\n"
 "Questo comando viene usato dalla combinazioni tasti o dai plugin."
 
@@ -1467,6 +1473,7 @@ msgstr ""
 "unbindctxt <contesto> <chiave> || reset <tasto> || resetctxt <contesto> "
 "<tasto> || resetall -yes [<contesto>] || missing [<contesto>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1478,6 +1485,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2642,9 +2650,29 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostra spazio se il nick non è in modalità (half)op/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
 msgstr ""
-"numero massimo di righe da incollare senza conferma dell'utente (0 = "
+"abilita la modalità \"bracketed paste\" per il terminale (non supportata da "
+"tutti i terminali/multiplexer): in questa modalità, il testo incollato viene "
+"circondato da sequenze di controllo in modo che WeeChat possa differenziare "
+"il testo incollato dal testo digitato (\"ESC[200~\", seguito dal testo "
+"incollato, seguito da \"ESC[201~\")"
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+"forza la fine della modalità \"bracketed paste\" dopo questo ritardo (in "
+"secondi) se la sequenza di controllo per la fine del \"bracketed paste"
+"\" (\"ESC[201~\") non è stata ricevuta in tempo"
+
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
+msgstr ""
+"numero massimo di righe da incollare senza conferma dell'utente (-1 = "
 "disabilita questa caratteristica)"
 
 msgid "prefix for error messages"
@@ -2671,8 +2699,11 @@ msgstr "dimensione massima prefisso (0 = nessuna dimensione massima)"
 msgid "min size for prefix"
 msgstr "dimensione minima per il prefisso"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostra '+' se il prefisso è troncato"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
+"carattere da mostrare se il prefisso è troncato (deve essere esattamente un "
+"carattere sullo schermo)"
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2690,11 +2721,22 @@ msgstr ""
 "lo stesso numero (0 = nessuna dimensione massima)"
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
-"visualizza '+' se il nome del buffer è troncato (quando più buffer sono "
-"uniti con lo stesso numero)"
+"carattere da mostrare se il nome del buffer è troncato (quando più buffer "
+"vengono uniti con lo stesso numero) (deve essere esattamente un carattere su "
+"schermo)"
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+"prefisso mostrato per un messaggio con lo stesso nick del messaggio "
+"precedente: usare uno spazio \" \" per nascondere il prefisso, un'altra "
+"stringa per mostrare la stringa invece del prefisso, o una stringa vuota per "
+"disabilitare questa funzionalità (mostra prefisso)"
 
 msgid "string displayed after prefix"
 msgstr "stringa visualizzata dopo il prefisso"
@@ -2986,8 +3028,12 @@ msgstr ""
 "aggiungi uno spazio al completamento del nick (quando non è la prima parola "
 "sulla riga di comando)"
 
-msgid "string inserted after nick completion"
-msgstr "stringa inserita dopo il completamento del nick"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"stringa inserita dopo il completamento del nick (quando il nick è la prima "
+"parola sulla riga di comando)"
 
 msgid "complete only with first nick found"
 msgstr "completa solo con il primo nick trovato"
@@ -3021,8 +3067,7 @@ msgstr ""
 
 msgid "display count for each partial completion in bar item"
 msgstr ""
-"visualizza contatore per ogni completamento parziale nella barra degli "
-"oggetti"
+"mostra contatore per ogni completamento parziale nella barra degli oggetti"
 
 msgid "maximum number of lines in history per buffer (0 = unlimited)"
 msgstr ""
@@ -3049,12 +3094,19 @@ msgstr ""
 "numero massimo predefinito di comandi da visualizzare nella cronologia (0 = "
 "nessun limite)"
 
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr ""
+"timeout (in secondi) per la connessione ad un host remoto (eseguita in un "
+"processo figlio)"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
 "file contenente le autorità certificative (\"%h\" sarà sostituito dalla home "
-"di WeeChat, \"~/.weechat come predefinita)"
+"di WeeChat, predefinita: \"~/.weechat)"
 
 msgid "timeout (in seconds) for gnutls handshake"
 msgstr "timeout (in secondi) per l'handshake di gnutls"
@@ -3475,8 +3527,10 @@ msgid "Bar \"%s\" updated"
 msgstr "Barra \"%s\" aggiornata"
 
 #, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sIncollare %d righe? [ctrl-y] Sì [ctrl-n] No"
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sIncollare %d riga? [ctrl-Y] Sì [ctrl-N] No"
+msgstr[1] "%sIncollare %d righe? [ctrl-Y] Sì [ctrl-N] No"
 
 msgid "Text search"
 msgstr "Ricerca testo"
@@ -3519,13 +3573,6 @@ msgstr[1] "normali"
 msgid "Debug disabled for cursor mode"
 msgstr "Debug disabilitato per la modalità cursore"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debug abilitato per il mouse (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debug disabilitato per il mouse"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Errore: memoria non sufficiente per aggiungere un buffer alla hotlist"
 
@@ -3555,6 +3602,13 @@ msgstr "Esecuzione comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Memoria non sufficiente per una nuova riga"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debug abilitato per il mouse (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debug disabilitato per il mouse"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: errore, riferimento circolare alla chiamata dell'alias \"%s\""
@@ -4511,17 +4565,20 @@ msgstr "destinazione: nome server"
 msgid "disconnect from one or all IRC servers"
 msgstr "disconnette da uno o tutti i server IRC"
 
-msgid "[<server>|-all [<reason>]]"
-msgstr "[<server>|-all [<motivo>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
+msgstr "[<server>|-all|-pending [<motivo>]]"
 
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
-"server: nome del server da cui disconnettersi\n"
-"  -all: disconnette da tutti i server\n"
-"motivo: motivo per la disconnessione"
+"  server: nome del server da cui disconnettersi\n"
+"    -all: disconnette da tutti i server\n"
+"-pending: annulla la riconnessione automatica sui server in fase di "
+"riconnessione\n"
+"  motivo: motivo per la disconnessione"
 
 msgid "give channel half-operator status to nick(s)"
 msgstr "concede lo stato di half-op del canale ad uno (o più) nick"
@@ -4582,8 +4639,8 @@ msgstr "ottieni informazioni sul server"
 msgid "invite a nick on a channel"
 msgstr "invita un nick su un canale"
 
-msgid "<nick> <channel>"
-msgstr "<nick> <canale>"
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<nick> [<nick>...] [<canale>]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5512,8 +5569,14 @@ msgstr ""
 "\") da abilitare per il server se disponibili (esempio: \"multi-prefix,"
 "extended-join\")"
 
-msgid "mechanism for SASL authentication"
-msgstr "meccanismo per l'autenticazione SASL"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
+"meccanismo per l'autenticazione SASL: \"plain\" per le password in chiaro, "
+"\"dh-blowfish\" per le password cifrate, \"external\" per l'autenticazione "
+"con certificati SSL lato client"
 
 msgid "username for SASL authentication"
 msgstr "nome utente per l'autenticazione SASL"
@@ -5699,11 +5762,15 @@ msgstr "testo da visualizzare dopo il nick nella finestra di chat"
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "forza colore per alcuni nick: l'hash calcolato con il nick per trovare il "
 "colore non verrà usato per questi nick (il formato è: \"nick1:color1;nick2:"
-"color2\")"
+"color2\"); la ricerca dei nick è prima sensibile alle maiuscole, poi con le "
+"minuscole, per cui è possibile usare solo le minuscole per i nick in questa "
+"opzione"
 
 msgid ""
 "chars used to stop in nick when computing color with letters of nick (at "
@@ -5930,21 +5997,20 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
-"riordina i colori mirc nei messaggi usando una tabella hash: le chiavi sono "
+"riassegna i colori mirc nei messaggi usando una tabella hash: le chiavi sono "
 "\"fg,bg\" come interi tra -1 (non specificato) e 15, i valori sono i numeri "
 "oppure i nomi dei colori di WeeChat (il formato è: \"1,-1:colore1;2,7:"
-"colore2\"), esempio: \"1,-1\":darkgray;1,2:white,blue\" per riordinare dal "
-"nero su qualsiasi colore di sfondo a \"darkgray\" e dal nero su blu a "
-"\"white,blue\"; i colori predefiniti di WeeChat per i codici IRC: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
-"lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
-"15:white"
+"colore2\"), esempio: \"1,-1\":darkgray;1,2:white,blue\" per riassegnare dal "
+"nero a \"darkgray\" e dal nero su blu a \"white,blue\"; i colori predefiniti "
+"di WeeChat per i codici IRC: 0:white, 1:black, 2:blue, 3:green, 4:lightred, "
+"5:red, 6:magenta, 7:brown, 8:yellow, 9:lightgreen, 10:cyan, 11:lightcyan, 12:"
+"lightblue, 13:lightmagenta, 14:gray, 15:white"
 
 msgid ""
 "color for nick prefixes using mode char (o=op, h=halfop, v=voice, ..), "
@@ -6268,6 +6334,10 @@ msgstr "%s%s: non connesso al server"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: questo buffer non è un canale!"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+msgid "unknown"
+msgstr "sconosciuto"
+
 msgid "offline"
 msgstr "non in linea"
 
@@ -6288,12 +6358,20 @@ msgid "Notify list is empty on all servers"
 msgstr "La lista notifiche è vuota su tutti i server"
 
 #, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
-msgstr "%snotifica: %s%s%s è entrato in %s%s"
+msgid "%snotify: %s%s%s is connected"
+msgstr "%snotifica: %s%s%s è connesso"
 
 #, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
-msgstr "%snotifica: %s%s%s è uscito da %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr "%snotifica: %s%s%s non è in linea"
+
+#, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%snotifica: %s%s%s è entrato"
+
+#, c-format
+msgid "%snotify: %s%s%s has quit"
+msgstr "%snotifica: %s%s%s si è disconnesso"
 
 #, c-format
 msgid "%snotify: %s%s%s is now away: \"%s\""
@@ -6301,7 +6379,7 @@ msgstr "%snotifica: %s%s%s ora è assente: \"%s\""
 
 #, c-format
 msgid "%snotify: %s%s%s is back"
-msgstr "%snotifica: %s%s%s è rientrato"
+msgstr "%snotifica: %s%s%s è tornato"
 
 #, c-format
 msgid "%snotify: %s%s%s is still away: \"%s\""
@@ -6802,6 +6880,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: memoria non sufficiente"
 
+#, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: timeout"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -6979,8 +7061,8 @@ msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => livello %d"
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
-msgstr "===\t========== Fine del backlog (%d righe) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
+msgstr "%s===\t%s========== Fine della cronologia (%d righe) =========="
 
 msgid "logger plugin configuration"
 msgstr "configurazione del plugin logger"
@@ -7064,7 +7146,13 @@ msgid ""
 "= no backlog)"
 msgstr ""
 "numero massimo di righe da visualizzare dal file di log alla creazione di un "
-"nuovo buffer (0 = nessun backlog)"
+"nuovo buffer (0 = nessuna cronologia)"
+
+msgid "color for backlog lines"
+msgstr "colore per la cronologia"
+
+msgid "color for line ending the backlog"
+msgstr "colore per la riga finale nella cronologia"
 
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
@@ -8043,6 +8131,13 @@ msgstr ""
 "nome script (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
 
+#, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr ""
+"%s%s: attenzione, puntatore (\"%s\") non valido per la funzione \"%s"
+"\" (script: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -8512,3 +8607,15 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Costanti"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostra '+' se il prefisso è troncato"
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "stringa inserita dopo il completamento del nick"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<nick> <canale>"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "meccanismo per l'autenticazione SASL"

po/ja.po

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: \"AYANOKOUZI, Ryuunosuke\" <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -1185,6 +1185,7 @@ msgstr ""
 "list || enable|disable|toggle [<name>] || add <name> <buffer>[,<buffer>...] "
 "<tags> <regex> || del <name>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1217,7 +1218,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1330,6 +1332,7 @@ msgstr "コマンドライン関数"
 msgid "<action> [<arguments>]"
 msgstr "<action> [<arguments>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
@@ -1379,6 +1382,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1447,6 +1452,7 @@ msgstr ""
 "<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
 "[<context>] || missing [<context>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1458,6 +1464,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2592,7 +2599,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "ニックモードが (half)op/voice でなければ空白を表示"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr "ユーザへの確認無しにペーストできる行数の最大値 (0 = この機能を無効化)"
 
 msgid "prefix for error messages"
@@ -2619,8 +2639,9 @@ msgstr "プレフィックスのサイズの最大値 (0 = 最大値の指定無
 msgid "min size for prefix"
 msgstr "プレフィックスサイズの最小値"
 
-msgid "display '+' if prefix is truncated"
-msgstr "プレフィックスが切り詰められた場合は '+' を表示"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2636,13 +2657,20 @@ msgstr ""
 "多くのバッファが同じ番号を持つようにマージされた場合の、バッファ名のサイズの"
 "最大値 (0 = 最大値の指定無し)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "バッファ名が切り詰められた場合は '+' を表示 (多くのバッファが同じ番号を持つよ"
 "うにマージされた場合)"
 
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+
 msgid "string displayed after prefix"
 msgstr "プレフィックスの後ろに表示される文字列"
 
@@ -2913,8 +2941,13 @@ msgstr ""
 "ニックネーム補完の後に空白を追加 (コマンドラインの最初がニックネームでない場"
 "合は)"
 
-msgid "string inserted after nick completion"
-msgstr "ニックネーム補完の後に追加される文字列"
+#, fuzzy
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"ニックネーム補完の後に空白を追加 (コマンドラインの最初がニックネームでない場"
+"合は)"
 
 msgid "complete only with first nick found"
 msgstr "最初に見つかったニックネームだけを補完"
@@ -2969,6 +3002,12 @@ msgid ""
 msgstr ""
 "履歴をリストアップする際にデフォルトで表示するコマンドの最大数 (0 = 制限無し)"
 
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "gnutls ハンドシェイクのタイムアウト (秒単位)"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3387,9 +3426,10 @@ msgstr ""
 msgid "Bar \"%s\" updated"
 msgstr "バー \"%s\" がアップデートされました"
 
-#, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%s %d 行を貼り付けますか? [ctrl-Y] はい [ctrl-N] いいえ"
+#, fuzzy, c-format
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%s %d 行を貼り付けますか? [ctrl-Y] はい [ctrl-N] いいえ"
 
 msgid "Text search"
 msgstr "テキスト検索"
@@ -3431,13 +3471,6 @@ msgstr[0] "通常"
 msgid "Debug disabled for cursor mode"
 msgstr "カーソルモードのデバッグを無効化"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "マウス (%s) のデバッグを有効化"
-
-msgid "Debug disabled for mouse"
-msgstr "マウスのデバッグを無効化"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "エラー: バッファをホットリストに追加するメモリが足りません"
 
@@ -3467,6 +3500,13 @@ msgstr "コマンド実行中: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "新しい行に使うメモリが足りません"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "マウス (%s) のデバッグを有効化"
+
+msgid "Debug disabled for mouse"
+msgstr "マウスのデバッグを無効化"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: エラー、別名 \"%s\" の呼び出し中に循環参照を検知"
@@ -4406,13 +4446,16 @@ msgstr "target: サーバ名"
 msgid "disconnect from one or all IRC servers"
 msgstr "一つか全ての IRC との接続を切断"
 
-msgid "[<server>|-all [<reason>]]"
+#, fuzzy
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr "[<server>|-all [<reason>]]"
 
+#, fuzzy
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 "server: 接続を切断するサーバ名\n"
 "  -all: 全てのサーバとの接続を切る\n"
@@ -4477,8 +4520,9 @@ msgstr "サーバに関する情報を入手"
 msgid "invite a nick on a channel"
 msgstr "チャンネルにニックネームを招待"
 
-msgid "<nick> <channel>"
-msgstr "<nick> <channel>"
+#, fuzzy
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<nick> [<nick>...]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5393,8 +5437,11 @@ msgstr ""
 "サーバで利用可能ならば有効化する、クライアント能力のコンマ区切りリスト (例: "
 "\"multi-prefix,extended-join\")"
 
-msgid "mechanism for SASL authentication"
-msgstr "SASL 認証メカニズム"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 msgid "username for SASL authentication"
 msgstr "SASL 認証用ユーザ名"
@@ -5572,9 +5619,12 @@ msgstr "チャットウィンドウ内でニックネーム前に表示するテ
 msgid "text to display after nick in chat window"
 msgstr "チャットウィンドウ内でニックネーム後に表示するテキスト"
 
+#, fuzzy
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "ニックネーム色を強制するニックネーム: ニックネームから計算されるハッシュを元"
 "にした色を利用しない (フォーマット: \"nick1:color1;nick2:color2\")"
@@ -5780,13 +5830,14 @@ msgid "color for text in part/quit messages"
 msgstr "退出/終了 メッセージの色"
 
 #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string
+#, fuzzy
 msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -6104,6 +6155,11 @@ msgstr "%s%s: サーバに接続していません"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: このバッファはチャンネルではありません"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(未定義)"
+
 msgid "offline"
 msgstr "オフライン"
 
@@ -6123,12 +6179,20 @@ msgstr "全てのサーバの通知リスト:"
 msgid "Notify list is empty on all servers"
 msgstr "全てのサーバの通知リストは空です"
 
-#, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is connected"
 msgstr "%s通知: %s%s%s が %s%s に参加"
 
-#, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is offline"
+msgstr "%s通知: %s%s%s が %s%s に参加"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%s通知: %s%s%s が %s%s に参加"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%s通知: %s%s%s が %s%s から終了"
 
 #, c-format
@@ -6636,6 +6700,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: メモリが足りません"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: \"%s\" のタイムアウト %s"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr "gnutls: %d-ビット Diffie-Hellman 共有鍵交換を使って接続中"
@@ -6812,8 +6880,8 @@ msgstr "ログ保存が開始されていません"
 msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => レベル %d"
 
-#, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+#, fuzzy, c-format
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr "===\t========== バックログの最後 (%d 行) =========="
 
 msgid "logger plugin configuration"
@@ -6895,6 +6963,14 @@ msgid ""
 msgstr ""
 "新規バッファの作成時にログファイルから表示する行の最大数 (0 = バックログ無し)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "離席アイテムに使う色"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "インプットバーのニックネームに使う色"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7851,6 +7927,11 @@ msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "スクリプト名 (ワイルドカードとして \"*\" で始めるか終われる) (オプション)"
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s%s: 関数 \"%s\" の不正な引数 (スクリプト: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr "%s: スクリプト \"%s\" のロード中にエラー (無効な名前、スペースは禁止)"
@@ -8314,3 +8395,15 @@ msgstr "タイプ"
 
 msgid "Constants"
 msgstr "定数"
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "ニックネーム補完の後に追加される文字列"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "プレフィックスが切り詰められた場合は '+' を表示"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<nick> <channel>"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "SASL 認証メカニズム"

po/pl.po

@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Polish\n"
@@ -1213,6 +1213,7 @@ msgstr ""
 "list || enable|disable|toggle [<nazwa>] || add <nazwa> <bufor>[,<bufor>...] "
 "<tagi> <regex> || del <nazwa>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1245,7 +1246,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1361,6 +1363,7 @@ msgstr "funkcje linii komend"
 msgid "<action> [<arguments>]"
 msgstr "<akcja> [<argumenty>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
@@ -1410,6 +1413,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1483,6 +1488,7 @@ msgstr ""
 "resetctxt <kontekst> <klawisz> || resetall -yes [<kontekst>] || missing "
 "[<kontekst>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1494,6 +1500,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2650,7 +2657,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "wyświetl spację jeśli atrybut nick nie ma atrybutu"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "maksymalna ilość linii do wklejenia bez pytania użytkownika (0 = wyłącza tę "
 "opcję)"
@@ -2679,8 +2699,9 @@ msgstr "maksymalny rozmiar przedrostka (0 = brak maksymalnego rozmiaru)"
 msgid "min size for prefix"
 msgstr "minimalny rozmiar przedrostka"
 
-msgid "display '+' if prefix is truncated"
-msgstr "wyświetl '+', jeśli przedrostek jest obcięty"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2696,13 +2717,20 @@ msgstr ""
 "maksymalna długość nazwy bufora, kiedy wiele buforów jest połączonych z "
 "identycznym numerem (0 = brak maksymalnej długości)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "wyświetl '+' jeśli nazwa bufora została obcięta (kiedy wiele buforów jest "
 "scalonych z takim samym numerem)"
 
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+
 msgid "string displayed after prefix"
 msgstr "ciąg wyświetlany po przedrostku"
 
@@ -2986,8 +3014,13 @@ msgstr ""
 "dodaj spację po dopełnionym nicku (kiedy nick nie jest pierwszym słowem w "
 "linii poleceń)"
 
-msgid "string inserted after nick completion"
-msgstr "ciąg wstawiany po dopełnionym nicku"
+#, fuzzy
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"dodaj spację po dopełnionym nicku (kiedy nick nie jest pierwszym słowem w "
+"linii poleceń)"
 
 msgid "complete only with first nick found"
 msgstr "dopełniaj tylko pierwszym znalezionym nickiem"
@@ -3045,6 +3078,12 @@ msgstr ""
 "maksymalna ilość komend domyślnie wyświetlanych w listingu historii (0 = bez "
 "ograniczeń)"
 
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "czas oczekiwania (w sekundach) na uwierzytelnienie gnutls"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3466,9 +3505,12 @@ msgstr ""
 msgid "Bar \"%s\" updated"
 msgstr "Uaktualniono pasek \"%s\""
 
-#, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sWkleić %d linii ? [ctrl-Y] Tak [ctrl-N] Nie"
+#, fuzzy, c-format
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sWkleić %d linii ? [ctrl-Y] Tak [ctrl-N] Nie"
+msgstr[1] "%sWkleić %d linii ? [ctrl-Y] Tak [ctrl-N] Nie"
+msgstr[2] "%sWkleić %d linii ? [ctrl-Y] Tak [ctrl-N] Nie"
 
 msgid "Text search"
 msgstr "Wyszukiwanie teksu"
@@ -3513,13 +3555,6 @@ msgstr[2] "normalnych"
 msgid "Debug disabled for cursor mode"
 msgstr "Debugowanie wyłączone dla trybu kursora"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debugowanie włączone dla myszy (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debugowanie wyłączone dla myszy"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Błąd: za mało pamięci, aby dodać bufor do hotlisty"
 
@@ -3549,6 +3584,13 @@ msgstr "Wykonuję komendę: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Za mało pamięci na nowy wiersz"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debugowanie włączone dla myszy (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debugowanie wyłączone dla myszy"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: błąd, cykliczna referencja przy wywoływaniu aliasu \"%s\""
@@ -4496,13 +4538,16 @@ msgstr "cel: nazwa serwera"
 msgid "disconnect from one or all IRC servers"
 msgstr "rozłącza się z jednym lub wszystkimi serwerami IRC"
 
-msgid "[<server>|-all [<reason>]]"
+#, fuzzy
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr "[<serwer>|-all [<powód>]]"
 
+#, fuzzy
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 "serwer: nazwa serwera do rozłączenia\n"
 "  -all: rozłącza się ze wszystkimi serwerami\n"
@@ -4566,8 +4611,9 @@ msgstr "pobiera informacje opisujące serwer"
 msgid "invite a nick on a channel"
 msgstr "zaprasza użytkownika na kanał"
 
-msgid "<nick> <channel>"
-msgstr "<nick> <kanał>"
+#, fuzzy
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<nick> [<nick>...]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5492,8 +5538,11 @@ msgstr ""
 "oddzielona przecinkami lista opcji włączanych dla serwera, jeśli są dostępne "
 "(na przykład \"multi-prefix,extended-join\")"
 
-msgid "mechanism for SASL authentication"
-msgstr "mechanizm uwierzytelniania SASL"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 msgid "username for SASL authentication"
 msgstr "nazwa użytkownika dla uwierzytelniania SASL"
@@ -5681,9 +5730,12 @@ msgstr "teks wyświetlany przed nickiem w oknie rozmowy"
 msgid "text to display after nick in chat window"
 msgstr "teks wyświetlany za nickiem w oknie rozmowy"
 
+#, fuzzy
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "wymusza kolory dla nicków: hash połączony z nickiem w celu znalezienia "
 "koloru nie zostanie użyty dla tych nicków (format: \"nick1:kolor1;nick2:"
@@ -5897,13 +5949,14 @@ msgid "color for text in part/quit messages"
 msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC"
 
 #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string
+#, fuzzy
 msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -6232,6 +6285,11 @@ msgstr "%s%s: nie jesteś połączony z serwerem"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: to nie jest bufor kanału"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(nieznane)"
+
 msgid "offline"
 msgstr "offline"
 
@@ -6251,12 +6309,20 @@ msgstr "Lista powiadomień dla wszystkich serwerów"
 msgid "Notify list is empty on all servers"
 msgstr "Lista powiadomień jest pusta na wszystkich serwerach"
 
-#, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is connected"
 msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
 
-#, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is offline"
+msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%spowiadomienie: %s%s%s wyszedł %s%s"
 
 #, c-format
@@ -6764,6 +6830,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: za mało pamięci"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: przekroczono czas na \"%s\" z %s"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr "gnutls: połączono używając %d-bitowego klucza Diffie-Hellmana"
@@ -6939,8 +7009,8 @@ msgstr "log nie uruchomiony"
 msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => poziom %d"
 
-#, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+#, fuzzy, c-format
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr "===\t========== Koniec backloga (%d linii) =========="
 
 msgid "logger plugin configuration"
@@ -7024,6 +7094,14 @@ msgstr ""
 "maksymalna ilość linii wyświetlana z logu podczas tworzenia nowego bufora (0 "
 "= bez historii)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "kolor elementu nieobecności"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "kolor nicka w pasku danych wejściowych"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7982,6 +8060,11 @@ msgstr "wskaźnik skryptu (opcjonalne)"
 msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa skryptu (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s%s: nieprawidłowe argumenty dla funkcji \"%s\" (skrypt: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -8446,3 +8529,15 @@ msgstr "Typ"
 
 msgid "Constants"
 msgstr "Stałe"
+
+#~ msgid "string inserted after nick completion"
+#~ msgstr "ciąg wstawiany po dopełnionym nicku"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "wyświetl '+', jeśli przedrostek jest obcięty"
+
+#~ msgid "<nick> <channel>"
+#~ msgstr "<nick> <kanał>"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "mechanizm uwierzytelniania SASL"

po/pt_BR.po

@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Portuguese\n"
@@ -1282,7 +1282,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1445,6 +1446,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1528,6 +1531,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2590,7 +2594,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostra espaço se o modo do apelido não é (half)op/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "número máximo de linhas para serem coladas sem perguntar ao usuário (0 = "
 "desabilita essa característica)"
@@ -2622,8 +2639,9 @@ msgstr "tamanho máximo para o prefixo (0 = sem tamanho máximo)"
 msgid "min size for prefix"
 msgstr "tamanho mínimo para o prefixo"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostra '+' se o prefixo está truncado"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2639,13 +2657,20 @@ msgstr ""
 "tamanho máximo para o nome do buffer, quando muitos buffers estão mesclados "
 "com o mesmo número (0 = sem tamanho máximo)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "mostra '+' se o nome do buffer está truncado (quando muitos buffers estão "
 "mesclados com o mesmo número)"
 
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
+msgstr ""
+
 # Find a better translation to "string"
 #, fuzzy
 msgid "string displayed after prefix"
@@ -2926,10 +2951,13 @@ msgstr ""
 "adiciona espaço após a completação de apelido (quando o apelido não é a "
 "primeira palavra na linha de comando)"
 
-# Find a better translation to string
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "string inserida após a completação de apelido"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
+msgstr ""
+"adiciona espaço após a completação de apelido (quando o apelido não é a "
+"primeira palavra na linha de comando)"
 
 msgid "complete only with first nick found"
 msgstr "completa apenas com o primeiro apelido encontrado"
@@ -2987,6 +3015,13 @@ msgstr ""
 "número máximo de comandos para mostrar por padrão na listagem de histórico "
 "(0 = ilimitado)"
 
+# better not translate handshake
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "tempo de espera (em segundos) pelo handshake do gnutls"
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -3404,9 +3439,11 @@ msgstr ""
 msgid "Bar \"%s\" updated"
 msgstr "Barra \"%s\" atualizada"
 
-#, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "%sColar %d linhas ? [ctrl-Y] Sim [ctrl-N] Não"
+#, fuzzy, c-format
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "%sColar %d linhas ? [ctrl-Y] Sim [ctrl-N] Não"
+msgstr[1] "%sColar %d linhas ? [ctrl-Y] Sim [ctrl-N] Não"
 
 msgid "Text search"
 msgstr "Busca de texto"
@@ -3449,13 +3486,6 @@ msgstr[1] "normais"
 msgid "Debug disabled for cursor mode"
 msgstr "Depuração desabilitada para modo cursor"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Depuração habilitada para mouse (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Depuração desabilitada para mouse"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 "Erro: memória insuficiente para adicionar um buffer na lista de atividades"
@@ -3486,6 +3516,13 @@ msgstr "Executando comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Memória insuficiente para nova linha"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Depuração habilitada para mouse (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Depuração desabilitada para mouse"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: erro, referência circular ao chamar atalho \"%s\""
@@ -4299,13 +4336,14 @@ msgstr ""
 msgid "disconnect from one or all IRC servers"
 msgstr "desconectar de um ou todos os servidores IRC"
 
-msgid "[<server>|-all [<reason>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr ""
 
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 
 msgid "give channel half-operator status to nick(s)"
@@ -4346,8 +4384,9 @@ msgstr ""
 msgid "invite a nick on a channel"
 msgstr ""
 
-msgid "<nick> <channel>"
-msgstr ""
+#, fuzzy
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "<apelido> [<apelido>...]"
 
 msgid ""
 "   nick: nick to invite\n"
@@ -5081,8 +5120,11 @@ msgid ""
 "available (example: \"multi-prefix,extended-join\")"
 msgstr ""
 
-msgid "mechanism for SASL authentication"
-msgstr "mecanismo para autenticação SASL"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 msgid "username for SASL authentication"
 msgstr "nome de usuário para autenticação SASL"
@@ -5262,9 +5304,12 @@ msgstr "texto a ser exibido antes do apelido na janela de chat"
 msgid "text to display after nick in chat window"
 msgstr "texto a ser exibido depois do apelido na janela de chat"
 
+#, fuzzy
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 "forçar cor para alguns apelidos: hash computado com apelido para encontar "
 "cor não será utilizado para estes apelidos (formato: \"apelido1:cor1;"
@@ -5435,9 +5480,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -5752,6 +5797,11 @@ msgstr "%s%s: você não está conectado ao servidor"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: este buffer não é um canal!"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(desconhecido)"
+
 msgid "offline"
 msgstr ""
 
@@ -5771,12 +5821,20 @@ msgstr "Lista de notificação para todos os servidores:"
 msgid "Notify list is empty on all servers"
 msgstr "Lista de notificação está vazia em todos os servidores"
 
-#, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is connected"
 msgstr "%snotificação: %s%s%s entrou %s%s"
 
-#, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s is offline"
+msgstr "%snotificação: %s%s%s entrou %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%snotificação: %s%s%s entrou %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%snotificação: %s%s%s saiu %s%s"
 
 #, c-format
@@ -6279,6 +6337,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "%s%s: memória insuficiente"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s%s: tempo esgotado para \"%s\" com %s"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -6461,8 +6523,8 @@ msgstr "registro não iniciou"
 msgid "%s: \"%s\" => level %d"
 msgstr "%s: \"%s\" => nível %d"
 
-#, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+#, fuzzy, c-format
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr "===\t========== Fim do backlog (%d linhas) =========="
 
 msgid "logger plugin configuration"
@@ -6518,6 +6580,14 @@ msgstr ""
 "número máximo de linhas a exibir do arquivo de registro (backlog) quando um "
 "novo buffer for criado (0 = sem backlog)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "cor de texto para valores"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "cor para o apelido na barra de entrada"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7444,6 +7514,11 @@ msgstr ""
 "nome do script (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s%s: argumentos inválidos para a função \"%s\" (script: %s)"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -7918,3 +7993,14 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+# Find a better translation to string
+#, fuzzy
+#~ msgid "string inserted after nick completion"
+#~ msgstr "string inserida após a completação de apelido"
+
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostra '+' se o prefixo está truncado"
+
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "mecanismo para autenticação SASL"

po/ru.po

@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.7\n"
+"Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-26 08:00+0100\n"
-"PO-Revision-Date: 2012-02-26 08:04+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+0200\n"
+"PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Russian\n"
@@ -1170,7 +1170,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1279,6 +1280,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1308,6 +1311,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -2179,7 +2183,20 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "оставлять пробел, если ник не op/voice"
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 "максимальное количество строк, вставляемых без подтверждения (0 = отключить "
 "подтверждение)"
@@ -2215,7 +2232,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr "строка, вставляемая после автодополнения ника"
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -2229,8 +2247,14 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
+msgstr ""
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
 msgstr ""
 
 #, fuzzy
@@ -2527,7 +2551,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "string inserted after nick completion"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
 msgstr "строка, вставляемая после автодополнения ника"
 
 msgid "complete only with first nick found"
@@ -2581,6 +2607,12 @@ msgstr ""
 "максимальное количество отображаемых команд в листинге истории (0 = не "
 "ограничено)"
 
+#, fuzzy
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr "использовать SSL при связи с сервером"
+
 #, fuzzy
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
@@ -3008,8 +3040,11 @@ msgid "Bar \"%s\" updated"
 msgstr "Сокращение \"%s\" => \"%s\" создано\n"
 
 #, fuzzy, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr "  Вставить %d строк ? [ctrl-Y] Да  [ctrl-N] Нет"
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] "  Вставить %d строк ? [ctrl-Y] Да  [ctrl-N] Нет"
+msgstr[1] "  Вставить %d строк ? [ctrl-Y] Да  [ctrl-N] Нет"
+msgstr[2] "  Вставить %d строк ? [ctrl-Y] Да  [ctrl-N] Нет"
 
 #, fuzzy
 msgid "Text search"
@@ -3057,13 +3092,6 @@ msgstr[2] "обычные"
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 #, fuzzy
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "%s не могу добавить буфер в хотлист\n"
@@ -3095,6 +3123,13 @@ msgstr "Внутренние команды %s:\n"
 msgid "Not enough memory for new line"
 msgstr "Недостаточно памяти для новой строчки\n"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s рекурсия при вызове сокращения \"/%s\"\n"
@@ -3969,14 +4004,19 @@ msgid "disconnect from one or all IRC servers"
 msgstr "отключиться от сервера(-ов)"
 
 #, fuzzy
-msgid "[<server>|-all [<reason>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr "[[сервер] маска_сервера]"
 
+#, fuzzy
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
+"   -all: переподключиться ко всем серверам\n"
+" сервер: название сервера для переподключения-nojoin: не заходить на каналы "
+"(даже если автоматический заход включен для сервера)"
 
 #, fuzzy
 msgid "give channel half-operator status to nick(s)"
@@ -4018,8 +4058,8 @@ msgid "invite a nick on a channel"
 msgstr "пригласить ник на канал"
 
 #, fuzzy
-msgid "<nick> <channel>"
-msgstr "ник канал"
+msgid "<nick> [<nick>...] [<channel>]"
+msgstr "ник [ник ...]"
 
 #, fuzzy
 msgid ""
@@ -4946,9 +4986,11 @@ msgid ""
 "available (example: \"multi-prefix,extended-join\")"
 msgstr ""
 
-#, fuzzy
-msgid "mechanism for SASL authentication"
-msgstr "использовать SSL при связи с сервером"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
+msgstr ""
 
 #, fuzzy
 msgid "username for SASL authentication"
@@ -5127,7 +5169,9 @@ msgstr "текст, который отображать после ника в
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 
 msgid ""
@@ -5302,9 +5346,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -5641,6 +5685,11 @@ msgstr "%s вы не подключены к серверу\n"
 msgid "%s%s: this buffer is not a channel!"
 msgstr "Это окно не является каналом!\n"
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+#, fuzzy
+msgid "unknown"
+msgstr "(неизвестен)"
+
 msgid "offline"
 msgstr ""
 
@@ -5662,11 +5711,19 @@ msgid "Notify list is empty on all servers"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+msgid "%snotify: %s%s%s is connected"
 msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
 
 #, fuzzy, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
+
+#, fuzzy, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
 
 #, fuzzy, c-format
@@ -6164,6 +6221,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr "Недостаточно памяти для новой строчки\n"
 
+#, fuzzy, c-format
+msgid "%s%s: timeout"
+msgstr "%s нет аргумента для параметра \"%s\"\n"
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -6337,7 +6398,7 @@ msgid "%s: \"%s\" => level %d"
 msgstr "Сокращение \"%s\" удалено\n"
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr ""
 
 #, fuzzy
@@ -6391,6 +6452,14 @@ msgid ""
 "= no backlog)"
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "цвет отошедших ников"
+
+#, fuzzy
+msgid "color for line ending the backlog"
+msgstr "цвет ников"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7336,6 +7405,11 @@ msgstr ""
 msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr "%s некорректные аргументы команды \"%s\"\n"
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""
@@ -7815,3 +7889,11 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "<nick> <channel>"
+#~ msgstr "ник канал"
+
+#, fuzzy
+#~ msgid "mechanism for SASL authentication"
+#~ msgstr "использовать SSL при связи с сервером"

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: 2012-02-26 08:00+0100\n"
+"POT-Creation-Date: 2012-05-05 19:51+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"
@@ -1012,7 +1012,8 @@ msgid ""
 "Tags most commonly used:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx is nick in message),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
 "  irc_xxx (xxx is command name or number, see /server raw),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
@@ -1115,6 +1116,8 @@ msgid ""
 "  switch_active_buffer: switch to next merged buffer\n"
 "  switch_active_buffer_previous: switch to previous merged buffer\n"
 "  insert: insert text in command line\n"
+"  paste_start: start paste (bracketed paste mode)\n"
+"  paste_stop: stop paste (bracketed paste mode)\n"
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
@@ -1140,6 +1143,7 @@ msgid ""
 "context \"default\")\n"
 "   bindctxt: bind a command to a key or display command bound to key, for "
 "given context\n"
+"    command: command (many commands can be separated by semicolons)\n"
 "     unbind: remove a key binding (for context \"default\")\n"
 " unbindctxt: remove a key binding for given context\n"
 "      reset: reset a key to default binding (for context \"default\")\n"
@@ -1900,7 +1904,19 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr ""
 
 msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+"enable terminal \"bracketed paste mode\" (not supported in all terminals/"
+"multiplexers): in this mode, pasted text is bracketed with control sequences "
+"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
+"\", followed by the pasted text, followed by \"ESC[201~\")"
+msgstr ""
+
+msgid ""
+"force end of bracketed paste after this delay (in seconds) if the control "
+"sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
+msgstr ""
+
+msgid ""
+"max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
 
 msgid "prefix for error messages"
@@ -1927,7 +1943,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr ""
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -1941,8 +1958,14 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
+msgstr ""
+
+msgid ""
+"prefix displayed for a message with same nick as previous message: use a "
+"space \" \" to hide prefix, another string to display this string instead of "
+"prefix, or an empty string to disable feature (display prefix)"
 msgstr ""
 
 msgid "string displayed after prefix"
@@ -2183,7 +2206,9 @@ msgid ""
 "add space after nick completion (when nick is not first word on command line)"
 msgstr ""
 
-msgid "string inserted after nick completion"
+msgid ""
+"string inserted after nick completion (when nick is first word on command "
+"line)"
 msgstr ""
 
 msgid "complete only with first nick found"
@@ -2232,6 +2257,11 @@ msgid ""
 "unlimited)"
 msgstr ""
 
+msgid ""
+"timeout (in seconds) for connection to a remote host (made in a child "
+"process)"
+msgstr ""
+
 msgid ""
 "file containing the certificate authorities (\"%h\" will be replaced by "
 "WeeChat home, \"~/.weechat\" by default)"
@@ -2616,8 +2646,10 @@ msgid "Bar \"%s\" updated"
 msgstr ""
 
 #, c-format
-msgid "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
-msgstr ""
+msgid "%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No"
+msgid_plural "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No"
+msgstr[0] ""
+msgstr[1] ""
 
 msgid "Text search"
 msgstr ""
@@ -2660,13 +2692,6 @@ msgstr[1] ""
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 
@@ -2696,6 +2721,13 @@ msgstr ""
 msgid "Not enough memory for new line"
 msgstr ""
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr ""
@@ -3492,13 +3524,14 @@ msgstr ""
 msgid "disconnect from one or all IRC servers"
 msgstr ""
 
-msgid "[<server>|-all [<reason>]]"
+msgid "[<server>|-all|-pending [<reason>]]"
 msgstr ""
 
 msgid ""
-"server: server name to disconnect\n"
-"  -all: disconnect from all servers\n"
-"reason: reason for quit"
+"  server: server name to disconnect\n"
+"    -all: disconnect from all servers\n"
+"-pending: cancel auto-reconnection on servers currently reconnecting\n"
+"  reason: reason for quit"
 msgstr ""
 
 msgid "give channel half-operator status to nick(s)"
@@ -3539,7 +3572,7 @@ msgstr ""
 msgid "invite a nick on a channel"
 msgstr ""
 
-msgid "<nick> <channel>"
+msgid "<nick> [<nick>...] [<channel>]"
 msgstr ""
 
 msgid ""
@@ -4249,7 +4282,10 @@ msgid ""
 "available (example: \"multi-prefix,extended-join\")"
 msgstr ""
 
-msgid "mechanism for SASL authentication"
+msgid ""
+"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
+"blowfish\" for crypted password, \"external\" for authentication using "
+"client side SSL cert"
 msgstr ""
 
 msgid "username for SASL authentication"
@@ -4398,7 +4434,9 @@ msgstr ""
 
 msgid ""
 "force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")"
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); "
+"lookup for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
 msgstr ""
 
 msgid ""
@@ -4562,9 +4600,9 @@ msgid ""
 "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as "
 "integers between -1 (not specified) and 15, values are WeeChat color names "
 "or numbers (format is: \"1,-1:color1;2,7:color2\"), example: \"1,-1:"
-"darkgray;1,2:white,blue\" to remap black on any bg to \"darkgray\" and black "
-"on blue to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:"
-"black, 2:blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
+"darkgray;1,2:white,blue\" to remap black to \"darkgray\" and black on blue "
+"to \"white,blue\"; default WeeChat colors for IRC codes: 0:white, 1:black, 2:"
+"blue, 3:green, 4:lightred, 5:red, 6:magenta, 7:brown, 8:yellow, 9: "
 "lightgreen, 10:cyan, 11:lightcyan, 12:lightblue, 13:lightmagenta, 14:gray, "
 "15:white"
 msgstr ""
@@ -4854,6 +4892,10 @@ msgstr ""
 msgid "%s%s: this buffer is not a channel!"
 msgstr ""
 
+#. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending)
+msgid "unknown"
+msgstr ""
+
 msgid "offline"
 msgstr ""
 
@@ -4874,11 +4916,19 @@ msgid "Notify list is empty on all servers"
 msgstr ""
 
 #, c-format
-msgid "%snotify: %s%s%s has joined %s%s"
+msgid "%snotify: %s%s%s is connected"
 msgstr ""
 
 #, c-format
-msgid "%snotify: %s%s%s has quit %s%s"
+msgid "%snotify: %s%s%s is offline"
+msgstr ""
+
+#, c-format
+msgid "%snotify: %s%s%s has joined"
+msgstr ""
+
+#, c-format
+msgid "%snotify: %s%s%s has quit"
 msgstr ""
 
 #, c-format
@@ -5359,6 +5409,10 @@ msgstr ""
 msgid "%s%s: not enough memory"
 msgstr ""
 
+#, c-format
+msgid "%s%s: timeout"
+msgstr ""
+
 #, c-format
 msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
 msgstr ""
@@ -5527,7 +5581,7 @@ msgid "%s: \"%s\" => level %d"
 msgstr ""
 
 #, c-format
-msgid "===\t========== End of backlog (%d lines) =========="
+msgid "%s===\t%s========== End of backlog (%d lines) =========="
 msgstr ""
 
 msgid "logger plugin configuration"
@@ -5579,6 +5633,12 @@ msgid ""
 "= no backlog)"
 msgstr ""
 
+msgid "color for backlog lines"
+msgstr ""
+
+msgid "color for line ending the backlog"
+msgstr ""
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -6427,6 +6487,11 @@ msgstr ""
 msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
+msgstr ""
+
 #, c-format
 msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
 msgstr ""

src/core/wee-command.c

@@ -2393,6 +2393,14 @@ COMMAND_CALLBACK(input)
             gui_input_undo (buffer);
         else if (string_strcasecmp (argv[1], "redo") == 0)
             gui_input_redo (buffer);
+        else if (string_strcasecmp (argv[1], "paste_start") == 0)
+        {
+            /* do nothing here */
+        }
+        else if (string_strcasecmp (argv[1], "paste_stop") == 0)
+        {
+            /* do nothing here */
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -5651,7 +5659,8 @@ command_init ()
                      "  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
                      "  notify_none, notify_message, notify_private, "
                      "notify_highlight,\n"
-                     "  nick_xxx (xxx is nick in message),\n"
+                     "  nick_xxx (xxx is nick in message), "
+                     "prefix_nick_ccc (ccc is color of nick),\n"
                      "  irc_xxx (xxx is command name or number, see /server raw),\n"
                      "  irc_numeric, irc_error, irc_action, irc_ctcp, "
                      "irc_ctcp_reply, irc_smart_filter, away_info.\n"
@@ -5762,7 +5771,9 @@ command_init ()
                      "  switch_active_buffer: switch to next merged buffer\n"
                      "  switch_active_buffer_previous: switch to previous "
                      "merged buffer\n"
-                     "  insert: insert text in command line\n\n"
+                     "  insert: insert text in command line\n"
+                     "  paste_start: start paste (bracketed paste mode)\n"
+                     "  paste_stop: stop paste (bracketed paste mode)\n\n"
                      "This command is used by key bindings or plugins."),
                   "return|complete_next|complete_previous|search_text|"
                   "search_switch_case|search_previous|search_next|search_stop|"
@@ -5778,7 +5789,7 @@ command_init ()
                   "jump_next_visited_buffer|hotlist_clear|grab_key|"
                   "grab_key_command|grab_mouse|grab_mouse_area|set_unread|"
                   "set_unread_current_buffer|switch_active_buffer|"
-                  "switch_active_buffer_previous|insert",
+                  "switch_active_buffer_previous|insert|paste_start|paste_stop",
                   &command_input, NULL);
     hook_command (NULL, "key",
                   N_("bind/unbind keys"),
@@ -5802,6 +5813,8 @@ command_init ()
                      "bound to key (for context \"default\")\n"
                      "   bindctxt: bind a command to a key or display command "
                      "bound to key, for given context\n"
+                     "    command: command (many commands can be separated by "
+                     "semicolons)\n"
                      "     unbind: remove a key binding (for context "
                      "\"default\")\n"
                      " unbindctxt: remove a key binding for given context\n"

src/core/wee-config-file.c

@@ -26,6 +26,7 @@
 #include "config.h"
 #endif
 
+#include <limits.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
@@ -1911,7 +1912,7 @@ config_file_write_internal (struct t_config_file *config_file,
                             int default_options)
 {
     int filename_length, rc;
-    char *filename, *filename2;
+    char *filename, *filename2, resolved_path[PATH_MAX];
     struct t_config_section *ptr_section;
     struct t_config_option *ptr_option;
 
@@ -1939,6 +1940,21 @@ config_file_write_internal (struct t_config_file *config_file,
     }
     snprintf (filename2, filename_length + 32, "%s.weechattmp", filename);
 
+    /* if filename is a symbolic link, use target as filename */
+    if (realpath (filename, resolved_path))
+    {
+        if (strcmp (filename, resolved_path) != 0)
+        {
+            free (filename);
+            filename = strdup (resolved_path);
+            if (!filename)
+            {
+                free (filename2);
+                return WEECHAT_CONFIG_WRITE_MEMORY_ERROR;
+            }
+        }
+    }
+
     log_printf (_("Writing configuration file %s %s"),
                 config_file->filename,
                 (default_options) ? _("(default options)") : "");
@@ -2006,9 +2022,6 @@ config_file_write_internal (struct t_config_file *config_file,
     /* update file mode */
     chmod (filename2, 0600);
 
-    /* remove target file */
-    unlink (filename);
-
     /* rename temp file to target file */
     rc = rename (filename2, filename);
 
@@ -2068,7 +2081,7 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
     char *filename;
     struct t_config_section *ptr_section;
     struct t_config_option *ptr_option;
-    char line[1024], *ptr_line, *ptr_line2, *pos, *pos2;
+    char line[16384], *ptr_line, *ptr_line2, *pos, *pos2;
 
     if (!config_file)
         return WEECHAT_CONFIG_READ_FILE_NOT_FOUND;

src/core/wee-config.c

@@ -42,6 +42,7 @@
 #include "wee-hook.h"
 #include "wee-log.h"
 #include "wee-network.h"
+#include "wee-utf8.h"
 #include "wee-util.h"
 #include "wee-list.h"
 #include "wee-proxy.h"
@@ -125,6 +126,8 @@ struct t_config_option *config_look_mouse;
 struct t_config_option *config_look_mouse_timer_delay;
 struct t_config_option *config_look_nickmode;
 struct t_config_option *config_look_nickmode_empty;
+struct t_config_option *config_look_paste_bracketed;
+struct t_config_option *config_look_paste_bracketed_timer_delay;
 struct t_config_option *config_look_paste_max_lines;
 struct t_config_option *config_look_prefix[GUI_CHAT_NUM_PREFIXES];
 struct t_config_option *config_look_prefix_align;
@@ -134,6 +137,7 @@ struct t_config_option *config_look_prefix_align_more;
 struct t_config_option *config_look_prefix_buffer_align;
 struct t_config_option *config_look_prefix_buffer_align_max;
 struct t_config_option *config_look_prefix_buffer_align_more;
+struct t_config_option *config_look_prefix_same_nick;
 struct t_config_option *config_look_prefix_suffix;
 struct t_config_option *config_look_read_marker;
 struct t_config_option *config_look_read_marker_always_show;
@@ -225,6 +229,7 @@ struct t_config_option *config_history_display_default;
 
 /* config, network section */
 
+struct t_config_option *config_network_connection_timeout;
 struct t_config_option *config_network_gnutls_ca_file;
 struct t_config_option *config_network_gnutls_handshake_timeout;
 
@@ -238,6 +243,7 @@ struct t_config_option *config_plugin_save_config_on_unload;
 
 /* other */
 
+int config_length_prefix_same_nick = 0;
 struct t_hook *config_day_change_timer = NULL;
 int config_day_change_old_day = -1;
 regex_t *config_highlight_regex = NULL;
@@ -258,7 +264,7 @@ config_change_save_config_on_exit (void *data, struct t_config_option *option)
     (void) data;
     (void) option;
 
-    if (gui_ok && !CONFIG_BOOLEAN(config_look_save_config_on_exit))
+    if (gui_init_ok && !CONFIG_BOOLEAN(config_look_save_config_on_exit))
     {
         gui_chat_printf (NULL,
                          _("Warning: you should now issue /save to write "
@@ -307,7 +313,7 @@ config_change_buffer_content (void *data, struct t_config_option *option)
     (void) data;
     (void) option;
 
-    if (gui_ok)
+    if (gui_init_ok)
         gui_current_window->refresh_needed = 1;
 }
 
@@ -322,7 +328,7 @@ config_change_mouse (void *data, struct t_config_option *option)
     (void) data;
     (void) option;
 
-    if (gui_ok)
+    if (gui_init_ok)
     {
         if (CONFIG_BOOLEAN(config_look_mouse))
             gui_mouse_enable ();
@@ -358,10 +364,48 @@ config_change_buffer_time_format (void *data, struct t_config_option *option)
 
     gui_chat_time_length = gui_chat_get_time_length ();
     gui_chat_change_time_format ();
-    if (gui_ok)
+    if (gui_init_ok)
         gui_window_ask_refresh (1);
 }
 
+/*
+ * config_compute_prefix_max_length_all_buffers: compute the "prefix_max_length"
+ *                                               on all buffers
+ */
+
+void
+config_compute_prefix_max_length_all_buffers ()
+{
+    struct t_gui_buffer *ptr_buffer;
+
+    for (ptr_buffer = gui_buffers; ptr_buffer;
+         ptr_buffer = ptr_buffer->next_buffer)
+    {
+        if (ptr_buffer->own_lines)
+            gui_line_compute_prefix_max_length (ptr_buffer->own_lines);
+        if (ptr_buffer->mixed_lines)
+            gui_line_compute_prefix_max_length (ptr_buffer->mixed_lines);
+    }
+}
+
+/*
+ * config_change_prefix_same_nick: called when "prefix for same nick" changes
+ */
+
+void
+config_change_prefix_same_nick (void *data, struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    config_length_prefix_same_nick =
+        gui_chat_strlen_screen (CONFIG_STRING(config_look_prefix_same_nick));
+
+    config_compute_prefix_max_length_all_buffers ();
+    gui_window_ask_refresh (1);
+}
+
 /*
  * config_change_eat_newline_glitch: called when eat_newline_glitch changes
  */
@@ -373,7 +417,7 @@ config_change_eat_newline_glitch (void *data, struct t_config_option *option)
     (void) data;
     (void) option;
 
-    if (gui_ok)
+    if (gui_init_ok)
     {
         if (CONFIG_BOOLEAN(config_look_eat_newline_glitch))
         {
@@ -463,6 +507,21 @@ config_change_hotlist (void *data, struct t_config_option *option)
     gui_hotlist_resort ();
 }
 
+/*
+ * config_change_paste_bracketed: called when bracketed paste mode is changed
+ */
+
+void
+config_change_paste_bracketed (void *data, struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    if (gui_init_ok)
+        gui_window_set_bracketed_paste_mode (CONFIG_BOOLEAN(config_look_paste_bracketed));
+}
+
 /*
  * config_change_read_marker: called when read marker is changed
  */
@@ -498,23 +557,47 @@ config_change_prefix (void *data, struct t_config_option *option)
 void
 config_change_prefix_align_min (void *data, struct t_config_option *option)
 {
-    struct t_gui_buffer *ptr_buffer;
-
     /* make C compiler happy */
     (void) data;
     (void) option;
 
-    for (ptr_buffer = gui_buffers; ptr_buffer;
-         ptr_buffer = ptr_buffer->next_buffer)
-    {
-        if (ptr_buffer->own_lines)
-            gui_line_compute_prefix_max_length (ptr_buffer->own_lines);
-        if (ptr_buffer->mixed_lines)
-            gui_line_compute_prefix_max_length (ptr_buffer->mixed_lines);
-    }
+    config_compute_prefix_max_length_all_buffers ();
     gui_window_ask_refresh (1);
 }
 
+/*
+ * config_check_prefix_align_more: check string "prefix align more" (must be
+ *                                 max one char wide on screen)
+ */
+
+int
+config_check_prefix_align_more (void *data, struct t_config_option *option,
+                                const char *value)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    return (utf8_strlen_screen (value) == 1) ? 1 : 0;
+}
+
+/*
+ * config_check_prefix_buffer_align_more: check string "prefix buffer align more"
+ *                                        (must be max one char wide on screen)
+ */
+
+int
+config_check_prefix_buffer_align_more (void *data,
+                                       struct t_config_option *option,
+                                       const char *value)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    return (utf8_strlen_screen (value) == 1) ? 1 : 0;
+}
+
 /*
  * config_change_color: called when a color is changed by /set command
  */
@@ -526,7 +609,7 @@ config_change_color (void *data, struct t_config_option *option)
     (void) data;
     (void) option;
 
-    if (gui_ok)
+    if (gui_init_ok)
     {
         gui_color_init_weechat ();
         gui_window_ask_refresh (1);
@@ -1956,12 +2039,28 @@ config_weechat_init_options ()
         "nickmode_empty", "boolean",
         N_("display space if nick mode is not (half)op/voice"),
         NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+    config_look_paste_bracketed = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "paste_bracketed", "boolean",
+        N_("enable terminal \"bracketed paste mode\" (not supported in all "
+           "terminals/multiplexers): in this mode, pasted text is bracketed "
+           "with control sequences so that WeeChat can differentiate pasted "
+           "text from typed-in text (\"ESC[200~\", followed by the pasted text, "
+           "followed by \"ESC[201~\")"),
+        NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_paste_bracketed, NULL, NULL, NULL);
+    config_look_paste_bracketed_timer_delay = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "paste_bracketed_timer_delay", "integer",
+        N_("force end of bracketed paste after this delay (in seconds) if the "
+           "control sequence for end of bracketed paste (\"ESC[201~\") was not "
+           "received in time"),
+        NULL, 1, 60, "10", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_paste_max_lines = config_file_new_option (
         weechat_config_file, ptr_section,
         "paste_max_lines", "integer",
         N_("max number of lines for paste without asking user "
-           "(0 = disable this feature)"),
-        NULL, 0, INT_MAX, "3", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+           "(-1 = disable this feature)"),
+        NULL, -1, INT_MAX, "1", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_prefix[GUI_CHAT_PREFIX_ERROR] = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_error", "string",
@@ -2004,9 +2103,11 @@ config_weechat_init_options ()
         NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_prefix_align_min, NULL, NULL, NULL);
     config_look_prefix_align_more = config_file_new_option (
         weechat_config_file, ptr_section,
-        "prefix_align_more", "boolean",
-        N_("display '+' if prefix is truncated"),
-        NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+        "prefix_align_more", "string",
+        N_("char to display if prefix is truncated (must be exactly one char "
+           "on screen)"),
+        NULL, 0, 0, "+", NULL, 0,
+        &config_check_prefix_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_prefix_buffer_align = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_buffer_align", "integer",
@@ -2021,10 +2122,19 @@ config_weechat_init_options ()
         NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_prefix_buffer_align_more = config_file_new_option (
         weechat_config_file, ptr_section,
-        "prefix_buffer_align_more", "boolean",
-        N_("display '+' if buffer name is truncated (when many buffers are "
-           "merged with same number)"),
-        NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+        "prefix_buffer_align_more", "string",
+        N_("char to display if buffer name is truncated (when many buffers are "
+           "merged with same number) (must be exactly one char on screen)"),
+        NULL, 0, 0, "+", NULL, 0,
+        &config_check_prefix_buffer_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
+    config_look_prefix_same_nick = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "prefix_same_nick", "string",
+        N_("prefix displayed for a message with same nick as previous "
+           "message: use a space \" \" to hide prefix, another string to "
+           "display this string instead of prefix, or an empty string to "
+           "disable feature (display prefix)"),
+        NULL, 0, 0, "", NULL, 0, NULL, NULL, &config_change_prefix_same_nick, NULL, NULL, NULL);
     config_look_prefix_suffix = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_suffix", "string",
@@ -2504,7 +2614,8 @@ config_weechat_init_options ()
     config_completion_nick_completer = config_file_new_option (
         weechat_config_file, ptr_section,
         "nick_completer", "string",
-        N_("string inserted after nick completion"),
+        N_("string inserted after nick completion (when nick is first word on "
+           "command line)"),
         NULL, 0, 0, ":", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_completion_nick_first_only = config_file_new_option (
         weechat_config_file, ptr_section,
@@ -2612,6 +2723,12 @@ config_weechat_init_options ()
         return 0;
     }
 
+    config_network_connection_timeout = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "connection_timeout", "integer",
+        N_("timeout (in seconds) for connection to a remote host (made in a "
+           "child process)"),
+        NULL, 1, INT_MAX, "60", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_network_gnutls_ca_file = config_file_new_option (
         weechat_config_file, ptr_section,
         "gnutls_ca_file", "string",

src/core/wee-config.h

@@ -149,6 +149,8 @@ extern struct t_config_option *config_look_mouse;
 extern struct t_config_option *config_look_mouse_timer_delay;
 extern struct t_config_option *config_look_nickmode;
 extern struct t_config_option *config_look_nickmode_empty;
+extern struct t_config_option *config_look_paste_bracketed;
+extern struct t_config_option *config_look_paste_bracketed_timer_delay;
 extern struct t_config_option *config_look_paste_max_lines;
 extern struct t_config_option *config_look_prefix[];
 extern struct t_config_option *config_look_prefix_align;
@@ -158,6 +160,7 @@ extern struct t_config_option *config_look_prefix_align_more;
 extern struct t_config_option *config_look_prefix_buffer_align;
 extern struct t_config_option *config_look_prefix_buffer_align_max;
 extern struct t_config_option *config_look_prefix_buffer_align_more;
+extern struct t_config_option *config_look_prefix_same_nick;
 extern struct t_config_option *config_look_prefix_suffix;
 extern struct t_config_option *config_look_read_marker;
 extern struct t_config_option *config_look_read_marker_always_show;
@@ -241,6 +244,7 @@ extern struct t_config_option *config_history_max_commands;
 extern struct t_config_option *config_history_max_visited_buffers;
 extern struct t_config_option *config_history_display_default;
 
+extern struct t_config_option *config_network_connection_timeout;
 extern struct t_config_option *config_network_gnutls_ca_file;
 extern struct t_config_option *config_network_gnutls_handshake_timeout;
 
@@ -250,6 +254,7 @@ extern struct t_config_option *config_plugin_extension;
 extern struct t_config_option *config_plugin_path;
 extern struct t_config_option *config_plugin_save_config_on_unload;
 
+extern int config_length_prefix_same_nick;
 extern regex_t *config_highlight_regex;
 extern char **config_highlight_tags;
 extern int config_num_highlight_tags;

src/core/wee-hook.c

@@ -1763,6 +1763,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
     new_hook_connect->child_read = -1;
     new_hook_connect->child_write = -1;
     new_hook_connect->child_pid = 0;
+    new_hook_connect->hook_child_timer = NULL;
     new_hook_connect->hook_fd = NULL;
     new_hook_connect->handshake_hook_fd = NULL;
     new_hook_connect->handshake_hook_timer = NULL;
@@ -3128,6 +3129,8 @@ unhook (struct t_hook *hook)
 #endif
                 if (HOOK_CONNECT(hook, local_hostname))
                     free (HOOK_CONNECT(hook, local_hostname));
+                if (HOOK_CONNECT(hook, hook_child_timer))
+                    unhook (HOOK_CONNECT(hook, hook_child_timer));
                 if (HOOK_CONNECT(hook, hook_fd))
                     unhook (HOOK_CONNECT(hook, hook_fd));
                 if (HOOK_CONNECT(hook, handshake_hook_fd))
@@ -3471,6 +3474,8 @@ hook_add_to_infolist_type (struct t_infolist *infolist, int type,
                         return 0;
                     if (!infolist_new_var_integer (ptr_item, "child_pid", HOOK_CONNECT(ptr_hook, child_pid)))
                         return 0;
+                    if (!infolist_new_var_pointer (ptr_item, "hook_child_timer", HOOK_CONNECT(ptr_hook, hook_child_timer)))
+                        return 0;
                     if (!infolist_new_var_pointer (ptr_item, "hook_fd", HOOK_CONNECT(ptr_hook, hook_fd)))
                         return 0;
                     if (!infolist_new_var_pointer (ptr_item, "handshake_hook_fd", HOOK_CONNECT(ptr_hook, handshake_hook_fd)))
@@ -3870,6 +3875,7 @@ hook_print_log ()
                         log_printf ("    child_read. . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_read));
                         log_printf ("    child_write . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_write));
                         log_printf ("    child_pid . . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_pid));
+                        log_printf ("    hook_child_timer. . . : 0x%lx", HOOK_CONNECT(ptr_hook, hook_child_timer));
                         log_printf ("    hook_fd . . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, hook_fd));
                         log_printf ("    handshake_hook_fd . . : 0x%lx", HOOK_CONNECT(ptr_hook, handshake_hook_fd));
                         log_printf ("    handshake_hook_timer. : 0x%lx", HOOK_CONNECT(ptr_hook, handshake_hook_timer));

src/core/wee-hook.h

@@ -243,6 +243,7 @@ struct t_hook_connect
     int child_read;                    /* to read data in pipe from child   */
     int child_write;                   /* to write data in pipe for child   */
     pid_t child_pid;                   /* pid of child process (connecting) */
+    struct t_hook *hook_child_timer;   /* timer for child process timeout   */
     struct t_hook *hook_fd;            /* pointer to fd hook                */
     struct t_hook *handshake_hook_fd;  /* fd hook for handshake             */
     struct t_hook *handshake_hook_timer; /* timer for handshake timeout     */

src/core/wee-list.c

@@ -209,7 +209,7 @@ weelist_search_pos (struct t_weelist *weelist, const char *data)
 }
 
 /*
- * weelist_casesearch: search data in a list (case unsensitive)
+ * weelist_casesearch: search data in a list (case insensitive)
  */
 
 struct t_weelist_item *
@@ -231,7 +231,7 @@ weelist_casesearch (struct t_weelist *weelist, const char *data)
 }
 
 /*
- * weelist_casesearch_pos: search data in a list (case unsensitive), return
+ * weelist_casesearch_pos: search data in a list (case insensitive), return
  *                         position of item found, -1 if not found
  */
 

src/core/wee-network.c

@@ -766,6 +766,31 @@ network_connect_child (struct t_hook *hook_connect)
         freeaddrinfo (res_local);
 }
 
+/*
+ * network_connect_child_timer_cb: timer for timeout of child process
+ */
+
+int
+network_connect_child_timer_cb (void *arg_hook_connect, int remaining_calls)
+{
+    struct t_hook *hook_connect;
+
+    /* make C compiler happy */
+    (void) remaining_calls;
+
+    hook_connect = (struct t_hook *)arg_hook_connect;
+
+    HOOK_CONNECT(hook_connect, hook_child_timer) = NULL;
+
+    (void) (HOOK_CONNECT(hook_connect, callback))
+        (hook_connect->callback_data,
+         WEECHAT_HOOK_CONNECT_TIMEOUT,
+         0, NULL, NULL);
+    unhook (hook_connect);
+
+    return WEECHAT_RC_OK;
+}
+
 /*
  * network_connect_gnutls_handshake_fd_cb: callback for gnutls handshake
  *                                         (used to not block WeeChat if
@@ -1098,6 +1123,11 @@ network_connect_with_fork (struct t_hook *hook_connect)
     HOOK_CONNECT(hook_connect, child_pid) = pid;
     close (HOOK_CONNECT(hook_connect, child_write));
     HOOK_CONNECT(hook_connect, child_write) = -1;
+    HOOK_CONNECT(hook_connect, hook_child_timer) = hook_timer (hook_connect->plugin,
+                                                               CONFIG_INTEGER(config_network_connection_timeout) * 1000,
+                                                               0, 1,
+                                                               &network_connect_child_timer_cb,
+                                                               hook_connect);
     HOOK_CONNECT(hook_connect, hook_fd) = hook_fd (hook_connect->plugin,
                                                    HOOK_CONNECT(hook_connect, child_read),
                                                    1, 0, 0,

src/core/wee-utf8.c

@@ -390,27 +390,39 @@ int
 utf8_strlen_screen (const char *string)
 {
     int length, num_char;
-    wchar_t *wstring;
+    wchar_t *alloc_wstring, *ptr_wstring, wstring[4+2];
 
-    if (!string)
+    if (!string || !string[0])
         return 0;
 
     if (!local_utf8)
         return utf8_strlen (string);
 
-    num_char = mbstowcs (NULL, string, 0) + 1;
-    wstring = malloc ((num_char + 1) * sizeof (wstring[0]));
-    if (!wstring)
-        return utf8_strlen (string);
+    alloc_wstring = NULL;
 
-    if (mbstowcs (wstring, string, num_char) == (size_t)(-1))
+    if (!string[1] || !string[2] || !string[3] || !string[4])
     {
-        free (wstring);
-        return utf8_strlen (string);
+        /* optimization for max 4 chars: no malloc */
+        num_char = 4 + 1;
+        ptr_wstring = wstring;
+    }
+    else
+    {
+        num_char = mbstowcs (NULL, string, 0) + 1;
+        alloc_wstring = malloc ((num_char + 1) * sizeof (alloc_wstring[0]));
+        if (!alloc_wstring)
+            return utf8_strlen (string);
+        ptr_wstring = alloc_wstring;
     }
 
-    length = wcswidth (wstring, num_char);
-    free (wstring);
+    if (mbstowcs (ptr_wstring, string, num_char) != (size_t)(-1))
+        length = wcswidth (ptr_wstring, num_char);
+    else
+        length = utf8_strlen (string);
+
+    if (alloc_wstring)
+        free (alloc_wstring);
+
     return length;
 }
 

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

@@ -104,41 +104,40 @@ gui_bar_window_create_win (struct t_gui_bar_window *bar_window)
         GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator = NULL;
     }
 
-    GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar = newwin (bar_window->height,
-                                                          bar_window->width,
-                                                          bar_window->y,
-                                                          bar_window->x);
-
-    if (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_SEPARATOR]))
+    if ((bar_window->x >= 0) && (bar_window->y >= 0))
     {
-        switch (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_POSITION]))
+        GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar = newwin (bar_window->height,
+                                                              bar_window->width,
+                                                              bar_window->y,
+                                                              bar_window->x);
+
+        if (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_SEPARATOR]))
         {
-            case GUI_BAR_POSITION_BOTTOM:
-                GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator = newwin (1,
-                                                                            bar_window->width,
-                                                                            bar_window->y - 1,
-                                                                            bar_window->x);
-                break;
-            case GUI_BAR_POSITION_TOP:
-                GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator = newwin (1,
-                                                                            bar_window->width,
-                                                                            bar_window->y + bar_window->height,
-                                                                            bar_window->x);
-                break;
-            case GUI_BAR_POSITION_LEFT:
-                GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator = newwin (bar_window->height,
-                                                                            1,
-                                                                            bar_window->y,
-                                                                            bar_window->x + bar_window->width);
-                break;
-            case GUI_BAR_POSITION_RIGHT:
-                GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator = newwin (bar_window->height,
-                                                                            1,
-                                                                            bar_window->y,
-                                                                            bar_window->x - 1);
-                break;
-            case GUI_BAR_NUM_POSITIONS:
-                break;
+            switch (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_POSITION]))
+            {
+                case GUI_BAR_POSITION_BOTTOM:
+                    GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator =
+                        newwin (1, bar_window->width,
+                                bar_window->y - 1, bar_window->x);
+                    break;
+                case GUI_BAR_POSITION_TOP:
+                    GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator =
+                        newwin (1, bar_window->width,
+                                bar_window->y + bar_window->height, bar_window->x);
+                    break;
+                case GUI_BAR_POSITION_LEFT:
+                    GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator =
+                        newwin (bar_window->height, 1,
+                                bar_window->y, bar_window->x + bar_window->width);
+                    break;
+                case GUI_BAR_POSITION_RIGHT:
+                    GUI_BAR_WINDOW_OBJECTS(bar_window)->win_separator =
+                        newwin (bar_window->height, 1,
+                                bar_window->y, bar_window->x - 1);
+                    break;
+                case GUI_BAR_NUM_POSITIONS:
+                    break;
+            }
         }
     }
 }
@@ -403,6 +402,9 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
     if (!gui_init_ok)
         return;
 
+    if ((bar_window->x < 0) || (bar_window->y < 0))
+        return;
+
     if (!str_start_input[0])
     {
         snprintf (str_start_input, sizeof (str_start_input), "%c%c%c",

src/gui/curses/gui-curses-chat.c

@@ -395,9 +395,10 @@ gui_chat_display_word_raw (struct t_gui_window *window, struct t_gui_line *line,
 
 /*
  * gui_chat_display_word: display a word on chat buffer
+ *                        return number of chars displayed on screen
  */
 
-void
+int
 gui_chat_display_word (struct t_gui_window *window,
                        struct t_gui_line *line,
                        const char *word, const char *word_end,
@@ -406,23 +407,25 @@ gui_chat_display_word (struct t_gui_window *window,
                        int apply_style_inactive)
 {
     char *data, *ptr_data, *end_line, saved_char, str_space[] = " ";
-    int pos_saved_char, chars_to_display, num_displayed;
+    int chars_displayed, pos_saved_char, chars_to_display, num_displayed;
     int length_align;
     attr_t attrs;
     attr_t *ptr_attrs;
     short pair;
     short *ptr_pair;
 
+    chars_displayed = 0;
+
     if (!word ||
         ((!simulate) && (window->win_chat_cursor_y >= window->win_chat_height)))
-        return;
+        return chars_displayed;
 
     if (!simulate && (window->win_chat_cursor_y < window->coords_size))
         window->coords[window->win_chat_cursor_y].line = line;
 
     data = strdup (word);
     if (!data)
-        return;
+        return chars_displayed;
 
     end_line = data + strlen (data);
 
@@ -463,15 +466,18 @@ gui_chat_display_word (struct t_gui_window *window,
                     gui_window_save_style ();
                     gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
                                                   GUI_COLOR_CHAT_PREFIX_SUFFIX);
-                    gui_chat_display_word_raw (window, line,
-                                               CONFIG_STRING(config_look_prefix_suffix),
-                                               0, 1, apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  CONFIG_STRING(config_look_prefix_suffix),
+                                                                  0, 1,
+                                                                  apply_style_inactive);
                 }
                 window->win_chat_cursor_x += gui_chat_strlen_screen (CONFIG_STRING(config_look_prefix_suffix));
                 if (!simulate)
                 {
-                    gui_chat_display_word_raw (window, line, str_space, 0, 1,
-                                               apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  str_space,
+                                                                  0, 1,
+                                                                  apply_style_inactive);
                 }
                 window->win_chat_cursor_x += gui_chat_strlen_screen (str_space);
                 if (!simulate)
@@ -497,13 +503,17 @@ gui_chat_display_word (struct t_gui_window *window,
                 ptr_data[pos_saved_char] = '\0';
                 if ((count == 0) || (*lines_displayed >= num_lines - count))
                 {
-                    gui_chat_display_word_raw (window, line, ptr_data, 0, 1,
-                                               apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  ptr_data,
+                                                                  0, 1,
+                                                                  apply_style_inactive);
                 }
                 else
                 {
-                    gui_chat_display_word_raw (window, line, ptr_data, 0, 0,
-                                               apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  ptr_data,
+                                                                  0, 0,
+                                                                  apply_style_inactive);
                 }
                 ptr_data[pos_saved_char] = saved_char;
             }
@@ -516,13 +526,17 @@ gui_chat_display_word (struct t_gui_window *window,
             {
                 if ((count == 0) || (*lines_displayed >= num_lines - count))
                 {
-                    gui_chat_display_word_raw (window, line, ptr_data, 0, 1,
-                                               apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  ptr_data,
+                                                                  0, 1,
+                                                                  apply_style_inactive);
                 }
                 else
                 {
-                    gui_chat_display_word_raw (window, line, ptr_data, 0, 0,
-                                               apply_style_inactive);
+                    chars_displayed += gui_chat_display_word_raw (window, line,
+                                                                  ptr_data,
+                                                                  0, 0,
+                                                                  apply_style_inactive);
                 }
             }
             ptr_data += strlen (ptr_data);
@@ -544,6 +558,8 @@ gui_chat_display_word (struct t_gui_window *window,
     }
 
     free (data);
+
+    return chars_displayed;
 }
 
 /*
@@ -558,10 +574,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                  int *lines_displayed,
                                  int simulate)
 {
-    char str_space[] = " ", str_plus[] = "+";
-    char *prefix_no_color, *prefix_highlighted;
-    const char *short_name;
-    int i, length, length_allowed, num_spaces;
+    char str_space[] = " ";
+    char *prefix_no_color, *prefix_highlighted, *ptr_prefix, *ptr_prefix2;
+    char *ptr_prefix_color;
+    const char *short_name, *str_color;
+    int i, length, length_allowed, num_spaces, prefix_length, extra_spaces;
+    int chars_displayed;
     struct t_gui_lines *mixed_lines;
 
     if (!simulate)
@@ -684,8 +702,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                               GUI_COLOR_CHAT_PREFIX_MORE);
             }
             gui_chat_display_word (window, line,
-                                   (CONFIG_BOOLEAN(config_look_prefix_buffer_align_more)) ?
-                                   str_plus : str_space,
+                                   CONFIG_STRING(config_look_prefix_buffer_align_more),
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
@@ -721,9 +738,32 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
         }
     }
 
+    /* get prefix for display */
+    gui_line_get_prefix_for_display (line, &ptr_prefix, &prefix_length,
+                                     &ptr_prefix_color);
+    if (ptr_prefix)
+    {
+        ptr_prefix2 = NULL;
+        if (ptr_prefix_color && ptr_prefix_color[0])
+        {
+            str_color = gui_color_get_custom (ptr_prefix_color);
+            if (str_color && str_color[0])
+            {
+                length = strlen (str_color) + strlen (ptr_prefix) + 1;
+                ptr_prefix2 = malloc (length);
+                if (ptr_prefix2)
+                {
+                    snprintf (ptr_prefix2, length, "%s%s",
+                              str_color, ptr_prefix);
+                }
+            }
+        }
+        ptr_prefix = (ptr_prefix2) ? ptr_prefix2 : strdup (ptr_prefix);
+    }
+
     /* display prefix */
-    if (line->data->prefix
-        && (line->data->prefix[0]
+    if (ptr_prefix
+        && (ptr_prefix[0]
             || (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)))
     {
         if (!simulate)
@@ -743,7 +783,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
         else
             length_allowed = window->buffer->lines->prefix_max_length;
 
-        num_spaces = length_allowed - line->data->prefix_length;
+        num_spaces = length_allowed - prefix_length;
 
         if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_RIGHT)
         {
@@ -759,7 +799,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
         prefix_highlighted = NULL;
         if (line->data->highlight)
         {
-            prefix_no_color = gui_color_decode (line->data->prefix, NULL);
+            prefix_no_color = gui_color_decode (ptr_prefix, NULL);
             if (prefix_no_color)
             {
                 length = strlen (prefix_no_color) + 32;
@@ -803,24 +843,27 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
             window->coords[window->win_chat_cursor_y].prefix_x1 = window->win_chat_cursor_x;
 
         /* not enough space to display full prefix? => truncate it! */
+        extra_spaces = 0;
         if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
             && (num_spaces < 0))
         {
-            gui_chat_display_word (window, line,
-                                   (prefix_highlighted) ? prefix_highlighted : line->data->prefix,
-                                   (prefix_highlighted) ?
-                                   prefix_highlighted + gui_chat_string_real_pos (prefix_highlighted,
-                                                                                  length_allowed) :
-                                   line->data->prefix + gui_chat_string_real_pos (line->data->prefix,
-                                                                                  length_allowed),
-                                   1, num_lines, count, lines_displayed,
-                                   simulate,
-                                   CONFIG_BOOLEAN(config_look_color_inactive_prefix));
+            chars_displayed = gui_chat_display_word (window, line,
+                                                     (prefix_highlighted) ? prefix_highlighted : ptr_prefix,
+                                                     (prefix_highlighted) ?
+                                                     prefix_highlighted + gui_chat_string_real_pos (prefix_highlighted,
+                                                                                                    length_allowed) :
+                                                     ptr_prefix + gui_chat_string_real_pos (ptr_prefix,
+                                                                                            length_allowed),
+                                                     1, num_lines, count, lines_displayed,
+                                                     simulate,
+                                                     CONFIG_BOOLEAN(config_look_color_inactive_prefix));
+            if (!simulate && (chars_displayed < length_allowed))
+                extra_spaces = length_allowed - chars_displayed;
         }
         else
         {
             gui_chat_display_word (window, line,
-                                   (prefix_highlighted) ? prefix_highlighted : line->data->prefix,
+                                   (prefix_highlighted) ? prefix_highlighted : ptr_prefix,
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix));
@@ -859,8 +902,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                               GUI_COLOR_CHAT_PREFIX_MORE);
             }
             gui_chat_display_word (window, line,
-                                   (CONFIG_BOOLEAN(config_look_prefix_align_more)) ?
-                                   str_plus : str_space,
+                                   CONFIG_STRING(config_look_prefix_align_more),
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix));
@@ -875,6 +917,13 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                        CONFIG_BOOLEAN(config_look_color_inactive_prefix));
             }
         }
+        for (i = 0; i < extra_spaces; i++)
+        {
+            gui_chat_display_word (window, line, str_space,
+                                   NULL, 1, num_lines, count, lines_displayed,
+                                   simulate,
+                                   CONFIG_BOOLEAN(config_look_color_inactive_prefix));
+        }
         if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
             && (CONFIG_STRING(config_look_prefix_suffix)
                 && CONFIG_STRING(config_look_prefix_suffix)[0]))
@@ -893,6 +942,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                    lines_displayed, simulate, 0);
         }
     }
+    if (ptr_prefix)
+        free (ptr_prefix);
 }
 
 /*
@@ -1249,25 +1300,171 @@ gui_chat_calculate_line_diff (struct t_gui_window *window,
     }
 }
 
+/*
+ * gui_chat_draw_formatted_buffer: draw chat window for a formatted buffer
+ */
+
+void
+gui_chat_draw_formatted_buffer (struct t_gui_window *window)
+{
+    struct t_gui_line *ptr_line;
+    int line_pos, count, old_scrolling, old_lines_after;
+
+    /* display at position of scrolling */
+    if (window->scroll->start_line)
+    {
+        ptr_line = window->scroll->start_line;
+        line_pos = window->scroll->start_line_pos;
+    }
+    else
+    {
+        /* look for first line to display, starting from last line */
+        ptr_line = NULL;
+        line_pos = 0;
+        gui_chat_calculate_line_diff (window, &ptr_line, &line_pos,
+                                      (-1) * (window->win_chat_height - 1));
+    }
+
+    count = 0;
+
+    if (line_pos > 0)
+    {
+        /* display end of first line at top of screen */
+        count = gui_chat_display_line (window, ptr_line,
+                                       gui_chat_display_line (window,
+                                                              ptr_line,
+                                                              0, 1) -
+                                       line_pos, 0);
+        ptr_line = gui_line_get_next_displayed (ptr_line);
+        window->scroll->first_line_displayed = 0;
+    }
+    else
+        window->scroll->first_line_displayed =
+            (ptr_line == gui_line_get_first_displayed (window->buffer));
+
+    /* display lines */
+    while (ptr_line && (window->win_chat_cursor_y <= window->win_chat_height - 1))
+    {
+        count = gui_chat_display_line (window, ptr_line, 0, 0);
+        ptr_line = gui_line_get_next_displayed (ptr_line);
+    }
+
+    old_scrolling = window->scroll->scrolling;
+    old_lines_after = window->scroll->lines_after;
+
+    window->scroll->scrolling = (window->win_chat_cursor_y > window->win_chat_height - 1);
+
+    /* check if last line of buffer is entirely displayed and scrolling */
+    /* if so, disable scroll indicator */
+    if (!ptr_line && window->scroll->scrolling)
+    {
+        if ((count == gui_chat_display_line (window, gui_line_get_last_displayed (window->buffer), 0, 1))
+            || (count == window->win_chat_height))
+            window->scroll->scrolling = 0;
+    }
+
+    if (!window->scroll->scrolling
+        && (window->scroll->start_line == gui_line_get_first_displayed (window->buffer)))
+    {
+        window->scroll->start_line = NULL;
+        window->scroll->start_line_pos = 0;
+    }
+
+    window->scroll->lines_after = 0;
+    if (window->scroll->scrolling && ptr_line)
+    {
+        /* count number of lines after last line displayed */
+        while (ptr_line)
+        {
+            ptr_line = gui_line_get_next_displayed (ptr_line);
+            if (ptr_line)
+                window->scroll->lines_after++;
+        }
+        window->scroll->lines_after++;
+    }
+
+    if ((window->scroll->scrolling != old_scrolling)
+        || (window->scroll->lines_after != old_lines_after))
+    {
+        hook_signal_send ("window_scrolled",
+                          WEECHAT_HOOK_SIGNAL_POINTER, window);
+    }
+
+    if (!window->scroll->scrolling
+        && window->scroll->reset_allowed)
+    {
+        window->scroll->start_line = NULL;
+        window->scroll->start_line_pos = 0;
+    }
+
+    /* cursor is below end line of chat window? */
+    if (window->win_chat_cursor_y > window->win_chat_height - 1)
+    {
+        window->win_chat_cursor_x = 0;
+        window->win_chat_cursor_y = window->win_chat_height - 1;
+    }
+
+    window->scroll->reset_allowed = 0;
+}
+
+/*
+ *gui_chat_draw_free_buffer: draw chat window for a free buffer
+ */
+
+void
+gui_chat_draw_free_buffer (struct t_gui_window *window, int clear_chat)
+{
+    struct t_gui_line *ptr_line;
+    int y_start, y_end, y;
+
+    ptr_line = (window->scroll->start_line) ?
+        window->scroll->start_line : window->buffer->lines->first_line;
+    if (ptr_line)
+    {
+        if (!ptr_line->data->displayed)
+            ptr_line = gui_line_get_next_displayed (ptr_line);
+        if (ptr_line)
+        {
+            y_start = (window->scroll->start_line) ? ptr_line->data->y : 0;
+            y_end = y_start + window->win_chat_height - 1;
+            while (ptr_line && (ptr_line->data->y <= y_end))
+            {
+                y = ptr_line->data->y - y_start;
+                if (y < window->coords_size)
+                {
+                    window->coords[y].line = ptr_line;
+                    window->coords[y].data = ptr_line->data->message;
+                }
+                if (ptr_line->data->refresh_needed || clear_chat)
+                {
+                    gui_chat_display_line_y (window, ptr_line,
+                                             y);
+                }
+                ptr_line = gui_line_get_next_displayed (ptr_line);
+            }
+        }
+    }
+}
+
 /*
  * gui_chat_draw: draw chat window for a buffer
  */
 
 void
-gui_chat_draw (struct t_gui_buffer *buffer, int erase)
+gui_chat_draw (struct t_gui_buffer *buffer, int clear_chat)
 {
     struct t_gui_window *ptr_win;
     struct t_gui_line *ptr_line;
     char format_empty[32];
-    int i, line_pos, count, old_scrolling, old_lines_after;
-    int y_start, y_end, y;
+    int i;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (ptr_win->buffer->number == buffer->number)
+        if ((ptr_win->buffer->number == buffer->number)
+            && (ptr_win->win_chat_x >= 0) && (ptr_win->win_chat_y >= 0))
         {
             gui_window_coords_alloc (ptr_win);
 
@@ -1276,7 +1473,7 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
                                   GUI_COLOR_CHAT_INACTIVE_BUFFER,
                                   GUI_COLOR_CHAT);
 
-            if (erase)
+            if (clear_chat)
             {
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
                 for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -1292,132 +1489,14 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
             switch (ptr_win->buffer->type)
             {
                 case GUI_BUFFER_TYPE_FORMATTED:
-                    /* display at position of scrolling */
-                    if (ptr_win->scroll->start_line)
-                    {
-                        ptr_line = ptr_win->scroll->start_line;
-                        line_pos = ptr_win->scroll->start_line_pos;
-                    }
+                    /* min 2 lines for chat area */
+                    if (ptr_win->win_chat_height < 2)
+                        mvwprintw (GUI_WINDOW_OBJECTS(ptr_win)->win_chat, 0, 0, "...");
                     else
-                    {
-                        /* look for first line to display, starting from last line */
-                        ptr_line = NULL;
-                        line_pos = 0;
-                        gui_chat_calculate_line_diff (ptr_win, &ptr_line, &line_pos,
-                                                      (-1) * (ptr_win->win_chat_height - 1));
-                    }
-
-                    count = 0;
-
-                    if (line_pos > 0)
-                    {
-                        /* display end of first line at top of screen */
-                        count = gui_chat_display_line (ptr_win, ptr_line,
-                                                       gui_chat_display_line (ptr_win,
-                                                                              ptr_line,
-                                                                              0, 1) -
-                                                       line_pos, 0);
-                        ptr_line = gui_line_get_next_displayed (ptr_line);
-                        ptr_win->scroll->first_line_displayed = 0;
-                    }
-                    else
-                        ptr_win->scroll->first_line_displayed =
-                            (ptr_line == gui_line_get_first_displayed (ptr_win->buffer));
-
-                    /* display lines */
-                    while (ptr_line && (ptr_win->win_chat_cursor_y <= ptr_win->win_chat_height - 1))
-                    {
-                        count = gui_chat_display_line (ptr_win, ptr_line, 0, 0);
-                        ptr_line = gui_line_get_next_displayed (ptr_line);
-                    }
-
-                    old_scrolling = ptr_win->scroll->scrolling;
-                    old_lines_after = ptr_win->scroll->lines_after;
-
-                    ptr_win->scroll->scrolling = (ptr_win->win_chat_cursor_y > ptr_win->win_chat_height - 1);
-
-                    /* check if last line of buffer is entirely displayed and scrolling */
-                    /* if so, disable scroll indicator */
-                    if (!ptr_line && ptr_win->scroll->scrolling)
-                    {
-                        if ((count == gui_chat_display_line (ptr_win, gui_line_get_last_displayed (ptr_win->buffer), 0, 1))
-                            || (count == ptr_win->win_chat_height))
-                            ptr_win->scroll->scrolling = 0;
-                    }
-
-                    if (!ptr_win->scroll->scrolling
-                        && (ptr_win->scroll->start_line == gui_line_get_first_displayed (ptr_win->buffer)))
-                    {
-                        ptr_win->scroll->start_line = NULL;
-                        ptr_win->scroll->start_line_pos = 0;
-                    }
-
-                    ptr_win->scroll->lines_after = 0;
-                    if (ptr_win->scroll->scrolling && ptr_line)
-                    {
-                        /* count number of lines after last line displayed */
-                        while (ptr_line)
-                        {
-                            ptr_line = gui_line_get_next_displayed (ptr_line);
-                            if (ptr_line)
-                                ptr_win->scroll->lines_after++;
-                        }
-                        ptr_win->scroll->lines_after++;
-                    }
-
-                    if ((ptr_win->scroll->scrolling != old_scrolling)
-                        || (ptr_win->scroll->lines_after != old_lines_after))
-                    {
-                        hook_signal_send ("window_scrolled",
-                                          WEECHAT_HOOK_SIGNAL_POINTER, ptr_win);
-                    }
-
-                    if (!ptr_win->scroll->scrolling
-                        && ptr_win->scroll->reset_allowed)
-                    {
-                        ptr_win->scroll->start_line = NULL;
-                        ptr_win->scroll->start_line_pos = 0;
-                    }
-
-                    /* cursor is below end line of chat window? */
-                    if (ptr_win->win_chat_cursor_y > ptr_win->win_chat_height - 1)
-                    {
-                        ptr_win->win_chat_cursor_x = 0;
-                        ptr_win->win_chat_cursor_y = ptr_win->win_chat_height - 1;
-                    }
-
-                    ptr_win->scroll->reset_allowed = 0;
-
+                        gui_chat_draw_formatted_buffer (ptr_win);
                     break;
                 case GUI_BUFFER_TYPE_FREE:
-                    /* display at position of scrolling */
-                    ptr_line = (ptr_win->scroll->start_line) ?
-                        ptr_win->scroll->start_line : buffer->lines->first_line;
-                    if (ptr_line)
-                    {
-                        if (!ptr_line->data->displayed)
-                            ptr_line = gui_line_get_next_displayed (ptr_line);
-                        if (ptr_line)
-                        {
-                            y_start = (ptr_win->scroll->start_line) ? ptr_line->data->y : 0;
-                            y_end = y_start + ptr_win->win_chat_height - 1;
-                            while (ptr_line && (ptr_line->data->y <= y_end))
-                            {
-                                y = ptr_line->data->y - y_start;
-                                if (y < ptr_win->coords_size)
-                                {
-                                    ptr_win->coords[y].line = ptr_line;
-                                    ptr_win->coords[y].data = ptr_line->data->message;
-                                }
-                                if (ptr_line->data->refresh_needed || erase)
-                                {
-                                    gui_chat_display_line_y (ptr_win, ptr_line,
-                                                             y);
-                                }
-                                ptr_line = gui_line_get_next_displayed (ptr_line);
-                            }
-                        }
-                    }
+                    gui_chat_draw_free_buffer (ptr_win, clear_chat);
                     break;
                 case GUI_BUFFER_NUM_TYPES:
                     break;
@@ -1439,18 +1518,3 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
 
     buffer->chat_refresh_needed = 0;
 }
-
-/*
- * gui_chat_draw_line: add a line to chat window for a buffer
- */
-
-void
-gui_chat_draw_line (struct t_gui_buffer *buffer, struct t_gui_line *line)
-{
-    /*
-     * This function does nothing in Curses GUI,
-     * line will be displayed by gui_buffer_draw_chat()
-     */
-    (void) buffer;
-    (void) line;
-}

src/gui/curses/gui-curses-key.c

@@ -208,6 +208,8 @@ gui_key_default_bindings (int context)
         BIND(/* m->         */ "meta->",             "/input jump_next_visited_buffer");
         BIND(/* m-/         */ "meta-/",             "/input jump_last_buffer_displayed");
         BIND(/* m-m         */ "meta-m",             "/mute mouse toggle");
+        BIND(/* start paste */ "meta2-200~",         "/input paste_start");
+        BIND(/* end paste   */ "meta2-201~",         "/input paste_stop");
 
         /* bind meta-j + {01..99} to switch to buffers # > 10 */
         for (i = 1; i < 100; i++)
@@ -288,172 +290,194 @@ gui_key_default_bindings (int context)
  */
 
 void
-gui_key_flush ()
+gui_key_flush (int paste)
 {
-    int i, key, insert_ok;
+    int i, key, last_key_used, insert_ok, undo_done;
     static char key_str[64] = { '\0' };
     static int length_key_str = 0;
     char key_temp[2], *key_utf, *input_old, *ptr_char, *next_char, *ptr_error;
     char utf_partial_char[16];
+    struct t_gui_buffer *old_buffer;
+
+    /* if paste pending or bracketed paste detected, just return */
+    if (gui_key_paste_pending || gui_key_paste_bracketed)
+        return;
+
+    /* if buffer is empty, just return */
+    if (gui_key_buffer_size == 0)
+        return;
 
     /*
      * if there's no paste pending, then we use buffer and do actions
      * according to keys
      */
-    if (!gui_key_paste_pending)
+    gui_key_last_activity_time = time (NULL);
+    last_key_used = -1;
+    undo_done = 0;
+    old_buffer = NULL;
+    for (i = 0; i < gui_key_buffer_size; i++)
     {
-        if (gui_key_buffer_size > 0)
-            gui_key_last_activity_time = time (NULL);
+        key = gui_key_buffer[i];
+        insert_ok = 1;
+        utf_partial_char[0] = '\0';
 
-        for (i = 0; i < gui_key_buffer_size; i++)
+        if (gui_mouse_event_pending || (key < 32) || (key == 127))
         {
-            key = gui_key_buffer[i];
-            insert_ok = 1;
-            utf_partial_char[0] = '\0';
-
-            if (gui_mouse_event_pending || (key < 32) || (key == 127))
+            if (gui_mouse_event_pending)
             {
-                if (gui_mouse_event_pending)
-                {
-                    insert_ok = 0;
-                    key_str[0] = (char)key;
-                    key_str[1] = '\0';
-                    length_key_str = 1;
-                }
-                else if (key < 32)
-                {
-                    insert_ok = 0;
-                    key_str[0] = '\x01';
-                    key_str[1] = (char)key + '@';
-                    key_str[2] = '\0';
-                    length_key_str = 2;
-                }
-                else if (key == 127)
-                {
-                    key_str[0] = '\x01';
-                    key_str[1] = '?';
-                    key_str[2] = '\0';
-                    length_key_str = 2;
-                }
+                insert_ok = 0;
+                key_str[0] = (char)key;
+                key_str[1] = '\0';
+                length_key_str = 1;
             }
-            else
+            else if (key < 32)
             {
-                if (local_utf8)
-                {
-                    key_str[length_key_str] = (char)key;
-                    key_str[length_key_str + 1] = '\0';
-                    length_key_str++;
-
-                    /*
-                     * replace invalid chars by "?", but NOT last char of
-                     * string, if it is incomplete UTF-8 char (another char
-                     * will be added to the string on next iteration)
-                     */
-                    ptr_char = key_str;
-                    while (ptr_char && ptr_char[0])
-                    {
-                        (void) utf8_is_valid (ptr_char, &ptr_error);
-                        if (!ptr_error)
-                            break;
-                        next_char = utf8_next_char (ptr_error);
-                        if (next_char && next_char[0])
-                        {
-                            ptr_char = ptr_error;
-                            while (ptr_char < next_char)
-                            {
-                                ptr_char[0] = '?';
-                                ptr_char++;
-                            }
-                        }
-                        else
-                        {
-                            strcpy (utf_partial_char, ptr_char);
-                            ptr_char[0] = '\0';
-                            break;
-                        }
-                        ptr_char = next_char;
-                    }
-                }
-                else
-                {
-                    /* convert input to UTF-8 */
-                    key_temp[0] = (char) key;
-                    key_temp[1] = '\0';
-                    key_utf = string_iconv_to_internal (NULL, key_temp);
-                    strcat (key_str, key_utf);
-                }
+                insert_ok = 0;
+                key_str[0] = '\x01';
+                key_str[1] = (char)key + '@';
+                key_str[2] = '\0';
+                length_key_str = 2;
             }
-
-            if (key_str[0])
+            else if (key == 127)
             {
-                hook_signal_send ("key_pressed",
-                                  WEECHAT_HOOK_SIGNAL_STRING, key_str);
+                key_str[0] = '\x01';
+                key_str[1] = '?';
+                key_str[2] = '\0';
+                length_key_str = 2;
+            }
+        }
+        else
+        {
+            if (local_utf8)
+            {
+                key_str[length_key_str] = (char)key;
+                key_str[length_key_str + 1] = '\0';
+                length_key_str++;
 
-                if (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
-                    input_old = (gui_current_window->buffer->input_buffer) ?
-                        strdup (gui_current_window->buffer->input_buffer) : strdup ("");
-                else
-                    input_old = NULL;
-
-                if ((gui_key_pressed (key_str) != 0) && (insert_ok)
-                    && (!gui_cursor_mode))
+                /*
+                 * replace invalid chars by "?", but NOT last char of
+                 * string, if it is incomplete UTF-8 char (another char
+                 * will be added to the string on next iteration)
+                 */
+                ptr_char = key_str;
+                while (ptr_char && ptr_char[0])
                 {
-                    gui_buffer_undo_snap (gui_current_window->buffer);
-                    gui_input_insert_string (gui_current_window->buffer,
-                                             key_str, -1);
-                    if (gui_current_window->buffer->completion)
-                        gui_completion_stop (gui_current_window->buffer->completion, 0);
-                    gui_input_text_changed_modifier_and_signal (gui_current_window->buffer, 1);
-                }
-
-                /* incremental text search in buffer */
-                if ((gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
-                    && ((input_old == NULL)
-                        || (gui_current_window->buffer->input_buffer == NULL)
-                        || (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0)))
-                {
-                    /*
-                     * if current input is longer than old input, and that
-                     * beginning of current input is exactly equal to old input,
-                     * then do nothing (search will not find any result and can
-                     * take some time on buffer with many lines..)
-                     */
-                    if (!gui_current_window->buffer->text_search_found
-                        && (input_old != NULL)
-                        && (input_old[0])
-                        && (gui_current_window->buffer->input_buffer != NULL)
-                        && (gui_current_window->buffer->input_buffer[0])
-                        && (strlen (gui_current_window->buffer->input_buffer) > strlen (input_old))
-                        && (strncmp (gui_current_window->buffer->input_buffer, input_old,
-                                     strlen (input_old)) == 0))
+                    (void) utf8_is_valid (ptr_char, &ptr_error);
+                    if (!ptr_error)
+                        break;
+                    next_char = utf8_next_char (ptr_error);
+                    if (next_char && next_char[0])
                     {
-                        /*
-                         * do not search text in buffer, just alert about text not
-                         * found
-                         */
-                        if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert))
-                            printf ("\a");
+                        ptr_char = ptr_error;
+                        while (ptr_char < next_char)
+                        {
+                            ptr_char[0] = '?';
+                            ptr_char++;
+                        }
                     }
                     else
                     {
-                        gui_window_search_restart (gui_current_window);
+                        strcpy (utf_partial_char, ptr_char);
+                        ptr_char[0] = '\0';
+                        break;
                     }
+                    ptr_char = next_char;
                 }
-
-                if (input_old)
-                    free (input_old);
             }
-
-            /* prepare incomplete UTF-8 char for next iteration */
-            if (utf_partial_char[0])
-                strcpy (key_str, utf_partial_char);
             else
-                key_str[0] = '\0';
-            length_key_str = strlen (key_str);
+            {
+                /* convert input to UTF-8 */
+                key_temp[0] = (char)key;
+                key_temp[1] = '\0';
+                key_utf = string_iconv_to_internal (NULL, key_temp);
+                strcat (key_str, key_utf);
+            }
         }
 
-        gui_key_buffer_reset ();
+        if (key_str[0])
+        {
+            hook_signal_send ("key_pressed",
+                              WEECHAT_HOOK_SIGNAL_STRING, key_str);
+
+            if (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
+                input_old = (gui_current_window->buffer->input_buffer) ?
+                    strdup (gui_current_window->buffer->input_buffer) : strdup ("");
+            else
+                input_old = NULL;
+            old_buffer = gui_current_window->buffer;
+
+            if ((gui_key_pressed (key_str) != 0) && (insert_ok)
+                && (!gui_cursor_mode))
+            {
+                if (!paste || !undo_done)
+                    gui_buffer_undo_snap (gui_current_window->buffer);
+                gui_input_insert_string (gui_current_window->buffer,
+                                         key_str, -1);
+                if (gui_current_window->buffer->completion)
+                    gui_completion_stop (gui_current_window->buffer->completion, 0);
+                gui_input_text_changed_modifier_and_signal (gui_current_window->buffer,
+                                                            (!paste || !undo_done) ? 1 : 0);
+                undo_done = 1;
+            }
+
+            /* incremental text search in buffer */
+            if ((old_buffer == gui_current_window->buffer)
+                && (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
+                && ((input_old == NULL)
+                    || (gui_current_window->buffer->input_buffer == NULL)
+                    || (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0)))
+            {
+                /*
+                 * if current input is longer than old input, and that
+                 * beginning of current input is exactly equal to old input,
+                 * then do nothing (search will not find any result and can
+                 * take some time on buffer with many lines..)
+                 */
+                if (!gui_current_window->buffer->text_search_found
+                    && (input_old != NULL)
+                    && (input_old[0])
+                    && (gui_current_window->buffer->input_buffer != NULL)
+                    && (gui_current_window->buffer->input_buffer[0])
+                    && (strlen (gui_current_window->buffer->input_buffer) > strlen (input_old))
+                    && (strncmp (gui_current_window->buffer->input_buffer, input_old,
+                                 strlen (input_old)) == 0))
+                {
+                    /*
+                     * do not search text in buffer, just alert about text not
+                     * found
+                     */
+                    if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert))
+                        printf ("\a");
+                }
+                else
+                {
+                    gui_window_search_restart (gui_current_window);
+                }
+            }
+
+            if (input_old)
+                free (input_old);
+        }
+
+        /* prepare incomplete UTF-8 char for next iteration */
+        if (utf_partial_char[0])
+            strcpy (key_str, utf_partial_char);
+        else
+            key_str[0] = '\0';
+        length_key_str = strlen (key_str);
+
+        /* set last key used in buffer if combo buffer is empty */
+        if (gui_key_grab || gui_mouse_event_pending || !gui_key_combo_buffer[0])
+            last_key_used = i;
     }
+
+    if (last_key_used == gui_key_buffer_size - 1)
+        gui_key_buffer_reset ();
+    else if (last_key_used >= 0)
+        gui_key_buffer_remove (0, last_key_used + 1);
+
+    if (!gui_key_grab && !gui_mouse_event_pending)
+        gui_key_combo_buffer[0] = '\0';
 }
 
 /*
@@ -463,7 +487,7 @@ gui_key_flush ()
 int
 gui_key_read_cb (void *data, int fd)
 {
-    int ret, i, accept_paste, cancel_paste, text_added_to_buffer, paste_lines;
+    int ret, i, accept_paste, cancel_paste, text_added_to_buffer, pos;
     unsigned char buffer[4096];
 
     /* make C compiler happy */
@@ -474,85 +498,108 @@ gui_key_read_cb (void *data, int fd)
     cancel_paste = 0;
     text_added_to_buffer = 0;
 
-    if (gui_key_paste_pending)
+    ret = read (STDIN_FILENO, buffer, sizeof (buffer));
+    if (ret == 0)
     {
-        ret = read (STDIN_FILENO, buffer, 1);
-        if (ret == 0)
-        {
-            /* no data on stdin, terminal lost */
-            log_printf (_("Terminal lost, exiting WeeChat..."));
-            hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
-            weechat_quit = 1;
-            return WEECHAT_RC_OK;
-        }
-        if (ret <= 0)
-            return WEECHAT_RC_OK;
-
-        /* ctrl-Y: accept paste */
-        if (buffer[0] == 25)
-            accept_paste = 1;
-
-        /* ctrl-N: cancel paste */
-        if (buffer[0] == 14)
-            cancel_paste = 1;
+        /* no data on stdin, terminal lost */
+        log_printf (_("Terminal lost, exiting WeeChat..."));
+        hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
+        weechat_quit = 1;
+        return WEECHAT_RC_OK;
     }
-    else
-    {
-        ret = read (STDIN_FILENO, buffer, sizeof (buffer));
-        if (ret == 0)
-        {
-            /* no data on stdin, terminal lost */
-            log_printf (_("Terminal lost, exiting WeeChat..."));
-            hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
-            weechat_quit = 1;
-            return WEECHAT_RC_OK;
-        }
-        if (ret < 0)
-            return WEECHAT_RC_OK;
+    if (ret < 0)
+        return WEECHAT_RC_OK;
 
-        for (i = 0; i < ret; i++)
-        {
-            /* add all chars (ignore a '\n' after a '\r') */
-            if ((i == 0)
-                || (buffer[i] != '\n')
-                || (buffer[i - 1] != '\r'))
-            {
-                gui_key_buffer_add (buffer[i]);
-            }
-        }
-
-        text_added_to_buffer = 1;
-    }
-
-    if (gui_key_paste_pending)
-    {
-        /* user is ok for pasting text, let's paste! */
-        if (accept_paste)
-            gui_key_paste_accept ();
-        /* user doesn't want to paste text: clear whole buffer! */
-        else if (cancel_paste)
-            gui_key_paste_cancel ();
-        else if (text_added_to_buffer)
-            gui_input_text_changed_modifier_and_signal (gui_current_window->buffer, 0);
-    }
-    else
+    for (i = 0; i < ret; i++)
     {
         /*
-         * detect user paste or large amount of text
-         * if so, ask user what to do
+         * add all chars, but ignore a newline ('\r' or '\n') after
+         * another one)
          */
-        if (CONFIG_INTEGER(config_look_paste_max_lines) > 0)
+        if ((i == 0)
+            || ((buffer[i] != '\r') && (buffer[i] != '\n'))
+            || ((buffer[i - 1] != '\r') && (buffer[i - 1] != '\n')))
         {
-            paste_lines = gui_key_get_paste_lines ();
-            if (paste_lines > CONFIG_INTEGER(config_look_paste_max_lines))
+            if (gui_key_paste_pending)
             {
-                gui_key_paste_pending = 1;
-                gui_input_paste_pending_signal ();
+                if (buffer[i] == 25)
+                {
+                    /* ctrl-Y: accept paste */
+                    accept_paste = 1;
+                }
+                else if (buffer[i] == 14)
+                {
+                    /* ctrl-N: cancel paste */
+                    cancel_paste = 1;
+                }
+            }
+            else
+            {
+                gui_key_buffer_add (buffer[i]);
+                text_added_to_buffer = 1;
             }
         }
     }
 
-    gui_key_flush ();
+    if (gui_key_paste_pending)
+    {
+        if (accept_paste)
+        {
+            /* user is ok for pasting text, let's paste! */
+            gui_key_paste_accept ();
+        }
+        else if (cancel_paste)
+        {
+            /* user doesn't want to paste text: clear whole buffer! */
+            gui_key_paste_cancel ();
+        }
+        else if (text_added_to_buffer)
+        {
+            /* new text received while asking for paste, update message */
+            gui_input_paste_pending_signal ();
+        }
+    }
+    else
+    {
+        if (!gui_key_paste_bracketed)
+        {
+            pos = gui_key_buffer_search (0, -1, GUI_KEY_BRACKETED_PASTE_START);
+            if (pos >= 0)
+            {
+                gui_key_buffer_remove (pos, GUI_KEY_BRACKETED_PASTE_LENGTH);
+                gui_key_paste_bracketed_start ();
+            }
+        }
+
+        if (!gui_key_paste_bracketed)
+            gui_key_paste_check (0);
+    }
+
+    gui_key_flush ((accept_paste) ? 1 : 0);
+
+    if (gui_key_paste_bracketed)
+    {
+        pos = gui_key_buffer_search (0, -1, GUI_KEY_BRACKETED_PASTE_END);
+        if (pos >= 0)
+        {
+            /* remove the code for end of bracketed paste (ESC[201~) */
+            gui_key_buffer_remove (pos, GUI_KEY_BRACKETED_PASTE_LENGTH);
+
+            /* remove final newline (if needed) */
+            gui_key_paste_remove_newline ();
+
+            /* replace tabs by spaces */
+            gui_key_paste_replace_tabs ();
+
+            /* stop bracketed mode */
+            gui_key_paste_bracketed_timer_remove ();
+            gui_key_paste_bracketed_stop ();
+
+            /* if paste confirmation not displayed, flush buffer now */
+            if (!gui_key_paste_pending)
+                gui_key_flush (1);
+        }
+    }
 
     return WEECHAT_RC_OK;
 }

src/gui/curses/gui-curses-main.c

@@ -177,6 +177,8 @@ gui_main_init ()
         gui_mouse_enable ();
     else
         gui_mouse_disable ();
+
+    gui_window_set_bracketed_paste_mode (CONFIG_BOOLEAN(config_look_paste_bracketed));
 }
 
 /*
@@ -401,6 +403,9 @@ gui_main_end (int clean_exit)
                 gui_main_refreshs ();
         }
 
+        /* disable bracketed paste mode */
+        gui_window_set_bracketed_paste_mode (0);
+
         /* disable mouse */
         gui_mouse_disable ();
 
@@ -432,7 +437,6 @@ gui_main_end (int clean_exit)
             gui_buffer_close (gui_buffers);
         }
 
-        gui_ok = 0;
         gui_init_ok = 0;
 
         /* delete global history */

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

@@ -106,9 +106,6 @@ gui_window_read_terminal_size ()
         gui_term_cols = new_width;
         gui_term_lines = new_height;
     }
-
-    gui_ok = ((gui_term_cols >= GUI_WINDOW_MIN_WIDTH)
-              && (gui_term_lines >= GUI_WINDOW_MIN_HEIGHT));
 }
 
 /*
@@ -157,7 +154,7 @@ gui_window_objects_free (struct t_gui_window *window, int free_separator)
 void
 gui_window_clear_weechat (WINDOW *window, int weechat_color)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     wbkgdset (window, ' ' | COLOR_PAIR (gui_color_weechat_get_pair (weechat_color)));
@@ -172,7 +169,7 @@ gui_window_clear_weechat (WINDOW *window, int weechat_color)
 void
 gui_window_clear (WINDOW *window, int fg, int bg)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if ((fg > 0) && (fg & GUI_COLOR_EXTENDED_FLAG))
@@ -932,13 +929,6 @@ gui_window_calculate_pos_size (struct t_gui_window *window)
     struct t_gui_bar_window *ptr_bar_win;
     int add_top, add_bottom, add_left, add_right;
 
-    if ((window->win_width < GUI_WINDOW_MIN_WIDTH)
-        || (window->win_height < GUI_WINDOW_MIN_HEIGHT))
-    {
-        gui_ok = 0;
-        return;
-    }
-
     for (ptr_bar_win = window->bar_windows; ptr_bar_win;
          ptr_bar_win = ptr_bar_win->next_bar_window)
     {
@@ -957,8 +947,17 @@ gui_window_calculate_pos_size (struct t_gui_window *window)
     window->win_chat_cursor_x = window->win_x + add_left;
     window->win_chat_cursor_y = window->win_y + add_top;
 
-    if ((window->win_chat_width <= 1) || (window->win_chat_height <= 0))
-        gui_ok = 0;
+    /* chat area too small? (not enough space left) */
+    if ((window->win_chat_width < 1) || (window->win_chat_height < 1))
+    {
+        /* invalidate the chat area, it will not be displayed */
+        window->win_chat_x = -1;
+        window->win_chat_y = -1;
+        window->win_chat_width = 0;
+        window->win_chat_height = 0;
+        window->win_chat_cursor_x = 0;
+        window->win_chat_cursor_y = 0;
+    }
 }
 
 /*
@@ -1005,7 +1004,7 @@ gui_window_draw_separator (struct t_gui_window *window)
 void
 gui_window_redraw_buffer (struct t_gui_buffer *buffer)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     gui_chat_draw (buffer, 1);
@@ -1020,7 +1019,7 @@ gui_window_redraw_all_buffers ()
 {
     struct t_gui_buffer *ptr_buffer;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_buffer = gui_buffers; ptr_buffer;
@@ -1042,7 +1041,7 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
     struct t_gui_bar_window *ptr_bar_window;
     struct t_gui_buffer *old_buffer;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     gui_buffer_add_value_num_displayed (window->buffer, -1);
@@ -1087,35 +1086,38 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
     if (!weechat_upgrading && (old_buffer != buffer))
         gui_hotlist_remove_buffer (buffer);
 
-    if (gui_ok)
+    gui_bar_window_remove_unused_bars (window);
+    gui_bar_window_add_missing_bars (window);
+
+    /* create bar windows */
+    for (ptr_bar_window = window->bar_windows; ptr_bar_window;
+         ptr_bar_window = ptr_bar_window->next_bar_window)
     {
-        gui_bar_window_remove_unused_bars (window);
-        gui_bar_window_add_missing_bars (window);
+        gui_bar_window_content_build (ptr_bar_window, window);
+        gui_bar_window_calculate_pos_size (ptr_bar_window, window);
+        gui_bar_window_create_win (ptr_bar_window);
+    }
 
-        /* create bar windows */
-        for (ptr_bar_window = window->bar_windows; ptr_bar_window;
-             ptr_bar_window = ptr_bar_window->next_bar_window)
-        {
-            gui_bar_window_content_build (ptr_bar_window, window);
-            gui_bar_window_calculate_pos_size (ptr_bar_window, window);
-            gui_bar_window_create_win (ptr_bar_window);
-        }
+    gui_window_calculate_pos_size (window);
 
-        gui_window_calculate_pos_size (window);
+    /* destroy Curses windows */
+    gui_window_objects_free (window, 0);
 
-        /* destroy Curses windows */
-        gui_window_objects_free (window, 0);
-
-        /* create Curses windows */
-        if (GUI_WINDOW_OBJECTS(window)->win_chat)
-            delwin (GUI_WINDOW_OBJECTS(window)->win_chat);
+    /* create Curses windows */
+    if (GUI_WINDOW_OBJECTS(window)->win_chat)
+    {
+        delwin (GUI_WINDOW_OBJECTS(window)->win_chat);
+        GUI_WINDOW_OBJECTS(window)->win_chat = NULL;
+    }
+    if ((window->win_chat_x >= 0) && (window->win_chat_y >= 0))
+    {
         GUI_WINDOW_OBJECTS(window)->win_chat = newwin (window->win_chat_height,
                                                        window->win_chat_width,
                                                        window->win_chat_y,
                                                        window->win_chat_x);
-        gui_window_draw_separator (window);
-        gui_buffer_ask_chat_refresh (window->buffer, 2);
     }
+    gui_window_draw_separator (window);
+    gui_buffer_ask_chat_refresh (window->buffer, 2);
 
     if (window->buffer->type == GUI_BUFFER_TYPE_FREE)
     {
@@ -1193,7 +1195,7 @@ gui_window_page_up (struct t_gui_window *window)
     char scroll[32];
     int num_lines;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     num_lines = ((window->win_chat_height - 1) *
@@ -1243,7 +1245,7 @@ gui_window_page_down (struct t_gui_window *window)
     int line_pos, num_lines;
     char scroll[32];
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     num_lines = ((window->win_chat_height - 1) *
@@ -1298,7 +1300,7 @@ gui_window_scroll_up (struct t_gui_window *window)
 {
     char scroll[32];
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     switch (window->buffer->type)
@@ -1342,7 +1344,7 @@ gui_window_scroll_down (struct t_gui_window *window)
     int line_pos;
     char scroll[32];
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     switch (window->buffer->type)
@@ -1389,7 +1391,7 @@ gui_window_scroll_down (struct t_gui_window *window)
 void
 gui_window_scroll_top (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     switch (window->buffer->type)
@@ -1426,7 +1428,7 @@ gui_window_scroll_bottom (struct t_gui_window *window)
 {
     char scroll[32];
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     switch (window->buffer->type)
@@ -1475,14 +1477,14 @@ gui_window_auto_resize (struct t_gui_window_tree *tree,
     int size1, size2;
     struct t_gui_window_tree *parent;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return 0;
 
     if (tree)
     {
         if (tree->window)
         {
-            if ((width < GUI_WINDOW_MIN_WIDTH) || (height < GUI_WINDOW_MIN_HEIGHT))
+            if ((width < 1) || (height < 2))
                 return -1;
             if (!simulate)
             {
@@ -1549,7 +1551,7 @@ gui_window_refresh_windows ()
     struct t_gui_bar *ptr_bar;
     int add_bottom, add_top, add_left, add_right;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     old_current_window = gui_current_window;
@@ -1608,7 +1610,7 @@ gui_window_split_horizontal (struct t_gui_window *window, int percentage)
     struct t_gui_window *new_window;
     int height1, height2;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return NULL;
 
     new_window = NULL;
@@ -1616,7 +1618,7 @@ gui_window_split_horizontal (struct t_gui_window *window, int percentage)
     height1 = (window->win_height * percentage) / 100;
     height2 = window->win_height - height1;
 
-    if ((height1 >= GUI_WINDOW_MIN_HEIGHT) && (height2 >= GUI_WINDOW_MIN_HEIGHT)
+    if ((height1 >= 2) && (height2 >= 2)
         && (percentage > 0) && (percentage < 100))
     {
         new_window = gui_window_new (window, window->buffer,
@@ -1653,7 +1655,7 @@ gui_window_split_vertical (struct t_gui_window *window, int percentage)
     struct t_gui_window *new_window;
     int width1, width2;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return NULL;
 
     new_window = NULL;
@@ -1661,7 +1663,7 @@ gui_window_split_vertical (struct t_gui_window *window, int percentage)
     width1 = (window->win_width * percentage) / 100;
     width2 = window->win_width - width1 - 1;
 
-    if ((width1 >= GUI_WINDOW_MIN_WIDTH) && (width2 >= GUI_WINDOW_MIN_WIDTH)
+    if ((width1 >= 1) && (width2 >= 1)
         && (percentage > 0) && (percentage < 100))
     {
         new_window = gui_window_new (window, window->buffer,
@@ -1700,7 +1702,7 @@ gui_window_resize (struct t_gui_window *window, int percentage)
     struct t_gui_window_tree *parent;
     int old_split_pct, add_bottom, add_top, add_left, add_right;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     parent = window->ptr_tree->parent_node;
@@ -1742,7 +1744,7 @@ gui_window_resize_delta (struct t_gui_window *window, int delta_percentage)
     struct t_gui_window_tree *parent;
     int old_split_pct, add_bottom, add_top, add_left, add_right;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     parent = window->ptr_tree->parent_node;
@@ -1787,7 +1789,7 @@ gui_window_merge (struct t_gui_window *window)
 {
     struct t_gui_window_tree *parent, *sister;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return 0;
 
     parent = window->ptr_tree->parent_node;
@@ -1834,7 +1836,7 @@ gui_window_merge_all (struct t_gui_window *window)
 {
     int num_deleted, add_bottom, add_top, add_left, add_right;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     num_deleted = 0;
@@ -1879,7 +1881,7 @@ gui_window_merge_all (struct t_gui_window *window)
 int
 gui_window_side_by_side (struct t_gui_window *win1, struct t_gui_window *win2)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return 0;
 
     /* win2 over win1 ? */
@@ -1934,7 +1936,7 @@ gui_window_switch_up (struct t_gui_window *window)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_win = gui_windows; ptr_win;
@@ -1958,7 +1960,7 @@ gui_window_switch_down (struct t_gui_window *window)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_win = gui_windows; ptr_win;
@@ -1982,7 +1984,7 @@ gui_window_switch_left (struct t_gui_window *window)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_win = gui_windows; ptr_win;
@@ -2006,7 +2008,7 @@ gui_window_switch_right (struct t_gui_window *window)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     for (ptr_win = gui_windows; ptr_win;
@@ -2102,7 +2104,7 @@ gui_window_swap (struct t_gui_window *window, int direction)
     struct t_gui_window *window2, *ptr_win;
     struct t_gui_buffer *buffer1;
 
-    if (!window || !gui_ok)
+    if (!window || !gui_init_ok)
         return;
 
     window2 = NULL;
@@ -2273,6 +2275,28 @@ gui_window_send_clipboard (const char *storage_unit, const char *text)
     }
 }
 
+/*
+ * gui_window_set_bracketed_paste_mode: enable/disable bracketed paste mode
+ */
+
+void
+gui_window_set_bracketed_paste_mode (int enable)
+{
+    char *envterm, *envtmux;
+    int tmux, screen;
+
+    envtmux = getenv ("TMUX");
+    tmux = (envtmux && envtmux[0]);
+
+    envterm = getenv ("TERM");
+    screen = (envterm && (strncmp (envterm, "screen", 6) == 0) && !tmux);
+
+    fprintf (stderr, "%s\033[?2004%s%s",
+             (screen) ? "\033P" : "",
+             (enable) ? "h" : "l",
+             (screen) ? "\033\\" : "");
+}
+
 /*
  * gui_window_move_cursor: move cursor on screen (for cursor mode)
  */

src/gui/gtk/gui-gtk-chat.c

@@ -352,7 +352,7 @@ gui_chat_calculate_line_diff (struct t_gui_window *window, struct t_gui_line **l
  */
 
 void
-gui_chat_draw (struct t_gui_buffer *buffer, int erase)
+gui_chat_draw (struct t_gui_buffer *buffer, int clear_chat)
 {
     /*struct t_gui_window *ptr_win;
     struct t_gui_line *ptr_line;
@@ -366,46 +366,10 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
     char format[32], date[128], *buf;
     struct tm *date_tmp;*/
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     /* TODO: write this function for Gtk */
     (void) buffer;
-    (void) erase;
-}
-
-/*
- * gui_chat_draw_line: add a line to chat window for a buffer
- */
-
-void
-gui_chat_draw_line (struct t_gui_buffer *buffer, struct t_gui_line *line)
-{
-    /*
-    struct t_gui_window *ptr_win;
-    unsigned char *message_without_color;
-    GtkTextIter start, end;
-    */
-
-    (void) buffer;
-    (void) line;
-
-    /*
-    ptr_win = gui_buffer_find_window (buffer);
-    if (ptr_win)
-    {
-        message_without_color = gui_color_decode ((unsigned char *)(line->message));
-        if (message_without_color)
-        {
-            gtk_text_buffer_insert_at_cursor (GUI_WINDOW_OBJECTS(ptr_win)->textbuffer_chat,
-                                              (char *)message_without_color, -1);
-            gtk_text_buffer_insert_at_cursor (GUI_WINDOW_OBJECTS(ptr_win)->textbuffer_chat,
-                                              "\n", -1);
-            gtk_text_buffer_get_bounds (GUI_WINDOW_OBJECTS(ptr_win)->textbuffer_chat,
-                                        &start, &end);
-            gtk_text_buffer_apply_tag (ptr_win->textbuffer_chat, ptr_win->texttag_chat, &start, &end);
-            free (message_without_color);
-        }
-    }
-    */
+    (void) clear_chat;
 }

src/gui/gtk/gui-gtk-main.c

@@ -93,8 +93,6 @@ gui_main_init ()
 
     gui_color_init ();
 
-    gui_ok = 1;
-
     /* build prefixes according to config */
     gui_chat_prefix_build ();
 

src/gui/gtk/gui-gtk-window.c

@@ -264,7 +264,7 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
 void
 gui_window_page_up (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (!window->scroll->first_line_displayed)
@@ -288,7 +288,7 @@ gui_window_page_down (struct t_gui_window *window)
     struct t_gui_line *ptr_line;
     int line_pos;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (window->scroll->start_line)
@@ -320,7 +320,7 @@ gui_window_page_down (struct t_gui_window *window)
 void
 gui_window_scroll_up (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (!window->scroll->first_line_displayed)
@@ -345,7 +345,7 @@ gui_window_scroll_down (struct t_gui_window *window)
     struct t_gui_line *ptr_line;
     int line_pos;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (window->scroll->start_line)
@@ -378,7 +378,7 @@ gui_window_scroll_down (struct t_gui_window *window)
 void
 gui_window_scroll_top (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (!window->scroll->first_line_displayed)
@@ -396,7 +396,7 @@ gui_window_scroll_top (struct t_gui_window *window)
 void
 gui_window_scroll_bottom (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (window->scroll->start_line)
@@ -471,7 +471,7 @@ gui_window_refresh_windows ()
 {
     /*struct t_gui_window *ptr_win, *old_current_window;*/
 
-    if (gui_ok)
+    if (gui_init_ok)
     {
         /* TODO: write this function for Gtk */
     }
@@ -487,7 +487,7 @@ gui_window_split_horizontal (struct t_gui_window *window, int percentage)
     struct t_gui_window *new_window;
     int height1, height2;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return NULL;
 
     new_window = NULL;
@@ -532,7 +532,7 @@ gui_window_split_vertical (struct t_gui_window *window, int percentage)
     struct t_gui_window *new_window;
     int width1, width2;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return NULL;
 
     new_window = NULL;
@@ -866,6 +866,18 @@ gui_window_send_clipboard (const char *storage_unit, const char *text)
     /* TODO: write this function for Gtk */
 }
 
+/*
+ * gui_window_set_bracketed_paste_mode: enable/disable bracketed paste mode
+ */
+
+void
+gui_window_set_bracketed_paste_mode (int enable)
+{
+    (void) enable;
+
+    /* TODO: write this function for Gtk */
+}
+
 /*
  * gui_window_move_cursor: move cursor on screen (for cursor mode)
  */

src/gui/gui-bar-item.c

@@ -586,9 +586,8 @@ char *
 gui_bar_item_default_input_paste (void *data, struct t_gui_bar_item *item,
                                   struct t_gui_window *window)
 {
-    char *text_paste_pending = N_("%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No");
-    char *ptr_message, *buf;
-    int length;
+    char buf[1024];
+    int lines;
 
     /* make C compiler happy */
     (void) data;
@@ -600,15 +599,14 @@ gui_bar_item_default_input_paste (void *data, struct t_gui_bar_item *item,
     if (!gui_key_paste_pending)
         return NULL;
 
-    ptr_message = _(text_paste_pending);
-    length = strlen (ptr_message) + 16 + 1;
-    buf = malloc (length);
-    if (buf)
-        snprintf (buf, length, ptr_message,
-                  gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_input_actions))),
-                  gui_key_get_paste_lines ());
-
-    return buf;
+    lines = gui_key_get_paste_lines ();
+    snprintf (buf, sizeof (buf),
+              NG_("%sPaste %d line ? [ctrl-Y] Yes [ctrl-N] No",
+                  "%sPaste %d lines ? [ctrl-Y] Yes [ctrl-N] No",
+                  lines),
+              gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_input_actions))),
+              lines);
+    return strdup (buf);
 }
 
 /*
@@ -1511,7 +1509,7 @@ gui_bar_item_focus_buffer_nicklist (void *data,
         hashtable_set (info, "nick", ptr_nick->name);
         hashtable_set (info, "prefix", ptr_nick->prefix);
     }
-    else
+    else if (ptr_group)
     {
         hashtable_set (info,
                        "group",

src/gui/gui-bar-window.c

@@ -361,6 +361,18 @@ gui_bar_window_calculate_pos_size (struct t_gui_bar_window *bar_window,
         case GUI_BAR_NUM_POSITIONS:
             break;
     }
+
+    /* bar window can not be displayed? (not enough space left) */
+    if ((bar_window->x < x1) || (bar_window->x > x2)
+        || (bar_window->y < y1) || (bar_window->y > y2)
+        || (bar_window->width < 1) || (bar_window->height < 1))
+    {
+        /* invalidate the bar window, it will not be displayed */
+        bar_window->x = -1;
+        bar_window->y = -1;
+        bar_window->width = 0;
+        bar_window->height = 0;
+    }
 }
 
 /*
@@ -1121,13 +1133,11 @@ gui_bar_window_get_max_size_in_window (struct t_gui_bar_window *bar_window,
         {
             case GUI_BAR_POSITION_BOTTOM:
             case GUI_BAR_POSITION_TOP:
-                max_size = (window->win_chat_height + bar_window->height) -
-                    GUI_WINDOW_CHAT_MIN_HEIGHT;
+                max_size = (window->win_chat_height + bar_window->height) - 1;
                 break;
             case GUI_BAR_POSITION_LEFT:
             case GUI_BAR_POSITION_RIGHT:
-                max_size = (window->win_chat_width + bar_window->width) -
-                    GUI_WINDOW_CHAT_MIN_HEIGHT;
+                max_size = (window->win_chat_width + bar_window->width) - 1;
                 break;
             case GUI_BAR_NUM_POSITIONS:
                 break;

src/gui/gui-bar.c

@@ -275,8 +275,8 @@ gui_bar_check_size_add (struct t_gui_bar *bar, int add_size)
         if ((CONFIG_INTEGER(bar->options[GUI_BAR_OPTION_TYPE]) == GUI_BAR_TYPE_ROOT)
             || (gui_bar_window_search_bar (ptr_window, bar)))
         {
-            if ((ptr_window->win_chat_width - sub_width < GUI_WINDOW_CHAT_MIN_WIDTH)
-                || (ptr_window->win_chat_height - sub_height < GUI_WINDOW_CHAT_MIN_HEIGHT))
+            if ((ptr_window->win_chat_width - sub_width < 1)
+                || (ptr_window->win_chat_height - sub_height < 1))
                 return 0;
         }
     }

src/gui/gui-buffer.c

@@ -3153,6 +3153,7 @@ gui_buffer_hdata_buffer_cb (void *data, const char *hdata_name)
         HDATA_VAR(struct t_gui_buffer, next_buffer, POINTER, hdata_name);
         HDATA_LIST(gui_buffers);
         HDATA_LIST(last_gui_buffer);
+        HDATA_LIST(gui_buffer_last_displayed);
     }
     return hdata;
 }
@@ -3363,8 +3364,10 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
             free (message_without_colors);
         tags = string_build_with_split_string ((const char **)ptr_line->data->tags_array,
                                                ",");
-        log_printf ("  tags: %s, highlight: %d",
-                    (tags) ? tags : "(none)", ptr_line->data->highlight);
+        log_printf ("  tags: '%s', displayed: %d, highlight: %d",
+                    (tags) ? tags : "(none)",
+                    ptr_line->data->displayed,
+                    ptr_line->data->highlight);
         if (tags)
             free (tags);
         snprintf (buf, sizeof (buf), "%s", ctime (&ptr_line->data->date));
@@ -3550,7 +3553,8 @@ gui_buffer_print_log ()
             tags = string_build_with_split_string ((const char **)ptr_line->data->tags_array,
                                                    ",");
             log_printf ("       line N-%05d: y:%d, str_time:'%s', tags:'%s', "
-                        "displayed:%d, highlight:%d, refresh_needed:%d, prefix:'%s'",
+                        "displayed:%d, highlight:%d, refresh_needed:%d, "
+                        "prefix:'%s'",
                         num, ptr_line->data->y, ptr_line->data->str_time,
                         (tags) ? tags  : "",
                         (int)(ptr_line->data->displayed),

src/gui/gui-chat.c

@@ -233,13 +233,14 @@ gui_chat_string_add_offset_screen (const char *string, int offset_screen)
 int
 gui_chat_string_real_pos (const char *string, int pos)
 {
-    const char *real_pos, *ptr_string;
+    const char *real_pos, *real_pos_prev, *ptr_string;
     int size_on_screen;
 
     if (pos <= 0)
         return 0;
 
     real_pos = string;
+    real_pos_prev = string;
     ptr_string = string;
     while (ptr_string && ptr_string[0] && (pos > 0))
     {
@@ -252,9 +253,12 @@ gui_chat_string_real_pos (const char *string, int pos)
             if (size_on_screen > 0)
                 pos -= size_on_screen;
             ptr_string = utf8_next_char (ptr_string);
+            real_pos_prev = real_pos;
             real_pos = ptr_string;
         }
     }
+    if (pos < 0)
+        real_pos = real_pos_prev;
     return 0 + (real_pos - string);
 }
 

src/gui/gui-chat.h

@@ -92,7 +92,7 @@ extern char *gui_chat_string_next_char (struct t_gui_window *window,
                                         const unsigned char *string,
                                         int apply_style,
                                         int apply_style_inactive);
-extern void gui_chat_draw (struct t_gui_buffer *buffer, int erase);
+extern void gui_chat_draw (struct t_gui_buffer *buffer, int clear_chat);
 extern void gui_chat_draw_line (struct t_gui_buffer *buffer,
                                 struct t_gui_line *line);
 

src/gui/gui-key.c

@@ -32,6 +32,7 @@
 #include <time.h>
 
 #include "../core/weechat.h"
+#include "../core/wee-config.h"
 #include "../core/wee-hashtable.h"
 #include "../core/wee-hdata.h"
 #include "../core/wee-hook.h"
@@ -83,6 +84,9 @@ int gui_key_buffer_size = 0;        /* input buffer size in bytes           */
 
 int gui_key_paste_pending = 0;      /* 1 is big paste was detected and      */
                                     /* WeeChat is asking user what to do    */
+int gui_key_paste_bracketed = 0;    /* bracketed paste mode detected        */
+struct t_hook *gui_key_paste_bracketed_timer = NULL;
+                                    /* timer for bracketed paste            */
 int gui_key_paste_lines = 0;        /* number of lines for pending paste    */
 
 time_t gui_key_last_activity_time = 0; /* last activity time (key)          */
@@ -346,53 +350,6 @@ gui_key_get_expanded_name (const char *key)
     return result;
 }
 
-/*
- * gui_key_score: compute a score key for sorting keys
- *                (high score == at the end of list)
- */
-
-int
-gui_key_score (struct t_gui_key *key)
-{
-    int score, bonus, area;
-
-    score = 0;
-    bonus = 8;
-
-    if (key->key[0] != '@')
-        return score;
-
-    /* basic score for key with area */
-    score |= 1 << bonus;
-    bonus--;
-
-    /* add score for each area type */
-    for (area = 0; area < 2; area++)
-    {
-        /* bonus if area type is "any" */
-        if (key->area_name[area]
-            && (key->area_type[area] == GUI_KEY_FOCUS_ANY))
-        {
-            score |= 1 << bonus;
-        }
-        bonus--;
-    }
-
-    /* add score for each area name */
-    for (area = 0; area < 2; area++)
-    {
-        /* bonus if area name is "*" */
-        if (key->area_name[area]
-            && (strcmp (key->area_name[area], "*") == 0))
-        {
-            score |= 1 << bonus;
-        }
-        bonus--;
-    }
-
-    return score;
-}
-
 /*
  * gui_key_find_pos: find position for a key (for sorting keys list)
  */
@@ -401,14 +358,12 @@ struct t_gui_key *
 gui_key_find_pos (struct t_gui_key *keys, struct t_gui_key *key)
 {
     struct t_gui_key *ptr_key;
-    int score1, score2;
 
-    score1 = gui_key_score (key);
     for (ptr_key = keys; ptr_key; ptr_key = ptr_key->next_key)
     {
-        score2 = gui_key_score (ptr_key);
-        if ((score1 < score2)
-            || ((score1 == score2) && (strcmp (key->key, ptr_key->key) < 0)))
+        if ((key->score < ptr_key->score)
+            || ((key->score == ptr_key->score)
+                && (strcmp (key->key, ptr_key->key) < 0)))
         {
             return ptr_key;
         }
@@ -569,6 +524,56 @@ gui_key_set_areas (struct t_gui_key *key)
         free (areas[1]);
 }
 
+/*
+ * gui_key_set_score: compute a score key for sorting keys
+ *                    and set it in key
+ *                   (high score == at the end of list)
+ */
+
+void
+gui_key_set_score (struct t_gui_key *key)
+{
+    int score, bonus, area;
+
+    score = 0;
+    bonus = 8;
+
+    key->score = score;
+
+    if (key->key[0] != '@')
+        return;
+
+    /* basic score for key with area */
+    score |= 1 << bonus;
+    bonus--;
+
+    /* add score for each area type */
+    for (area = 0; area < 2; area++)
+    {
+        /* bonus if area type is "any" */
+        if (key->area_name[area]
+            && (key->area_type[area] == GUI_KEY_FOCUS_ANY))
+        {
+            score |= 1 << bonus;
+        }
+        bonus--;
+    }
+
+    /* add score for each area name */
+    for (area = 0; area < 2; area++)
+    {
+        /* bonus if area name is "*" */
+        if (key->area_name[area]
+            && (strcmp (key->area_name[area], "*") == 0))
+        {
+            score |= 1 << bonus;
+        }
+        bonus--;
+    }
+
+    key->score = score;
+}
+
 /*
  * gui_key_new: add a new key in keys list
  *              if buffer is not null, then key is specific to buffer
@@ -603,6 +608,7 @@ gui_key_new (struct t_gui_buffer *buffer, int context, const char *key,
             return NULL;
         }
         gui_key_set_areas (new_key);
+        gui_key_set_score (new_key);
 
         if (buffer)
         {
@@ -1396,6 +1402,115 @@ gui_key_buffer_add (unsigned char key)
     }
 }
 
+/*
+ * gui_key_buffer_search: search a string in gui_key_buffer (array of integers)
+ *                        start_index must be >= 0
+ *                        if max_index is negative, the search is until end of buffer
+ *                        return index for string found in gui_key_buffer
+ *                        (not from "start_index" but from beginning of gui_key_buffer)
+ *                        or -1 if string is not found
+ */
+
+int
+gui_key_buffer_search (int start_index, int max_index, const char *string)
+{
+    int i, j, length, found;
+
+    if ((gui_key_buffer_size == 0) || !string || !string[0])
+        return -1;
+
+    length = strlen (string);
+
+    if (gui_key_buffer_size < length)
+        return -1;
+
+    if (max_index < 0)
+        max_index = gui_key_buffer_size - length;
+    else if (max_index > gui_key_buffer_size - length)
+        max_index = gui_key_buffer_size - length;
+
+    for (i = start_index; i <= max_index; i++)
+    {
+        found = 1;
+        for (j = 0; j < length; j++)
+        {
+            if (gui_key_buffer[i + j] != string[j])
+            {
+                found = 0;
+                break;
+            }
+        }
+        if (found)
+            return i;
+    }
+
+    /* string not found */
+    return -1;
+}
+
+/*
+ * gui_key_buffer_remove: remove some chars from gui_key_buffer
+ */
+
+void
+gui_key_buffer_remove (int index, int number)
+{
+    int i;
+
+    for (i = index; i < gui_key_buffer_size - number; i++)
+    {
+        gui_key_buffer[i] = gui_key_buffer[i + number];
+    }
+    gui_key_buffer_size -= number;
+}
+
+/*
+ * gui_key_paste_remove_newline: remove final newline at enf of paste if there
+ *                               is only one line to paste
+ */
+
+void
+gui_key_paste_remove_newline ()
+{
+    if ((gui_key_paste_lines <= 1)
+        && (gui_key_buffer_size > 0)
+        && ((gui_key_buffer[gui_key_buffer_size - 1] == '\r')
+            || (gui_key_buffer[gui_key_buffer_size - 1] == '\n')))
+    {
+        gui_key_buffer_size--;
+        gui_key_paste_lines = 0;
+    }
+}
+
+/*
+ * gui_key_paste_replace_tabs: replace tabs by spaces in paste
+ */
+
+void
+gui_key_paste_replace_tabs ()
+{
+    int i;
+
+    for (i = 0; i < gui_key_buffer_size; i++)
+    {
+        if (gui_key_buffer[i] == '\t')
+            gui_key_buffer[i] = ' ';
+    }
+}
+
+/*
+ * gui_key_paste_start: start paste of text
+ */
+
+void
+gui_key_paste_start ()
+{
+    gui_key_paste_remove_newline ();
+    gui_key_paste_replace_tabs ();
+    gui_key_paste_pending = 1;
+    gui_input_paste_pending_signal ();
+}
+
 /*
  * gui_key_get_paste_lines: return real number of lines in buffer
  *                          if last key is not Return, then this is lines + 1
@@ -1405,14 +1520,126 @@ gui_key_buffer_add (unsigned char key)
 int
 gui_key_get_paste_lines ()
 {
-    if ((gui_key_buffer_size > 0)
-        && (gui_key_buffer[gui_key_buffer_size - 1] != '\r')
-        && (gui_key_buffer[gui_key_buffer_size - 1] != '\n'))
+    int length;
+
+    length = gui_key_buffer_size;
+
+    if (length >= GUI_KEY_BRACKETED_PASTE_LENGTH)
+    {
+        if (gui_key_buffer_search (length - GUI_KEY_BRACKETED_PASTE_LENGTH, -1,
+                                   GUI_KEY_BRACKETED_PASTE_END) >= 0)
+            length -= GUI_KEY_BRACKETED_PASTE_LENGTH;
+    }
+
+    if ((length > 0)
+        && (gui_key_buffer[length - 1] != '\r')
+        && (gui_key_buffer[length - 1] != '\n'))
     {
         return gui_key_paste_lines + 1;
     }
 
-    return gui_key_paste_lines;
+    return (gui_key_paste_lines > 0) ? gui_key_paste_lines : 1;
+}
+
+/*
+ * gui_key_paste_check: check pasted lines: if more than N lines, then enable
+ *                      paste mode and ask confirmation to user
+ *                      (ctrl-Y=paste, ctrl-N=cancel)
+ *                      (N is option weechat.look.paste_max_lines)
+ *                      return 1 if paste mode has been enabled, 0 otherwise
+ */
+
+int
+gui_key_paste_check (int bracketed_paste)
+{
+    int max_lines;
+
+    max_lines = CONFIG_INTEGER(config_look_paste_max_lines);
+    if (max_lines >= 0)
+    {
+        if (!bracketed_paste && (max_lines == 0))
+            max_lines = 1;
+        if (gui_key_get_paste_lines () > max_lines)
+        {
+            /* ask user what to do */
+            gui_key_paste_start ();
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+/*
+ * gui_key_paste_bracketed_timer_cb: callback for bracketed paste timer
+ */
+
+int
+gui_key_paste_bracketed_timer_cb (void *data, int remaining_calls)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) remaining_calls;
+
+    gui_key_paste_bracketed_timer = NULL;
+
+    if (gui_key_paste_bracketed)
+        gui_key_paste_bracketed_stop ();
+
+    return WEECHAT_RC_OK;
+}
+
+/*
+ * gui_key_paste_bracketed_timer_remove: remove timer for bracketed paste
+ */
+
+void
+gui_key_paste_bracketed_timer_remove ()
+{
+    if (gui_key_paste_bracketed_timer)
+    {
+        unhook (gui_key_paste_bracketed_timer);
+        gui_key_paste_bracketed_timer = NULL;
+    }
+}
+
+/*
+ * gui_key_paste_bracketed_timer_add: add timer for bracketed paste
+ */
+
+void
+gui_key_paste_bracketed_timer_add ()
+{
+    gui_key_paste_bracketed_timer_remove ();
+    gui_key_paste_bracketed_timer = hook_timer (NULL,
+                                                CONFIG_INTEGER(config_look_paste_bracketed_timer_delay) * 1000,
+                                                0, 1,
+                                                &gui_key_paste_bracketed_timer_cb, NULL);
+}
+
+/*
+ * gui_key_paste_bracketed_start: start bracketed paste of text
+ *                                (ESC[200~ detected)
+ */
+
+void
+gui_key_paste_bracketed_start ()
+{
+    gui_key_paste_bracketed = 1;
+    gui_key_paste_bracketed_timer_add ();
+}
+
+/*
+ * gui_key_paste_bracketed_stop: stop bracketed paste of text
+ *                               (ESC[201~ detected or timeout while waiting for
+ *                               this code)
+ */
+
+void
+gui_key_paste_bracketed_stop ()
+{
+    gui_key_paste_check (1);
+    gui_key_paste_bracketed = 0;
 }
 
 /*
@@ -1422,8 +1649,12 @@ gui_key_get_paste_lines ()
 void
 gui_key_paste_accept ()
 {
-    /* add final '\n' if there is not in pasted text */
-    if ((gui_key_buffer_size > 0)
+    /*
+     * add final newline if there is not in pasted text
+     * (for at least 2 lines pasted)
+     */
+    if ((gui_key_get_paste_lines () > 1)
+        && (gui_key_buffer_size > 0)
         && (gui_key_buffer[gui_key_buffer_size - 1] != '\r')
         && (gui_key_buffer[gui_key_buffer_size - 1] != '\n'))
     {
@@ -1492,6 +1723,7 @@ gui_key_hdata_key_cb (void *data, const char *hdata_name)
         HDATA_VAR(struct t_gui_key, area_name, POINTER, NULL);
         HDATA_VAR(struct t_gui_key, area_key, STRING, NULL);
         HDATA_VAR(struct t_gui_key, command, STRING, NULL);
+        HDATA_VAR(struct t_gui_key, score, INTEGER, NULL);
         HDATA_VAR(struct t_gui_key, prev_key, POINTER, hdata_name);
         HDATA_VAR(struct t_gui_key, next_key, POINTER, hdata_name);
         for (i = 0; i < GUI_KEY_NUM_CONTEXTS; i++)
@@ -1560,6 +1792,8 @@ gui_key_add_to_infolist (struct t_infolist *infolist, struct t_gui_key *key)
         return 0;
     if (!infolist_new_var_string (ptr_item, "command", key->command))
         return 0;
+    if (!infolist_new_var_integer (ptr_item, "score", key->score))
+        return 0;
 
     return 1;
 }
@@ -1585,6 +1819,7 @@ gui_key_print_log_key (struct t_gui_key *key, const char *prefix)
     }
     log_printf ("%s  area_key . . . . . : '%s'",  prefix, key->area_key);
     log_printf ("%s  command. . . . . . : '%s'",  prefix, key->command);
+    log_printf ("%s  score. . . . . . . : %d",    prefix, key->score);
     log_printf ("%s  prev_key . . . . . : 0x%lx", prefix, key->prev_key);
     log_printf ("%s  next_key . . . . . : 0x%lx", prefix, key->next_key);
 }

src/gui/gui-key.h

@@ -26,6 +26,10 @@ struct t_hashtable;
 
 #define GUI_KEY_GRAB_DELAY_DEFAULT 500
 
+#define GUI_KEY_BRACKETED_PASTE_START  "\x1B[200~"
+#define GUI_KEY_BRACKETED_PASTE_END    "\x1B[201~"
+#define GUI_KEY_BRACKETED_PASTE_LENGTH 6
+
 enum t_gui_key_context
 {
     GUI_KEY_CONTEXT_DEFAULT = 0,
@@ -55,6 +59,7 @@ struct t_gui_key
     char *area_name[2];             /* name of areas (for cursor/mouse)     */
     char *area_key;                 /* key after area (after ":")           */
     char *command;                  /* associated command (may be NULL)     */
+    int score;                      /* score, for sorting keys              */
     struct t_gui_key *prev_key;     /* link to previous key                 */
     struct t_gui_key *next_key;     /* link to next key                     */
 };
@@ -75,6 +80,7 @@ extern int gui_key_grab_count;
 extern int *gui_key_buffer;
 extern int gui_key_buffer_size;
 extern int gui_key_paste_pending;
+extern int gui_key_paste_bracketed;
 extern time_t gui_key_last_activity_time;
 
 /* key functions */
@@ -109,7 +115,18 @@ extern void gui_key_free_all (struct t_gui_key **keys,
                               int *keys_count);
 extern void gui_key_buffer_reset ();
 extern void gui_key_buffer_add (unsigned char key);
+extern int gui_key_buffer_search (int start_index, int max_index,
+                                  const char *string);
+extern void gui_key_buffer_remove (int index, int number);
+extern void gui_key_paste_remove_newline ();
+extern void gui_key_paste_replace_tabs ();
+extern void gui_key_paste_start ();
 extern int gui_key_get_paste_lines ();
+extern int gui_key_paste_check (int bracketed_paste);
+extern void gui_key_paste_bracketed_timer_remove ();
+extern void gui_key_paste_bracketed_timer_add ();
+extern void gui_key_paste_bracketed_start ();
+extern void gui_key_paste_bracketed_stop ();
 extern void gui_key_paste_accept ();
 extern void gui_key_paste_cancel ();
 extern void gui_key_end ();

src/gui/gui-line.c

@@ -83,6 +83,116 @@ gui_lines_free (struct t_gui_lines *lines)
     free (lines);
 }
 
+/*
+ * gui_line_prefix_is_same_nick_as_previous: return 1 if prefix on line is a
+ *                                           nick and is the same as nick on
+ *                                           previour line, otherwise 0
+ */
+
+int
+gui_line_prefix_is_same_nick_as_previous (struct t_gui_line *line)
+{
+    const char *nick, *nick_previous;
+    struct t_gui_line *prev_line;
+
+    /*
+     * if line is not displayed, has a highlight, or does not have a tag
+     * beginning with "prefix_nick" => display standard prefix
+     */
+    if (!line->data->displayed || line->data->highlight
+        || !gui_line_search_tag_starting_with (line, "prefix_nick"))
+        return 0;
+
+    /* no nick on line => display standard prefix */
+    nick = gui_line_get_nick_tag (line);
+    if (!nick)
+        return 0;
+
+    /*
+     * previous line is not found => display standard prefix
+     */
+    prev_line = gui_line_get_prev_displayed (line);
+    if (!prev_line)
+        return 0;
+
+    /* buffer is not the same as previous line => display standard prefix */
+    if (line->data->buffer != prev_line->data->buffer)
+        return 0;
+
+    /*
+     * previous line does not have a tag beginning with "prefix_nick"
+     * => display standard prefix
+     */
+    if (!gui_line_search_tag_starting_with (prev_line, "prefix_nick"))
+        return 0;
+
+    /* no nick on previous line => display standard prefix */
+    nick_previous = gui_line_get_nick_tag (prev_line);
+    if (!nick_previous)
+        return 0;
+
+    /* prefix can be hidden/replaced if nicks are equal */
+    return (strcmp (nick, nick_previous) == 0) ? 1 : 0;
+}
+
+/*
+ * gui_line_get_prefix_for_display: get prefix and its length (for display only)
+ *                                  if the prefix can be hidden (same nick as
+ *                                  previous message), and if the option is
+ *                                  enabled (not empty string), then this
+ *                                  this function will return empty prefix or
+ *                                  prefix from option
+ */
+
+void
+gui_line_get_prefix_for_display (struct t_gui_line *line,
+                                 char **prefix, int *length,
+                                 char **color)
+{
+    const char *tag_prefix_nick;
+
+    if (CONFIG_STRING(config_look_prefix_same_nick)
+        && CONFIG_STRING(config_look_prefix_same_nick)[0]
+        && gui_line_prefix_is_same_nick_as_previous (line))
+    {
+        /* same nick: return empty prefix or value from option */
+        if (strcmp (CONFIG_STRING(config_look_prefix_same_nick), " ") == 0)
+        {
+            if (prefix)
+                *prefix = gui_chat_prefix_empty;
+            if (length)
+                *length = 0;
+            if (color)
+                *color = NULL;
+        }
+        else
+        {
+            if (prefix)
+                *prefix = CONFIG_STRING(config_look_prefix_same_nick);
+            if (length)
+                *length = config_length_prefix_same_nick;
+            if (color)
+            {
+                *color = NULL;
+                tag_prefix_nick = gui_line_search_tag_starting_with (line,
+                                                                     "prefix_nick_");
+                if (tag_prefix_nick)
+                    *color = (char *)(tag_prefix_nick + 12);
+            }
+        }
+    }
+    else
+    {
+        /* not same nick: return prefix from line */
+        if (prefix)
+            *prefix = line->data->prefix;
+        if (length)
+            *length = line->data->prefix_length;
+        if (color)
+            *color = NULL;
+    }
+}
+
 /*
  * gui_line_get_align: get alignment for a line
  */
@@ -91,7 +201,7 @@ int
 gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
                     int with_suffix, int first_line)
 {
-    int length_time, length_buffer, length_suffix;
+    int length_time, length_buffer, length_suffix, prefix_length;
 
     /* return immediately if alignment for end of lines is "time" */
     if (!first_line
@@ -141,10 +251,11 @@ gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
         return length_time + length_buffer;
     }
 
+    gui_line_get_prefix_for_display (line, NULL, &prefix_length, NULL);
+
     if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_NONE)
     {
-        return length_time + length_buffer + line->data->prefix_length
-            + ((line->data->prefix_length > 0) ? 1 : 0);
+        return length_time + length_buffer + prefix_length + ((prefix_length > 0) ? 1 : 0);
     }
 
     length_suffix = 0;
@@ -381,6 +492,31 @@ gui_line_match_tags (struct t_gui_line *line, int tags_count,
     return 0;
 }
 
+/*
+ * gui_line_search_tag_starting_with: return pointer on tag starting with "tag",
+ *                                    NULL if such tag is not found
+ */
+
+const char *
+gui_line_search_tag_starting_with (struct t_gui_line *line, const char *tag)
+{
+    int i, length;
+
+    if (!line || !tag)
+        return NULL;
+
+    length = strlen (tag);
+
+    for (i = 0; i < line->data->tags_count; i++)
+    {
+        if (strncmp (line->data->tags_array[i], tag, length) == 0)
+            return line->data->tags_array[i];
+    }
+
+    /* tag not found */
+    return NULL;
+}
+
 /*
  * gui_line_get_nick_tag: get nick in tags: return "xxx" if tag "nick_xxx"
  *                        is found
@@ -389,14 +525,13 @@ gui_line_match_tags (struct t_gui_line *line, int tags_count,
 const char *
 gui_line_get_nick_tag (struct t_gui_line *line)
 {
-    int i;
+    const char *tag;
 
-    for (i = 0; i < line->data->tags_count; i++)
-    {
-        if (strncmp (line->data->tags_array[i], "nick_", 5) == 0)
-            return line->data->tags_array[i] + 5;
-    }
-    return NULL;
+    tag = gui_line_search_tag_starting_with (line, "nick_");
+    if (!tag)
+        return NULL;
+
+    return tag + 5;
 }
 
 /*
@@ -533,13 +668,15 @@ void
 gui_line_compute_prefix_max_length (struct t_gui_lines *lines)
 {
     struct t_gui_line *ptr_line;
+    int prefix_length;
 
     lines->prefix_max_length = CONFIG_INTEGER(config_look_prefix_align_min);
     for (ptr_line = lines->first_line; ptr_line;
          ptr_line = ptr_line->next_line)
     {
-        if (ptr_line->data->prefix_length > lines->prefix_max_length)
-            lines->prefix_max_length = ptr_line->data->prefix_length;
+        gui_line_get_prefix_for_display (ptr_line, NULL, &prefix_length, NULL);
+        if (prefix_length > lines->prefix_max_length)
+            lines->prefix_max_length = prefix_length;
     }
 }
 
@@ -551,6 +688,8 @@ void
 gui_line_add_to_list (struct t_gui_lines *lines,
                       struct t_gui_line *line)
 {
+    int prefix_length;
+
     if (!lines->first_line)
         lines->first_line = line;
     else
@@ -559,8 +698,10 @@ gui_line_add_to_list (struct t_gui_lines *lines,
     line->next_line = NULL;
     lines->last_line = line;
 
-    if (line->data->prefix_length > lines->prefix_max_length)
-        lines->prefix_max_length = line->data->prefix_length;
+    /* adjust "prefix_max_length" if this prefix length is > max */
+    gui_line_get_prefix_for_display (line, NULL, &prefix_length, NULL);
+    if (prefix_length > lines->prefix_max_length)
+        lines->prefix_max_length = prefix_length;
 
     lines->lines_count++;
 }
@@ -577,7 +718,7 @@ gui_line_remove_from_list (struct t_gui_buffer *buffer,
 {
     struct t_gui_window *ptr_win;
     struct t_gui_window_scroll *ptr_scroll;
-    int i, update_prefix_max_length;
+    int i, update_prefix_max_length, prefix_length;
 
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
@@ -603,8 +744,9 @@ gui_line_remove_from_list (struct t_gui_buffer *buffer,
         }
     }
 
+    gui_line_get_prefix_for_display (line, NULL, &prefix_length, NULL);
     update_prefix_max_length =
-        (line->data->prefix_length == lines->prefix_max_length);
+        (prefix_length == lines->prefix_max_length);
 
     /* move read marker if it was on line we are removing */
     if (lines->last_read_line == line)
@@ -861,8 +1003,8 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
 
     /* get notify level and max notify level for nick in buffer */
     notify_level = gui_line_get_notify_level (new_line);
-    nick = gui_line_get_nick_tag (new_line);
     max_notify_level = NULL;
+    nick = gui_line_get_nick_tag (new_line);
     if (nick)
         max_notify_level = hashtable_get (buffer->hotlist_max_level_nicks, nick);
     if (max_notify_level

src/gui/gui-line.h

@@ -67,6 +67,9 @@ struct t_gui_lines
 
 extern struct t_gui_lines *gui_lines_alloc ();
 extern void gui_lines_free (struct t_gui_lines *lines);
+extern void gui_line_get_prefix_for_display (struct t_gui_line *line,
+                                             char **prefix, int *length,
+                                             char **color);
 extern int gui_line_get_align (struct t_gui_buffer *buffer,
                                struct t_gui_line *line,
                                int with_suffix, int first_line);
@@ -82,11 +85,14 @@ extern int gui_line_match_regex (struct t_gui_line *line,
                                  regex_t *regex_message);
 extern int gui_line_match_tags (struct t_gui_line *line, int tags_count,
                                 char **tags_array);
+extern const char *gui_line_search_tag_starting_with (struct t_gui_line *line,
+                                                      const char *tag);
 extern const char *gui_line_get_nick_tag (struct t_gui_line *line);
 extern int gui_line_has_highlight (struct t_gui_line *line);
 extern void gui_line_compute_buffer_max_length (struct t_gui_buffer *buffer,
                                                 struct t_gui_lines *lines);
 extern void gui_line_compute_prefix_max_length (struct t_gui_lines *lines);
+extern void gui_line_set_prefix_same_nick (struct t_gui_line *line);
 extern void gui_line_mixed_free_buffer (struct t_gui_buffer *buffer);
 extern void gui_line_mixed_free_all (struct t_gui_buffer *buffer);
 extern void gui_line_free (struct t_gui_buffer *buffer,

src/gui/gui-window.c

@@ -58,8 +58,6 @@
 
 
 int gui_init_ok = 0;                            /* = 1 if GUI is initialized*/
-int gui_ok = 0;                                 /* = 1 if GUI is ok         */
-                                                /* (0 when size too small)  */
 int gui_window_refresh_needed = 0;              /* = 1 if refresh needed    */
                                                 /* = 2 for full refresh     */
 struct t_gui_window *gui_windows = NULL;        /* first window             */
@@ -963,7 +961,7 @@ gui_window_free (struct t_gui_window *window)
 void
 gui_window_switch_previous (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     gui_window_switch ((window->prev_window) ?
@@ -977,7 +975,7 @@ gui_window_switch_previous (struct t_gui_window *window)
 void
 gui_window_switch_next (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     gui_window_switch ((window->next_window) ?
@@ -993,7 +991,7 @@ gui_window_switch_by_number (int number)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     ptr_win = gui_window_search_by_number (number);
@@ -1010,7 +1008,7 @@ gui_window_switch_by_buffer (struct t_gui_window *window, int buffer_number)
 {
     struct t_gui_window *ptr_win;
 
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     ptr_win = (window->next_window) ? window->next_window : gui_windows;
@@ -1567,7 +1565,7 @@ gui_window_search_stop (struct t_gui_window *window)
 void
 gui_window_zoom (struct t_gui_window *window)
 {
-    if (!gui_ok)
+    if (!gui_init_ok)
         return;
 
     if (gui_window_layout_before_zoom)