diff options
61 files changed, 1142 insertions, 604 deletions
diff --git a/AUTHORS.adoc b/AUTHORS.adoc index e0cd04c30..e78260ee6 100644 --- a/AUTHORS.adoc +++ b/AUTHORS.adoc @@ -98,6 +98,7 @@ Alphabetically: * Sven Knurr (Cthulhux) * Tim D. Smith * Tim Harder +* Tobias Stoeckmann * Tom Alsberg * Tomoe Mami * Tor Hveem (xt) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index a4e92e04b..82ac32543 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -38,10 +38,13 @@ Improvements:: * irc: send multiple masks by message in commands /ban, /unban, /quiet and /unquiet, use ban mask default for nicks in /quiet and /unquiet, display an error if /quiet and /unquiet are not supported by server (issue #579, issue #15, issue #577) * irc: add option "-include" in commands /allchan, /allpv and /allserv (issue #572) * irc: don't smart filter modes given to you (issue #530, issue #897) + * script: remove option script.scripts.url_force_https, use HTTPS by default in option script.scripts.url Bug fixes:: + * core: fix command /cursor stop (do not toggle cursor mode) (issue #964) * core: fix delayed refresh when the signal SIGWINCH is received (terminal resized), send signal "signal_sigwinch" after refreshes (issue #902) + * irc: fix parsing of DCC filename * irc: fix double decoding of IRC colors in messages sent/displayed by commands /msg and /query (issue #943) * irc: fix parsing of message 324 (modes) when there is a colon before the modes (issue #913) * relay: check buffer pointer received in "sync" and "desync" commands (weechat protocol) (issue #936) @@ -52,6 +55,13 @@ Build:: * core: fix compilation on FreeBSD with autotools (issue #276) * ruby: add detection of Ruby 2.4 (issue #895) +[[v1.7.1]] +== Version 1.7.1 (2017-04-22) + +Bug fixes:: + + * irc: fix parsing of DCC filename + [[v1.7]] == Version 1.7 (2017-01-15) diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index e762e051c..b085bcca1 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -27,6 +27,11 @@ Aspell option with color for suggestion on a misspelled word has been renamed: * _aspell.color.suggestions_ has been renamed to _aspell.color.suggestion_ +[[v1.7.1]] +== Version 1.7.1 (2017-04-22) + +Bug fix and maintenance release. + [[v1.7]] == Version 1.7 (2017-01-15) diff --git a/doc/de/autogen/user/buflist_commands.adoc b/doc/de/autogen/user/buflist_commands.adoc index c9030a1cf..47622b722 100644 --- a/doc/de/autogen/user/buflist_commands.adoc +++ b/doc/de/autogen/user/buflist_commands.adoc @@ -8,29 +8,33 @@ ---- /buflist refresh -refresh: erzwingt eine Aktualisierung des "buflist" Bar-Item +refresh: force the refresh of the "buflist" bar item -Die einzelnen Zeilen mit Buffern die dargestellt werden mittels String-Evaluation (siehe /help eval für das Format), mittels folgenden Optionen: - - buflist.look.display_conditions: Bedingungen um einen Buffer in der Liste darzustellen - - buflist.format.buffer: Format für den Buffer, der nicht der aktuell dargestellte Buffer ist - - buflist.format.buffer_current: Format für den aktuell dargestellten Buffer +The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options: + - buflist.look.display_conditions: conditions to display a buffer in the list + - buflist.format.buffer: format for a buffer which is not current buffer + - buflist.format.buffer_current: format for the current buffer -Die folgenden Variablen können für obige Optionen genutzt werden: - - buffer data (siehe hdata "buffer" in API Dokumentation für eine vollständige Liste), zum Beispiel: +The following variables can be used in these options: + - buffer data (see hdata "buffer" in API doc for a complete list), for example: - ${buffer.number} - ${buffer.name} - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} - - zusätzliche Variablen die durch buflist bereitgestellt werden: - - ${format_buffer}: der evaluierte Wert der Option buflist.format.buffer; dies kann in der Option buflist.format.buffer_current genutzt werden um zum Beispiel die Hintergrundfarbe zu verändern - - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert für Option buflist.format.number) - - ${number}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt - - ${indent}: Einrückung für Name (Channel und private Buffer werden eingerückt) - - ${nick_prefix}: Nick-Präfix für einen Channel (wird nur genutzt falls die Option buflist.look.nick_prefix aktiviert ist) - - ${name}: der Kurzname (falls einer gesetzt ist), mit einem Rückgriff auf den Originalnamen - - ${color_hotlist}: die Farbe mit der höchsten Priorität für den entsprechenden Buffer (wird evaluiert mit Option buflist.format.hotlist_xxx wobei xxx der entsprechende Level ist) - - ${format_hotlist}: die formatierte Hotlist (wird evaluiert mit Option buflist.format.hotlist) - - ${hotlist}: die Hotlist in der Rohform - - ${format_lag}: die Verzögerung für einen IRC Server-Buffer, ist leer falls es keine Verzögerung gibt (wird evaluiert mit Option buflist.format.lag) + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) + - extra variables added by buflist for convenience: + - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example + - ${format_number}: indented number with separator (evaluation of option buflist.format.number) + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${name}: the short name (if set), with a fallback on the name + - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) + - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist) + - ${hotlist}: the raw hotlist + - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag) ---- diff --git a/doc/de/autogen/user/buflist_options.adoc b/doc/de/autogen/user/buflist_options.adoc index 0ed35362b..ec7d4d0a3 100644 --- a/doc/de/autogen/user/buflist_options.adoc +++ b/doc/de/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette -** Standardwert: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** Standardwert: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** Beschreibung: pass:none[Format für die Zeile mit dem ausgewählten Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette -** Standardwert: `+"${color:lightgreen,blue}${format_buffer}"+` +** Standardwert: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** Beschreibung: pass:none[Format der Hotlist (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] @@ -56,12 +56,24 @@ ** Werte: beliebige Zeichenkette ** Standardwert: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** Beschreibung: pass:none[Zeichenkette die beim Einrücken von Channel und privaten Buffern angezeigt wird (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette +** Standardwert: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** Beschreibung: pass:none[Format für die Anzeige der Verzögerungsanzeige für IRC Serverbuffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette ** Standardwert: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** Beschreibung: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)] +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette +** Standardwert: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** Beschreibung: pass:none[Format für die Darstellung der Buffernummer, hierbei ist die Variable ${number} die eingerückte Nummer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] ** Typ: Zeichenkette @@ -69,7 +81,7 @@ ** Standardwert: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** Beschreibung: pass:none[Bedingungen für die Darstellung eines Buffers (Hinweis: Inhalt wird evaluiert, siehe /help buflist)] +** Beschreibung: pass:none[Bedingungen wann ein Buffer dargestellt werden soll (Hinweis: Inhalt ist evaluiert, siehe /help buflist); Beispielsweise werden Server-Buffer versteckt, sofern sie mit dem Core-Buffer zusammengefügt worden sind: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette ** Standardwert: `+"${buffer.hidden}==0"+` diff --git a/doc/de/autogen/user/script_options.adoc b/doc/de/autogen/user/script_options.adoc index 303e64778..cdfd3efe9 100644 --- a/doc/de/autogen/user/script_options.adoc +++ b/doc/de/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** Standardwert: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** Beschreibung: pass:none[URL mit dem Dateinamen, welches die Liste der Skripten enthält; standardmäßig wird HTTPS genutzt, siehe Option script.scripts.url_force_https] +** Beschreibung: pass:none[URL für Datei mit der Auflistung aller Skripten] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette -** Standardwert: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** Beschreibung: pass:none[HTTPS wird für das Herunterladen der Indexdatei und der Skripten bevorzugt; diese Einstellung sollte nur deaktiviert werden falls Probleme beim Herunterladen auftreten] -** Typ: boolesch -** Werte: on, off -** Standardwert: `+on+` +** Standardwert: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/de/autogen/user/weechat_commands.adoc b/doc/de/autogen/user/weechat_commands.adoc index dea4dcb2d..21943eca3 100644 --- a/doc/de/autogen/user/weechat_commands.adoc +++ b/doc/de/autogen/user/weechat_commands.adoc @@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl 1. an evaluated sub-string (format: "eval:xxx") 2. a string with escaped chars (format: "esc:xxx" or "\xxx") 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") + 4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string") + or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string") + 5. a color (format: "color:xxx", see "Plugin API reference", function "color") 6. an info (format: "info:name,arguments", arguments are optional) 7. current date/time (format: "date" or "date:format") 8. an environment variable (format: "env:XXX") @@ -314,9 +314,8 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big diff --git a/doc/en/autogen/user/buflist_commands.adoc b/doc/en/autogen/user/buflist_commands.adoc index ca80e8765..abe134263 100644 --- a/doc/en/autogen/user/buflist_commands.adoc +++ b/doc/en/autogen/user/buflist_commands.adoc @@ -22,11 +22,15 @@ The following variables can be used in these options: - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) - extra variables added by buflist for convenience: - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example - ${format_number}: indented number with separator (evaluation of option buflist.format.number) - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers - - ${indent}: indentation for name (channel and private buffers are indented) + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${name}: the short name (if set), with a fallback on the name - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) diff --git a/doc/en/autogen/user/buflist_options.adoc b/doc/en/autogen/user/buflist_options.adoc index cb487694a..019d946f0 100644 --- a/doc/en/autogen/user/buflist_options.adoc +++ b/doc/en/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** description: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)] ** type: string ** values: any string -** default value: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** default value: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** description: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)] ** type: string ** values: any string -** default value: `+"${color:lightgreen,blue}${format_buffer}"+` +** default value: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** description: pass:none[format for hotlist (note: content is evaluated, see /help buflist)] @@ -56,12 +56,24 @@ ** values: any string ** default value: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** description: pass:none[string displayed to indent channel and private buffers (note: content is evaluated, see /help buflist)] +** type: string +** values: any string +** default value: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** description: pass:none[format for lag on an IRC server buffer (note: content is evaluated, see /help buflist)] ** type: string ** values: any string ** default value: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** description: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)] +** type: string +** values: any string +** default value: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** description: pass:none[format for buffer number, ${number} is the indented number (note: content is evaluated, see /help buflist)] ** type: string @@ -69,7 +81,7 @@ ** default value: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** description: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist)] +** description: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist); for example to hide server buffers if they are merged with core buffer: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** type: string ** values: any string ** default value: `+"${buffer.hidden}==0"+` diff --git a/doc/en/autogen/user/script_options.adoc b/doc/en/autogen/user/script_options.adoc index 122b9768f..ce23b0272 100644 --- a/doc/en/autogen/user/script_options.adoc +++ b/doc/en/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** default value: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** description: pass:none[URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https] +** description: pass:none[URL for file with list of scripts] ** type: string ** values: any string -** default value: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** description: pass:none[force use of HTTPS for downloads (index and scripts); you should disable this option only if you have problems with the downloads] -** type: boolean -** values: on, off -** default value: `+on+` +** default value: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc index 1ceded3cd..aaa5bc7e7 100644 --- a/doc/en/autogen/user/weechat_commands.adoc +++ b/doc/en/autogen/user/weechat_commands.adoc @@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl 1. an evaluated sub-string (format: "eval:xxx") 2. a string with escaped chars (format: "esc:xxx" or "\xxx") 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") + 4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string") + or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string") + 5. a color (format: "color:xxx", see "Plugin API reference", function "color") 6. an info (format: "info:name,arguments", arguments are optional) 7. current date/time (format: "date" or "date:format") 8. an environment variable (format: "env:XXX") @@ -314,9 +314,8 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big diff --git a/doc/en/weechat_plugin_api.en.adoc b/doc/en/weechat_plugin_api.en.adoc index 461655410..2d3091af6 100644 --- a/doc/en/weechat_plugin_api.en.adoc +++ b/doc/en/weechat_plugin_api.en.adoc @@ -2043,19 +2043,27 @@ expanded to last): `+********+` | `+${cut:max,suffix,string}+` + + `+${cut:+max,suffix,string}+` + (_WeeChat ≥ 1.8_) | - String with `max` chars, and optional `suffix` if string is cut. | + String with `max` chars, and optional `suffix` if string is cut. + + With the format `+max`, the suffix is counted in max length. | `+${cut:4,…,this is a test}+` + + `+${cut:+4,…,this is a test}+` + `+${cut:2,>>,こんにちは世界}+` | `+this…+` + + `+t…+` + `+こん>>+` | `+${cutscr:max,suffix,string}+` + + `+${cutscr:+max,suffix,string}+` + (_WeeChat ≥ 1.8_) | - String with `max` chars displayed on screen, and optional `suffix` if string is cut. | + String with `max` chars displayed on screen, and optional `suffix` if string is cut. + + With the format `+max`, the suffix is counted in max length. | `+${cutscr:4,…,this is a test}+` + + `+${cutscr:+4,…,this is a test}+` + `+${cutscr:2,>>,こんにちは世界}+` | `+this…+` + + `+thi…+` + `+こ>>+` | `+${re:N}+` + diff --git a/doc/fr/autogen/user/buflist_commands.adoc b/doc/fr/autogen/user/buflist_commands.adoc index eb8dbc0db..9efd8f98e 100644 --- a/doc/fr/autogen/user/buflist_commands.adoc +++ b/doc/fr/autogen/user/buflist_commands.adoc @@ -22,12 +22,16 @@ Les variables suivantes peuvent être utilisées dans ces options : - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} + - irc_server: données du serveur IRC, défini seulement sur un tampon IRC (voir le hdata "irc_server" dans la doc API) + - irc_channel: données du canal IRC, défini seulement sur un tampon de canal IRC (voir le hdata "irc_channel" dans la doc API) - variables additionnelles ajoutées par buflist pour des raisons pratiques : - ${format_buffer} : la valeur évaluée de l'option buflist.format.buffer ; peut être utilisée dans l'option buflist.format.buffer_current pour juste changer la couleur de fond par exemple - ${format_number} : numéro indenté avec un séparateur (évaluation de l'option buflist.format.number) - ${number} : numéro indenté, par exemple " 1" s'il y a entre 10 et 99 tampons - - ${indent} : indentation pour le nom (les tampons de canaux ou privés sont indentés) - - ${nick_prefix} : le préfixe du pseudo pour un cancl (défini seulement si l'option buflist.look.nick_prefix est activée) + - ${indent} : indentation pour le nom (les tampons de canaux ou privés sont indentés) (évaluation de l'option buflist.format.indent) + - ${format_nick_prefix} : le préfixe du pseudo en couleur pour un canal (évaluation de l'option buflist.format.nick_prefix) + - ${color_nick_prefix} : la couleur du préfixe du pseudo pour un canal (défini seulement si l'option buflist.look.nick_prefix est activée) + - ${nick_prefix} : le préfixe du pseudo pour un canal (défini seulement si l'option buflist.look.nick_prefix est activée) - ${name} : le nom court (si défini), sinon le nom - ${color_hotlist} : la couleur qui dépend du niveau de hotlist le plus élevé pour le tampon (évaluation de l'option buflist.format.hotlist_xxx où xxx est le niveau) - ${format_hotlist} : la hotlist formatée (évaluation de l'option buflist.format.hotlist) diff --git a/doc/fr/autogen/user/buflist_options.adoc b/doc/fr/autogen/user/buflist_options.adoc index 360795c23..8dcd96dbc 100644 --- a/doc/fr/autogen/user/buflist_options.adoc +++ b/doc/fr/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** description: pass:none[format pour chaque ligne avec un tampon (note : le contenu est évalué, voir /help buflist)] ** type: chaîne ** valeurs: toute chaîne -** valeur par défaut: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** valeur par défaut: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** description: pass:none[format pour la ligne avec le tampon courant (note : le contenu est évalué, voir /help buflist)] ** type: chaîne ** valeurs: toute chaîne -** valeur par défaut: `+"${color:lightgreen,blue}${format_buffer}"+` +** valeur par défaut: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** description: pass:none[format pour la hotlist (note : le contenu est évalué, voir /help buflist)] @@ -56,12 +56,24 @@ ** valeurs: toute chaîne ** valeur par défaut: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** description: pass:none[chaîne affichée pour indenter un tampon de canal ou privé (note : le contenu est évalué, voir /help buflist)] +** type: chaîne +** valeurs: toute chaîne +** valeur par défaut: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** description: pass:none[format pour le lag sur un tampon de serveur IRC (note : le contenu est évalué, voir /help buflist)] ** type: chaîne ** valeurs: toute chaîne ** valeur par défaut: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** description: pass:none[format pour un préfixe de pseudo sur un canal (note : le contenu est évalué, voir /help buflist)] +** type: chaîne +** valeurs: toute chaîne +** valeur par défaut: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** description: pass:none[format pour un numéro de tampon, ${number} est le numéro indenté (note : le contenu est évalué, voir /help buflist)] ** type: chaîne @@ -69,7 +81,7 @@ ** valeur par défaut: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** description: pass:none[conditions pour afficher un tampon (note : le contenu est évalué, voir /help buflist)] +** description: pass:none[conditions pour afficher un tampon (note : le contenu est évalué, voir /help buflist) ; par exemple pour cacher les tampons de serveurs s'ils sont fusionnés avec le tampon "core" : "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** type: chaîne ** valeurs: toute chaîne ** valeur par défaut: `+"${buffer.hidden}==0"+` diff --git a/doc/fr/autogen/user/script_options.adoc b/doc/fr/autogen/user/script_options.adoc index 84f0df7b1..19658c412 100644 --- a/doc/fr/autogen/user/script_options.adoc +++ b/doc/fr/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** valeur par défaut: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** description: pass:none[URL pour le fichier avec la liste des scripts ; par défaut HTTPS est forcé, voir l'option script.scripts.url_force_https] +** description: pass:none[URL pour le fichier avec la liste des scripts] ** type: chaîne ** valeurs: toute chaîne -** valeur par défaut: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** description: pass:none[forcer l'utilisation de HTTPS pour les téléchargements (index et scripts) ; vous ne devriez désactiver cette option que si vous avez des problèmes avec les téléchargements] -** type: booléen -** valeurs: on, off -** valeur par défaut: `+on+` +** valeur par défaut: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/fr/autogen/user/weechat_commands.adoc b/doc/fr/autogen/user/weechat_commands.adoc index d51d353cf..ddc286543 100644 --- a/doc/fr/autogen/user/weechat_commands.adoc +++ b/doc/fr/autogen/user/weechat_commands.adoc @@ -257,54 +257,54 @@ infolists : afficher des infos sur les infolists /eval [-n|-s] <expression> [-n] -c <expression1> <opérateur> <expression2> - -n: display result without sending it to buffer (debug mode) - -s: split expression before evaluating it (many commands can be separated by semicolons) - -c: evaluate as condition: use operators and parentheses, return a boolean value ("0" or "1") -expression: expression to evaluate, variables with format ${variable} are replaced (see below); many commands can be separated by semicolons - operator: a logical or comparison operator: - - logical operators: - && boolean "and" - || boolean "or" - - comparison operators: - == equal - != not equal - <= less or equal - < less - >= greater or equal - > greater - =~ is matching POSIX extended regex - !~ is NOT matching POSIX extended regex - -An expression is considered as "true" if it is not NULL, not empty, and different from "0". -The comparison is made using integers if the two expressions are valid integers. -To force a string comparison, add double quotes around each expression, for example: + -n : afficher le résultat sans envoyer au tampon (mode debug) + -s : découper l'expression avant de l'évaluer (plusieurs commandes peuvent être séparées par des points-virgules) + -c : évaluer comme une condition : utiliser les opérateurs et les parenthèses, retourner une valeur booléenne ("0" ou "1") +expression : expression à évaluer, les variables avec le format ${variable} sont remplacées (voir ci-dessous) ; plusieurs commandes peuvent être séparées par des points-virgules + opérateur : un opérateur logique ou de comparaison : + - opérateurs logiques : + && "et" booléen + || "ou" booléen + - opérateurs de comparaison : + == égal + != non égal + <= inférieur ou égal + < inférieur + >= supérieur ou égal + > supérieur + =~ correspond à l'expression régulière POSIX étendue + !~ ne correspond PAS à l'expression régulière POSIX étendue + +Une expression est considérée comme "vraie" si elle est non NULL, non vide, et différente de "0". +La comparaison est faite en utilisant des entiers si les deux expressions sont des entiers valides. +Pour forcer une comparaison de chaînes, ajoutez des guillemets autour de chaque expression, par exemple : 50 > 100 ==> 0 "50" > "100" ==> 1 -Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority: - 1. an evaluated sub-string (format: "eval:xxx") - 2. a string with escaped chars (format: "esc:xxx" or "\xxx") - 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") - 6. an info (format: "info:name,arguments", arguments are optional) - 7. current date/time (format: "date" or "date:format") - 8. an environment variable (format: "env:XXX") - 9. a ternary operator (format: "if:condition?value_if_true:value_if_false") - 10. an option (format: "file.section.option") - 11. a local variable in buffer - 12. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer. -Format for hdata can be one of following: - hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed) - hdata[list].var1.var2...: start with a hdata using a list, for example: - ${buffer[gui_buffers].full_name}: full name of first buffer in linked list of buffers - ${plugin[weechat_plugins].name}: name of first plugin in linked list of plugins - hdata[pointer].var1.var2...: start with a hdata using a pointer, for example: - ${buffer[0x1234abcd].full_name}: full name of the buffer with this pointer (can be used in triggers) -For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get". - -Examples (simple strings): +Des variables sont remplacées dans l'expression, en utilisant le format ${variable}, la variable pouvant être, par ordre de priorité : + 1. une sous-chaîne évaluée (format : "eval:xxx") + 2. une chaîne avec les caractères échappés (format : "esc:xxx" ou "\xxx") + 3. une chaîne avec des caractères à cacher (format : "hide:caractère,chaîne") + 4. une chaîne avec un maximum de caractères (format : "cut:max,suffixe,chaîne" ou "cut:+max,suffixe,chaîne") + ou un maximum de caractères affichés à l'écran (format : "cutscr:max,suffixe,chaîne" ou "cutscr:+max,suffixe,chaîne") + 5. une couleur (format : "color:xxx", voir la "Référence API extension", fonction "color") + 6. une info (format : "info:nom,paramètres", les paramètres sont optionnels) + 7. la date/heure courante (format : "date" ou "date:format") + 8. une variable d'environnement (format : "env:XXX") + 9. un opérateur ternaire (format : "if:condition?valeur_si_vrai:valeur_si_faux") + 10. une option (format : "fichier.section.option") + 11. une variable locale du tampon + 12. un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants. +Le format du hdata peut être le suivant : + hdata.var1.var2... : démarrer avec un hdata (le pointeur doit être connu), et demander les variables l'une après l'autre (d'autres hdata peuvent être suivis) + hdata[liste].var1.var2... : démarrer avec un hdata en utilisant une liste, par exemple : + ${buffer[gui_buffers].full_name} : nom complet du premier tampon dans la liste chaînée des tampons + ${plugin[weechat_plugins].name} : nom de la première extension dans la liste chaînée des extensions + hdata[pointeur].var1.var2... : démarrer avec un hdata en utilisant un pointeur, par exemple : + ${buffer[0x1234abcd].full_name} : nom complet du tampon avec ce pointeur (peut être utilisé dans les triggers) +Pour le nom du hdata et des variables, voir la "Référence API extension", fonction "weechat_hdata_get". + +Exemples (chaînes simples) : /eval -n ${info:version} ==> 0.4.3 /eval -n ${env:HOME} ==> /home/user /eval -n ${weechat.look.scroll_amount} ==> 3 @@ -314,13 +314,12 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big -Examples (conditions): +Exemples (conditions) : /eval -n -c ${window.buffer.number} > 2 ==> 0 /eval -n -c ${window.win_width} > 100 ==> 1 /eval -n -c (8 > 12) || (5 > 2) ==> 1 diff --git a/doc/fr/weechat_plugin_api.fr.adoc b/doc/fr/weechat_plugin_api.fr.adoc index 35586656f..6b1c94e25 100644 --- a/doc/fr/weechat_plugin_api.fr.adoc +++ b/doc/fr/weechat_plugin_api.fr.adoc @@ -2086,19 +2086,27 @@ première étendue à la dernière) : `+************+` | `+${cut:max,suffixe,chaîne}+` + + `+${cut:+max,suffixe,chaîne}+` + (_WeeChat ≥ 1.8_) | - Chaîne avec `max` caractères, et un `suffixe` facultatif si la chaîne est coupée. | + Chaîne avec `max` caractères, et un `suffixe` facultatif si la chaîne est coupée. + + Avec le format `+max`, le suffixe est compté dans la longueur maximale. | `+${cut:4,…,ceci est un test}+` + + `+${cut:+4,…,ceci est un test}+` + `+${cut:2,>>,こんにちは世界}+` | `+ceci…+` + + `+c…+` + `+こん>>+` | `+${cutscr:max,suffixe,chaîne}+` + + `+${cutscr:+max,suffixe,chaîne}+` + (_WeeChat ≥ 1.8_) | - Chaîne avec `max` caractères affichés à l'écran, et un `suffixe` facultatif si la chaîne est coupée. | + Chaîne avec `max` caractères affichés à l'écran, et un `suffixe` facultatif si la chaîne est coupée. + + Avec le format `+max`, le suffixe est compté dans la longueur maximale. | `+${cutscr:4,…,ceci est un test}+` + + `+${cutscr:+4,…,ceci est un test}+` + `+${cutscr:2,>>,こんにちは世界}+` | `+ceci…+` + + `+cec…+` + `+こ>>+` | `+${re:N}+` + diff --git a/doc/it/autogen/user/buflist_commands.adoc b/doc/it/autogen/user/buflist_commands.adoc index ca80e8765..abe134263 100644 --- a/doc/it/autogen/user/buflist_commands.adoc +++ b/doc/it/autogen/user/buflist_commands.adoc @@ -22,11 +22,15 @@ The following variables can be used in these options: - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) - extra variables added by buflist for convenience: - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example - ${format_number}: indented number with separator (evaluation of option buflist.format.number) - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers - - ${indent}: indentation for name (channel and private buffers are indented) + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${name}: the short name (if set), with a fallback on the name - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) diff --git a/doc/it/autogen/user/buflist_options.adoc b/doc/it/autogen/user/buflist_options.adoc index 30db597ec..2fcce8b17 100644 --- a/doc/it/autogen/user/buflist_options.adoc +++ b/doc/it/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** descrizione: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)] ** tipo: stringa ** valori: qualsiasi stringa -** valore predefinito: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** valore predefinito: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** descrizione: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)] ** tipo: stringa ** valori: qualsiasi stringa -** valore predefinito: `+"${color:lightgreen,blue}${format_buffer}"+` +** valore predefinito: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** descrizione: pass:none[format for hotlist (note: content is evaluated, see /help buflist)] @@ -56,12 +56,24 @@ ** valori: qualsiasi stringa ** valore predefinito: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** descrizione: pass:none[string displayed to indent channel and private buffers (note: content is evaluated, see /help buflist)] +** tipo: stringa +** valori: qualsiasi stringa +** valore predefinito: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** descrizione: pass:none[format for lag on an IRC server buffer (note: content is evaluated, see /help buflist)] ** tipo: stringa ** valori: qualsiasi stringa ** valore predefinito: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** descrizione: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)] +** tipo: stringa +** valori: qualsiasi stringa +** valore predefinito: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** descrizione: pass:none[format for buffer number, ${number} is the indented number (note: content is evaluated, see /help buflist)] ** tipo: stringa @@ -69,7 +81,7 @@ ** valore predefinito: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** descrizione: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist)] +** descrizione: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist); for example to hide server buffers if they are merged with core buffer: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** tipo: stringa ** valori: qualsiasi stringa ** valore predefinito: `+"${buffer.hidden}==0"+` diff --git a/doc/it/autogen/user/script_options.adoc b/doc/it/autogen/user/script_options.adoc index 01860fe15..fb2a484cc 100644 --- a/doc/it/autogen/user/script_options.adoc +++ b/doc/it/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** valore predefinito: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** descrizione: pass:none[URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https] +** descrizione: pass:none[URL for file with list of scripts] ** tipo: stringa ** valori: qualsiasi stringa -** valore predefinito: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** descrizione: pass:none[force use of HTTPS for downloads (index and scripts); you should disable this option only if you have problems with the downloads] -** tipo: bool -** valori: on, off -** valore predefinito: `+on+` +** valore predefinito: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/it/autogen/user/weechat_commands.adoc b/doc/it/autogen/user/weechat_commands.adoc index 1c1915e83..fdffcf0ce 100644 --- a/doc/it/autogen/user/weechat_commands.adoc +++ b/doc/it/autogen/user/weechat_commands.adoc @@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl 1. an evaluated sub-string (format: "eval:xxx") 2. a string with escaped chars (format: "esc:xxx" or "\xxx") 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") + 4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string") + or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string") + 5. a color (format: "color:xxx", see "Plugin API reference", function "color") 6. an info (format: "info:name,arguments", arguments are optional) 7. current date/time (format: "date" or "date:format") 8. an environment variable (format: "env:XXX") @@ -314,9 +314,8 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big diff --git a/doc/it/weechat_plugin_api.it.adoc b/doc/it/weechat_plugin_api.it.adoc index a0a5bbc88..647a392e4 100644 --- a/doc/it/weechat_plugin_api.it.adoc +++ b/doc/it/weechat_plugin_api.it.adoc @@ -2121,19 +2121,27 @@ expanded to last): `+********+` | `+${cut:max,suffix,string}+` + + `+${cut:+max,suffix,string}+` + (_WeeChat ≥ 1.8_) | - String with `max` chars, and optional `suffix` if string is cut. | + String with `max` chars, and optional `suffix` if string is cut. + + With the format `+max`, the suffix is counted in max length. | `+${cut:4,…,this is a test}+` + + `+${cut:+4,…,this is a test}+` + `+${cut:2,>>,こんにちは世界}+` | `+this…+` + + `+t…+` + `+こん>>+` | `+${cutscr:max,suffix,string}+` + + `+${cutscr:+max,suffix,string}+` + (_WeeChat ≥ 1.8_) | - String with `max` chars displayed on screen, and optional `suffix` if string is cut. | + String with `max` chars displayed on screen, and optional `suffix` if string is cut. + + With the format `+max`, the suffix is counted in max length. | `+${cutscr:4,…,this is a test}+` + + `+${cutscr:+4,…,this is a test}+` + `+${cutscr:2,>>,こんにちは世界}+` | `+this…+` + + `+thi…+` + `+こ>>+` | `+${re:N}+` + diff --git a/doc/ja/autogen/user/buflist_commands.adoc b/doc/ja/autogen/user/buflist_commands.adoc index 08d133408..02887ccd5 100644 --- a/doc/ja/autogen/user/buflist_commands.adoc +++ b/doc/ja/autogen/user/buflist_commands.adoc @@ -8,29 +8,33 @@ ---- /buflist refresh -refresh: 強制的に "buflist" バー要素の内容を最新の状態に更新します +refresh: force the refresh of the "buflist" bar item -各バッファエントリは文字列評価 (書式は /help eval を参照してください) を使って表示されます、以下のオプションで指定します: - - buflist.look.display_conditions: バッファをリスト内に表示する条件 - - buflist.format.buffer: 現在のバッファ以外のバッファを表示する書式 - - buflist.format.buffer_current: 現在のバッファを表示する書式 +The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options: + - buflist.look.display_conditions: conditions to display a buffer in the list + - buflist.format.buffer: format for a buffer which is not current buffer + - buflist.format.buffer_current: format for the current buffer -以下は上記オプションで使用可能な変数です: - - バッファデータ (完全なリストは API リファレンスの hdata "buffer" を参照してください)、例: +The following variables can be used in these options: + - buffer data (see hdata "buffer" in API doc for a complete list), for example: - ${buffer.number} - ${buffer.name} - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} - - buflist プラグインが利便性向上の目的で追加した変数: - - ${format_buffer}: buflist.format.buffer オプションの評価結果; 例えば単に背景色を変えるなどの目的で、この変数を buflist.format.buffer_current オプションの中で使うことも可能です。 - - ${format_number}: 区切り文字を付けたインデント済み番号 (buflist.format.number オプションの評価結果) - - ${number}: インデント済み番号、例えば 10 から 99 番のバッファがある場合に " 1" - - ${indent}: 名前用のインデント (チャンネルとプライベートバッファがインデントされます) - - ${nick_prefix}: チャンネルにおけるニックネームプレフィックス (buflist.look.nick_prefix オプションが有効化された場合のみ設定されます) - - ${name}: 短縮名 (設定済みの場合)、未設定の場合には名前 - - ${color_hotlist}: 対象バッファのホットリストレベルの最大値に対応する色 (buflist.format.hotlist_xxx オプションの評価結果、xxx がレベル) - - ${format_hotlist}: 評価後のホットリスト (buflist.format.hotlist オプションの評価結果) - - ${hotlist}: 評価前のホットリスト - - ${format_lag}: IRC サーババッファの遅延時間、遅延がない場合は空 (buflist.format.lag オプションの評価結果) + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) + - extra variables added by buflist for convenience: + - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example + - ${format_number}: indented number with separator (evaluation of option buflist.format.number) + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${name}: the short name (if set), with a fallback on the name + - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) + - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist) + - ${hotlist}: the raw hotlist + - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag) ---- diff --git a/doc/ja/autogen/user/buflist_options.adoc b/doc/ja/autogen/user/buflist_options.adoc index 1958352a9..ba3c4202d 100644 --- a/doc/ja/autogen/user/buflist_options.adoc +++ b/doc/ja/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** 説明: pass:none[各バッファの表示書式 (注意: 値は評価されます、/help eval を参照してください)] ** タイプ: 文字列 ** 値: 未制約文字列 -** デフォルト値: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** デフォルト値: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** 説明: pass:none[現在のバッファの表示書式 (注意: 値は評価されます、/help eval を参照してください)] ** タイプ: 文字列 ** 値: 未制約文字列 -** デフォルト値: `+"${color:lightgreen,blue}${format_buffer}"+` +** デフォルト値: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** 説明: pass:none[ホットリストの表示書式 (注意: 値は評価されます、/help eval を参照してください)] @@ -56,12 +56,24 @@ ** 値: 未制約文字列 ** デフォルト値: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** 説明: pass:none[string displayed to indent channel and private buffers (note: content is evaluated, see /help buflist)] +** タイプ: 文字列 +** 値: 未制約文字列 +** デフォルト値: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** 説明: pass:none[IRC サーババッファの遅延時間の表示書式 (注意: 値は評価されます、/help eval を参照してください)] ** タイプ: 文字列 ** 値: 未制約文字列 ** デフォルト値: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** 説明: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)] +** タイプ: 文字列 +** 値: 未制約文字列 +** デフォルト値: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** 説明: pass:none[バッファ番号の表示書式、${number} はインデント済み番号です (注意: 値は評価されます、/help eval を参照してください)] ** タイプ: 文字列 @@ -69,7 +81,7 @@ ** デフォルト値: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** 説明: pass:none[バッファの表示条件 (注意: 値は評価されます、/help eval を参照してください)] +** 説明: pass:none[バッファの表示条件 (注意: 値は評価されます、/help eval を参照してください); サーババッファがコアバッファにマージされている場合にサーババッファを隠す例: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** タイプ: 文字列 ** 値: 未制約文字列 ** デフォルト値: `+"${buffer.hidden}==0"+` diff --git a/doc/ja/autogen/user/script_options.adoc b/doc/ja/autogen/user/script_options.adoc index ec6482313..744c69906 100644 --- a/doc/ja/autogen/user/script_options.adoc +++ b/doc/ja/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** デフォルト値: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** 説明: pass:none[スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使用、オプション script.scripts.url_force_https を参照] +** 説明: pass:none[URL for file with list of scripts] ** タイプ: 文字列 ** 値: 未制約文字列 -** デフォルト値: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** 説明: pass:none[ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制する; ダウンロードに問題がある場合のみこのオプションを無効化してください] -** タイプ: ブール -** 値: on, off -** デフォルト値: `+on+` +** デフォルト値: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/ja/autogen/user/weechat_commands.adoc b/doc/ja/autogen/user/weechat_commands.adoc index 52a32e616..08e1580b2 100644 --- a/doc/ja/autogen/user/weechat_commands.adoc +++ b/doc/ja/autogen/user/weechat_commands.adoc @@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl 1. an evaluated sub-string (format: "eval:xxx") 2. a string with escaped chars (format: "esc:xxx" or "\xxx") 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") + 4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string") + or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string") + 5. a color (format: "color:xxx", see "Plugin API reference", function "color") 6. an info (format: "info:name,arguments", arguments are optional) 7. current date/time (format: "date" or "date:format") 8. an environment variable (format: "env:XXX") @@ -314,9 +314,8 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big diff --git a/doc/ja/weechat_plugin_api.ja.adoc b/doc/ja/weechat_plugin_api.ja.adoc index 13382461f..62a648055 100644 --- a/doc/ja/weechat_plugin_api.ja.adoc +++ b/doc/ja/weechat_plugin_api.ja.adoc @@ -2048,20 +2048,30 @@ char *weechat_string_eval_expression (const char *expr, `+${hide:*,password}+` | `+********+` +// TRANSLATION MISSING | `+${cut:max,suffix,string}+` + + `+${cut:+max,suffix,string}+` + (_WeeChat バージョン 1.8 以上で利用可_) | - `string` の先頭 `max` 文字とオプションの `suffix` 文字 (`string` の文字数が `max` 文字を超える場合) | + `string` の先頭 `max` 文字とオプションの `suffix` 文字 (`string` の文字数が `max` 文字を超える場合) + + With the format `+max`, the suffix is counted in max length. | `+${cut:4,…,this is a test}+` + + `+${cut:+4,…,this is a test}+` + `+${cut:2,>>,こんにちは世界}+` | `+this…+` + + `+t…+` + `+こん>>+` +// TRANSLATION MISSING | `+${cutscr:max,suffix,string}+` + + `+${cutscr:+max,suffix,string}+` + (_WeeChat バージョン 1.8 以上で利用可_) | - `string` の先頭 `max` 文字 (半角文字幅換算) とオプションの `suffix` 文字 (`string` の文字数が `max` 文字を超える場合) | + `string` の先頭 `max` 文字 (半角文字幅換算) とオプションの `suffix` 文字 (`string` の文字数が `max` 文字を超える場合) + + With the format `+max`, the suffix is counted in max length. | `+${cutscr:4,…,this is a test}+` + + `+${cutscr:+4,…,this is a test}+` + `+${cutscr:2,>>,こんにちは世界}+` | `+this…+` + + `+thi…+` + `+こ>>+` | `+${re:N}+` + diff --git a/doc/pl/autogen/user/buflist_commands.adoc b/doc/pl/autogen/user/buflist_commands.adoc index ca80e8765..abe134263 100644 --- a/doc/pl/autogen/user/buflist_commands.adoc +++ b/doc/pl/autogen/user/buflist_commands.adoc @@ -22,11 +22,15 @@ The following variables can be used in these options: - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) - extra variables added by buflist for convenience: - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example - ${format_number}: indented number with separator (evaluation of option buflist.format.number) - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers - - ${indent}: indentation for name (channel and private buffers are indented) + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) - ${name}: the short name (if set), with a fallback on the name - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) diff --git a/doc/pl/autogen/user/buflist_options.adoc b/doc/pl/autogen/user/buflist_options.adoc index 37d619348..11cdb5377 100644 --- a/doc/pl/autogen/user/buflist_options.adoc +++ b/doc/pl/autogen/user/buflist_options.adoc @@ -6,13 +6,13 @@ ** opis: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)] ** typ: ciąg ** wartości: dowolny ciąg -** domyślna wartość: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+` +** domyślna wartość: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+` * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current* ** opis: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)] ** typ: ciąg ** wartości: dowolny ciąg -** domyślna wartość: `+"${color:lightgreen,blue}${format_buffer}"+` +** domyślna wartość: `+"${color:,blue}${format_buffer}"+` * [[option_buflist.format.hotlist]] *buflist.format.hotlist* ** opis: pass:none[format for hotlist (note: content is evaluated, see /help buflist)] @@ -56,12 +56,24 @@ ** wartości: dowolny ciąg ** domyślna wartość: `+"${color:default},"+` +* [[option_buflist.format.indent]] *buflist.format.indent* +** opis: pass:none[string displayed to indent channel and private buffers (note: content is evaluated, see /help buflist)] +** typ: ciąg +** wartości: dowolny ciąg +** domyślna wartość: `+" "+` + * [[option_buflist.format.lag]] *buflist.format.lag* ** opis: pass:none[format for lag on an IRC server buffer (note: content is evaluated, see /help buflist)] ** typ: ciąg ** wartości: dowolny ciąg ** domyślna wartość: `+" ${color:green}[${color:brown}${lag}${color:green}]"+` +* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix* +** opis: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)] +** typ: ciąg +** wartości: dowolny ciąg +** domyślna wartość: `+"${color_nick_prefix}${nick_prefix}"+` + * [[option_buflist.format.number]] *buflist.format.number* ** opis: pass:none[format for buffer number, ${number} is the indented number (note: content is evaluated, see /help buflist)] ** typ: ciąg @@ -69,7 +81,7 @@ ** domyślna wartość: `+"${color:green}${number}${if:${number_displayed}?.: }"+` * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions* -** opis: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist)] +** opis: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist); for example to hide server buffers if they are merged with core buffer: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"] ** typ: ciąg ** wartości: dowolny ciąg ** domyślna wartość: `+"${buffer.hidden}==0"+` diff --git a/doc/pl/autogen/user/script_options.adoc b/doc/pl/autogen/user/script_options.adoc index bb85e1089..5e732e262 100644 --- a/doc/pl/autogen/user/script_options.adoc +++ b/doc/pl/autogen/user/script_options.adoc @@ -237,13 +237,7 @@ ** domyślna wartość: `+"%h/script"+` * [[option_script.scripts.url]] *script.scripts.url* -** opis: pass:none[adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, zobacz opcje script.scripts.url_force_https] +** opis: pass:none[URL for file with list of scripts] ** typ: ciąg ** wartości: dowolny ciąg -** domyślna wartość: `+"http://weechat.org/files/plugins.xml.gz"+` - -* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https* -** opis: pass:none[wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś wyłączyć tą opcję tylko jeśli występują problemy z pobieraniem] -** typ: bool -** wartości: on, off -** domyślna wartość: `+on+` +** domyślna wartość: `+"https://weechat.org/files/plugins.xml.gz"+` diff --git a/doc/pl/autogen/user/weechat_commands.adoc b/doc/pl/autogen/user/weechat_commands.adoc index 7e12c1d30..fa6395d45 100644 --- a/doc/pl/autogen/user/weechat_commands.adoc +++ b/doc/pl/autogen/user/weechat_commands.adoc @@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl 1. an evaluated sub-string (format: "eval:xxx") 2. a string with escaped chars (format: "esc:xxx" or "\xxx") 3. a string with chars to hide (format: "hide:char,string") - 4. a string with max chars (format: "cut:max,suffix,string") - or max chars displayed on screen (format: "cutscr:max,suffix,string") - 5. a color (format: "color:xxx") + 4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string") + or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string") + 5. a color (format: "color:xxx", see "Plugin API reference", function "color") 6. an info (format: "info:name,arguments", arguments are optional) 7. current date/time (format: "date" or "date:format") 8. an environment variable (format: "env:XXX") @@ -314,9 +314,8 @@ Examples (simple strings): /eval -n ${window.buffer.number} ==> 1 /eval -n ${\t} ==> <tab> /eval -n ${hide:-,${relay.network.password}} ==> -------- - /eval -n ${cut:2,+,test} ==> te+ - /eval -n ${cut:2,+,こんにちは世界} ==> こん+ - /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+ + /eval -n ${cut:3,+,test} ==> tes+ + /eval -n ${cut:+3,+,test} ==> te+ /eval -n ${date:%H:%M:%S} ==> 07:46:40 /eval -n ${if:${info:term_width}>80?big:small} ==> big @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 21:59+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1471,10 +1471,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1510,9 +1512,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -4920,6 +4921,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -4929,7 +4934,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -4947,11 +4956,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " napojené signály:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" -msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" +msgstr "" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5042,12 +5052,24 @@ msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" @@ -10724,15 +10746,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s: stahuji seznam skriptů..." #, fuzzy msgid "script name with extension (wildcard \"*\" is allowed) (optional)" @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License # along with WeeChat. If not, see <http://www.gnu.org/licenses/>. # nils <weechatter@arcor.de>, 2016. -# w8rabbit <w8rabbit@mail.i2p>, 2016. +# w8rabbit <w8rabbit@mail.i2p>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" -"PO-Revision-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" +"PO-Revision-Date: 2017-04-24 22:21+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" "Language: de\n" @@ -28,7 +28,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 2.0.1\n" "X-Poedit-Bookmarks: -1,-1,180,-1,-1,-1,-1,-1,-1,-1\n" "X-Poedit-SourceCharset: utf-8\n" @@ -1537,6 +1537,7 @@ msgstr "evaluierter Ausdruck" msgid "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>" msgstr "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>" +#, fuzzy msgid "" " -n: display result without sending it to buffer (debug mode)\n" " -s: split expression before evaluating it (many commands can be " @@ -1573,10 +1574,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1612,9 +1615,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -1671,11 +1673,13 @@ msgstr "" "Max,Suffix,Zeichenkette\")\n" " oder maximale Anzahl an Zeichen die auf dem Bildschirm angezeigt werden " "sollen (Format: \"cutscr:max,Suffix,Zeichenkette\")\n" -" 5. eine Farbe (Format: color:xxx)\n" +" 5. eine Farbe (Format: \"color:xxx\", siehe \"Anleitung für API Erweiterung" +"\", Funktion \"color\")\\n\n" " 6. eine Info (Format: \"info:name,arguments\", Argumente sind optional)\n" " 7. aktuelles Datum/Uhrzeit (Format: \"date\" oder \"date:format\")\n" " 8. eine Umgebungsvariable (Format: \"env:XXX\")\n" -" 9. der Name einer Programmoption (Format: file.section.option)\n" +" 9. ein Dreifachoperand (Format: \"if:Bedingung?Wert_falls_wahr:" +"Wert_falls_unwahr\")\n" " 10. eine Option (Format: \"file.section.option\")\n" " 11. der Name einer lokalen Variablen eines Buffer\n" " 12. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette " @@ -1708,8 +1712,6 @@ msgstr "" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" " /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5783,6 +5785,7 @@ msgstr "Liste von Buffern" msgid "bar item with list of buffers" msgstr "Bar-Item mit der Liste von Buffern" +#, fuzzy msgid "" "refresh: force the refresh of the \"buflist\" bar item\n" "\n" @@ -5801,6 +5804,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5810,7 +5817,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5825,8 +5836,9 @@ msgid "" msgstr "" "refresh: erzwingt eine Aktualisierung des \"buflist\" Bar-Item\n" "\n" -"Die einzelnen Zeilen mit Buffern die dargestellt werden mittels String-" -"Evaluation (siehe /help eval für das Format), mittels folgenden Optionen:\n" +"Jede Zeile die einen Buffer anzeigt wird mittels Zeichenketten-Evaluation " +"dargestellt (siehe /help eval für das Format), dazu werden folgende Optionen " +"genutzt:\n" " - buflist.look.display_conditions: Bedingungen um einen Buffer in der " "Liste darzustellen\n" " - buflist.format.buffer: Format für den Buffer, der nicht der aktuell " @@ -5834,7 +5846,7 @@ msgstr "" " - buflist.format.buffer_current: Format für den aktuell dargestellten " "Buffer\n" "\n" -"Die folgenden Variablen können für obige Optionen genutzt werden:\n" +"Die folgenden Variablen können in obigen Optionen genutzt werden:\n" " - buffer data (siehe hdata \"buffer\" in API Dokumentation für eine " "vollständige Liste), zum Beispiel:\n" " - ${buffer.number}\n" @@ -5846,25 +5858,24 @@ msgstr "" " - ${format_buffer}: der evaluierte Wert der Option buflist.format." "buffer; dies kann in der Option buflist.format.buffer_current genutzt werden " "um zum Beispiel die Hintergrundfarbe zu verändern\n" -" - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert für " +" - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert aus " "Option buflist.format.number)\n" " - ${number}: eingerückte Nummer, zum Beispiel \" 1\", falls die Anzahl " "der Buffer zwischen 10 und 99 liegt\n" " - ${indent}: Einrückung für Name (Channel und private Buffer werden " -"eingerückt)\n" +"eingerückt) (evaluiert aus Option buflist.format.indent)\n" " - ${nick_prefix}: Nick-Präfix für einen Channel (wird nur genutzt falls " "die Option buflist.look.nick_prefix aktiviert ist)\n" -" - ${name}: der Kurzname (falls einer gesetzt ist), mit einem Rückgriff " -"auf den Originalnamen\n" +" - ${name}: der Kurzname (falls einer gesetzt ist), Ersatzweise wird auf " +"den Originalnamen zurückgegriffen\n" " - ${color_hotlist}: die Farbe mit der höchsten Priorität für den " -"entsprechenden Buffer (wird evaluiert mit Option buflist.format.hotlist_xxx " +"entsprechenden Buffer (evaluiert aus Option buflist.format.hotlist_xxx " "wobei xxx der entsprechende Level ist)\n" -" - ${format_hotlist}: die formatierte Hotlist (wird evaluiert mit Option " +" - ${format_hotlist}: die formatierte Hotlist (evaluiert aus Option " "buflist.format.hotlist)\n" " - ${hotlist}: die Hotlist in der Rohform\n" " - ${format_lag}: die Verzögerung für einen IRC Server-Buffer, ist leer " -"falls es keine Verzögerung gibt (wird evaluiert mit Option buflist.format." -"lag)" +"falls es keine Verzögerung gibt (evaluiert aus Option buflist.format.lag)" #, c-format msgid "%s: %d signals hooked" @@ -5872,10 +5883,15 @@ msgstr "%s: %d Signale hooked" msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"Bedingungen für die Darstellung eines Buffers (Hinweis: Inhalt wird " -"evaluiert, siehe /help buflist)" +"Bedingungen wann ein Buffer dargestellt werden soll (Hinweis: Inhalt ist " +"evaluiert, siehe /help buflist); Beispielsweise werden Server-Buffer " +"versteckt, sofern sie mit dem Core-Buffer zusammengefügt worden sind: " +"\"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core." +"weechat) || ${buffer.active}==1)\"" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5991,12 +6007,26 @@ msgstr "" "help buflist)" msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"Zeichenkette die beim Einrücken von Channel und privaten Buffern angezeigt " +"wird (Hinweis: Inhalt wird evaluiert, siehe /help buflist)" + +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" "Format für die Anzeige der Verzögerungsanzeige für IRC Serverbuffer " "(Hinweis: Inhalt wird evaluiert, siehe /help buflist)" +#, fuzzy +msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"Format der Hotlist (Hinweis: Inhalt wird evaluiert, siehe /help buflist)" + msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" @@ -12300,20 +12330,8 @@ msgstr "" "getrennte Liste von Skripten die weder aktualisiert noch entfernt werden " "können. Zum Beispiel: \"buffers.pl,iset.pl\"" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" -"URL mit dem Dateinamen, welches die Liste der Skripten enthält; " -"standardmäßig wird HTTPS genutzt, siehe Option script.scripts.url_force_https" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" -"HTTPS wird für das Herunterladen der Indexdatei und der Skripten bevorzugt; " -"diese Einstellung sollte nur deaktiviert werden falls Probleme beim " -"Herunterladen auftreten" +msgid "URL for file with list of scripts" +msgstr "URL für Datei mit der Auflistung aller Skripten" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -13367,6 +13385,22 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" +#~ msgid "" +#~ "URL for file with list of scripts; by default HTTPS is forced, see option " +#~ "script.scripts.url_force_https" +#~ msgstr "" +#~ "URL mit dem Dateinamen, welches die Liste der Skripten enthält; " +#~ "standardmäßig wird HTTPS genutzt, siehe Option script.scripts." +#~ "url_force_https" + +#~ msgid "" +#~ "force use of HTTPS for downloads (index and scripts); you should disable " +#~ "this option only if you have problems with the downloads" +#~ msgstr "" +#~ "HTTPS wird für das Herunterladen der Indexdatei und der Skripten " +#~ "bevorzugt; diese Einstellung sollte nur deaktiviert werden falls Probleme " +#~ "beim Herunterladen auftreten" + #~ msgid "commands defined by plugins" #~ msgstr "Befehle, definiert durch Erweiterungen" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 22:01+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1503,10 +1503,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1542,9 +1544,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5133,6 +5134,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5142,7 +5147,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5160,11 +5169,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " señales enganchadas:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" -msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" +msgstr "" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5255,12 +5265,24 @@ msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" @@ -10979,15 +11001,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: error al leer la lista de scripts" #, fuzzy msgid "script name with extension (wildcard \"*\" is allowed) (optional)" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" -"PO-Revision-Date: 2017-04-08 14:49+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" +"PO-Revision-Date: 2017-04-25 20:39+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -1550,10 +1550,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1589,9 +1591,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -1645,10 +1646,11 @@ msgstr "" " 3. une chaîne avec des caractères à cacher (format : \"hide:caractère," "chaîne\")\n" " 4. une chaîne avec un maximum de caractères (format : \"cut:max,suffixe," -"chaîne\")\n" +"chaîne\" ou \"cut:+max,suffixe,chaîne\")\n" " ou un maximum de caractères affichés à l'écran (format : \"cutscr:max," -"suffixe,chaîne\")\n" -" 5. une couleur (format : \"color:xxx\")\n" +"suffixe,chaîne\" ou \"cutscr:+max,suffixe,chaîne\")\n" +" 5. une couleur (format : \"color:xxx\", voir la \"Référence API extension" +"\", fonction \"color\")\n" " 6. une info (format : \"info:nom,paramètres\", les paramètres sont " "optionnels)\n" " 7. la date/heure courante (format : \"date\" ou \"date:format\")\n" @@ -1687,9 +1689,8 @@ msgstr "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5675,6 +5676,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5684,7 +5689,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5715,6 +5724,10 @@ msgstr "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: données du serveur IRC, défini seulement sur un tampon IRC " +"(voir le hdata \"irc_server\" dans la doc API)\n" +" - irc_channel: données du canal IRC, défini seulement sur un tampon de " +"canal IRC (voir le hdata \"irc_channel\" dans la doc API)\n" " - variables additionnelles ajoutées par buflist pour des raisons " "pratiques :\n" " - ${format_buffer} : la valeur évaluée de l'option buflist.format." @@ -5725,8 +5738,12 @@ msgstr "" " - ${number} : numéro indenté, par exemple \" 1\" s'il y a entre 10 et 99 " "tampons\n" " - ${indent} : indentation pour le nom (les tampons de canaux ou privés " -"sont indentés)\n" -" - ${nick_prefix} : le préfixe du pseudo pour un cancl (défini seulement " +"sont indentés) (évaluation de l'option buflist.format.indent)\n" +" - ${format_nick_prefix} : le préfixe du pseudo en couleur pour un canal " +"(évaluation de l'option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix} : la couleur du préfixe du pseudo pour un canal " +"(défini seulement si l'option buflist.look.nick_prefix est activée)\n" +" - ${nick_prefix} : le préfixe du pseudo pour un canal (défini seulement " "si l'option buflist.look.nick_prefix est activée)\n" " - ${name} : le nom court (si défini), sinon le nom\n" " - ${color_hotlist} : la couleur qui dépend du niveau de hotlist le plus " @@ -5744,10 +5761,14 @@ msgstr "%s: %d signaux accrochés" msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" "conditions pour afficher un tampon (note : le contenu est évalué, voir /help " -"buflist)" +"buflist) ; par exemple pour cacher les tampons de serveurs s'ils sont " +"fusionnés avec le tampon \"core\" : \"${buffer.hidden}==0 && ((${type}!" +"=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)\"" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5863,6 +5884,13 @@ msgstr "" "voir /help buflist)" msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"chaîne affichée pour indenter un tampon de canal ou privé (note : le contenu " +"est évalué, voir /help buflist)" + +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" @@ -5870,6 +5898,13 @@ msgstr "" "évalué, voir /help buflist)" msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"format pour un préfixe de pseudo sur un canal (note : le contenu est évalué, " +"voir /help buflist)" + +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -12031,20 +12066,8 @@ msgstr "" "seront jamais mis à jour et ne peuvent pas être supprimés, par exemple : " "\"buffers.pl,iset.pl\"" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" -"URL pour le fichier avec la liste des scripts ; par défaut HTTPS est forcé, " -"voir l'option script.scripts.url_force_https" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" -"forcer l'utilisation de HTTPS pour les téléchargements (index et scripts) ; " -"vous ne devriez désactiver cette option que si vous avez des problèmes avec " -"les téléchargements" +msgid "URL for file with list of scripts" +msgstr "URL pour le fichier avec la liste des scripts" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -13101,6 +13124,21 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" #~ msgid "" +#~ "URL for file with list of scripts; by default HTTPS is forced, see option " +#~ "script.scripts.url_force_https" +#~ msgstr "" +#~ "URL pour le fichier avec la liste des scripts ; par défaut HTTPS est " +#~ "forcé, voir l'option script.scripts.url_force_https" + +#~ msgid "" +#~ "force use of HTTPS for downloads (index and scripts); you should disable " +#~ "this option only if you have problems with the downloads" +#~ msgstr "" +#~ "forcer l'utilisation de HTTPS pour les téléchargements (index et " +#~ "scripts) ; vous ne devriez désactiver cette option que si vous avez des " +#~ "problèmes avec les téléchargements" + +#~ msgid "" #~ "jump to previous/next visited buffer if you click with left/right mouse " #~ "button on line with current buffer" #~ msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 22:03+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1393,10 +1393,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1432,9 +1434,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -4457,6 +4458,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -4466,7 +4471,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -4484,11 +4493,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " üzenetkezelők:\n" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" -msgstr "felhasználónév az IRC szerveren" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" +msgstr "" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -4577,12 +4587,24 @@ msgstr "felhasználónév az IRC szerveren" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "felhasználónév az IRC szerveren" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "felhasználónév az IRC szerveren" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "felhasználónév az IRC szerveren" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "felhasználónév az IRC szerveren" @@ -10009,15 +10031,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s adatküldési hiba az IRC szerveren\n" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 22:04+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1486,10 +1486,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1525,9 +1527,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5271,6 +5272,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5280,7 +5285,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5298,13 +5307,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " hook sui segnali:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"nome utente per il server proxy (nota: il contenuto viene valutato, " -"consultare /help eval)" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5413,6 +5421,14 @@ msgstr "" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"nome utente per il server proxy (nota: il contenuto viene valutato, " +"consultare /help eval)" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" @@ -5421,6 +5437,14 @@ msgstr "" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"password per il server (nota: il contenuto viene valutato, consultare /help " +"eval)" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -11194,15 +11218,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: errore durante la lettura dell'elenco degli script" #, fuzzy msgid "script name with extension (wildcard \"*\" is allowed) (optional)" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" -"PO-Revision-Date: 2017-04-08 14:49+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" +"PO-Revision-Date: 2017-04-23 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" "translation/ja_JP>\n" @@ -1479,6 +1479,7 @@ msgstr "式を評価" msgid "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>" msgstr "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>" +#, fuzzy msgid "" " -n: display result without sending it to buffer (debug mode)\n" " -s: split expression before evaluating it (many commands can be " @@ -1515,10 +1516,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1554,9 +1557,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -1606,7 +1608,8 @@ msgstr "" " 4. 最大文字数を指定した文字列 (書式: \"cut:max,suffix,string\")\n" " または最大文字表示幅を指定した文字列 (書式: \"cutscr:max,suffix,string" "\")\n" -" 5. 色 (書式: \"color:xxx\")\n" +" 5. 色 (書式: \"color:xxx\"、\"プラグイン API リファレンス\" の \"color\" 関" +"数を参照してください)\n" " 6. 情報 (書式: \"info:name,arguments\"、arguments は任意)\n" " 7. 現在の日付/時刻 (書式: \"date\" または \"date:format\")\n" " 8. 環境変数 (書式: \"env:XXX\")\n" @@ -1640,8 +1643,6 @@ msgstr "" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" " /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5393,6 +5394,7 @@ msgstr "バッファリスト" msgid "bar item with list of buffers" msgstr "バッファのリストを表示するバー要素" +#, fuzzy msgid "" "refresh: force the refresh of the \"buflist\" bar item\n" "\n" @@ -5411,6 +5413,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5420,7 +5426,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5476,9 +5486,14 @@ msgstr "%s: %d 個のシグナルがフックされました" msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"バッファの表示条件 (注意: 値は評価されます、/help eval を参照してください)" +"バッファの表示条件 (注意: 値は評価されます、/help eval を参照してください); " +"サーババッファがコアバッファにマージされている場合にサーババッファを隠す例: " +"\"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core." +"weechat) || ${buffer.active}==1)\"" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5593,6 +5608,13 @@ msgstr "" "ホットリスト内のカウンタを示す区切り文字 (注意: 値は評価されます、/help eval " "を参照してください)" +#, fuzzy +msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"バッファの表示条件 (注意: 値は評価されます、/help eval を参照してください)" + msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" @@ -5600,6 +5622,14 @@ msgstr "" "IRC サーババッファの遅延時間の表示書式 (注意: 値は評価されます、/help eval を" "参照してください)" +#, fuzzy +msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"ホットリストの表示書式 (注意: 値は評価されます、/help eval を参照してくださ" +"い)" + msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" @@ -11579,19 +11609,9 @@ msgstr "" "れるスクリプトはアップグレードされませんし、削除もされません、例: \"buffers." "pl,iset.pl\"" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" -"スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使用、オ" -"プション script.scripts.url_force_https を参照" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" -"ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制す" -"る; ダウンロードに問題がある場合のみこのオプションを無効化してください" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: スクリプトリストの読み込み中にエラー" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -12593,6 +12613,20 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" +#~ msgid "" +#~ "URL for file with list of scripts; by default HTTPS is forced, see option " +#~ "script.scripts.url_force_https" +#~ msgstr "" +#~ "スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使" +#~ "用、オプション script.scripts.url_force_https を参照" + +#~ msgid "" +#~ "force use of HTTPS for downloads (index and scripts); you should disable " +#~ "this option only if you have problems with the downloads" +#~ msgstr "" +#~ "ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制" +#~ "する; ダウンロードに問題がある場合のみこのオプションを無効化してください" + #~ msgid "commands defined by plugins" #~ msgstr "プラグインの定義するコマンド" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-04-08 14:49+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1550,10 +1550,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1589,9 +1591,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5525,6 +5526,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5534,7 +5539,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5552,13 +5561,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " powiązane sygnały:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"prawdziwa nazwa do użycia na serwerze (uwaga: zawartość jest przetwarzana, " -"zobacz /help eval)" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5664,6 +5672,14 @@ msgstr "" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"prawdziwa nazwa do użycia na serwerze (uwaga: zawartość jest przetwarzana, " +"zobacz /help eval)" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" @@ -5671,6 +5687,13 @@ msgstr "" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"hasło dla serwera (uwaga: zawartość jest przetwarzana, zobacz /help eval)" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -11722,19 +11745,9 @@ msgstr "" "nigdy nie zostaną zaktualizowane i nie mogą być usunięte, na przykład: " "\"buffers.pl,iset.pl\"" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" -"adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, " -"zobacz opcje script.scripts.url_force_https" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" -"wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś wyłączyć " -"tą opcję tylko jeśli występują problemy z pobieraniem" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: błąd podczas odczytywania listy skryptów" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -12754,6 +12767,20 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" +#~ msgid "" +#~ "URL for file with list of scripts; by default HTTPS is forced, see option " +#~ "script.scripts.url_force_https" +#~ msgstr "" +#~ "adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, " +#~ "zobacz opcje script.scripts.url_force_https" + +#~ msgid "" +#~ "force use of HTTPS for downloads (index and scripts); you should disable " +#~ "this option only if you have problems with the downloads" +#~ msgstr "" +#~ "wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś " +#~ "wyłączyć tą opcję tylko jeśli występują problemy z pobieraniem" + #~ msgid "commands defined by plugins" #~ msgstr "komendy zdefiniowane przez wtyczki" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-04-08 14:50+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -1539,10 +1539,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1578,9 +1580,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5527,6 +5528,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5536,7 +5541,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5554,12 +5563,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " sinais ligados:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"nome real a usar no servidor (nota: o conteúdo é avaliado, ver /help eval)" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5663,6 +5672,13 @@ msgstr "" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"nome real a usar no servidor (nota: o conteúdo é avaliado, ver /help eval)" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" @@ -5670,6 +5686,13 @@ msgstr "" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"palavra-passe para o servidor (nota: o conteúdo é avaliado, ver /help eval)" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -11720,19 +11743,9 @@ msgstr "" "scripts a \"reter\": lista de scripts que nunca serão atualizados e não " "podem ser removidos, por exemplo: \"buffers.pl,iset.pl\"" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" -"URL do ficheiro com a lista de scripts; por omissão é forçado HTTPS, ver a " -"opção script.scripts.url_force_https" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" -"forçar uso de HTTPS para transferir (índice e scripts); deve desativar esta " -"opção apenas se tem problemas com as transferências" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: erro ao ler a lista de scripts" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -12763,6 +12776,20 @@ msgstr "%s%s: tempo limite de \"%s\" com %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar: erro inesperado (%d)" +#~ msgid "" +#~ "URL for file with list of scripts; by default HTTPS is forced, see option " +#~ "script.scripts.url_force_https" +#~ msgstr "" +#~ "URL do ficheiro com a lista de scripts; por omissão é forçado HTTPS, ver " +#~ "a opção script.scripts.url_force_https" + +#~ msgid "" +#~ "force use of HTTPS for downloads (index and scripts); you should disable " +#~ "this option only if you have problems with the downloads" +#~ msgstr "" +#~ "forçar uso de HTTPS para transferir (índice e scripts); deve desativar " +#~ "esta opção apenas se tem problemas com as transferências" + #~ msgid "commands defined by plugins" #~ msgstr "comandos definidos por plugins" diff --git a/po/pt_BR.po b/po/pt_BR.po index c8a009be6..2878cbd50 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1548,10 +1548,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1587,9 +1589,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -5073,6 +5074,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -5082,7 +5087,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -5100,13 +5109,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " sinais relacionados:" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" -"comando executado quando o WeeChat inicia, antes do carregamento dos plugins " -"(nota: conteúdo é avaliado, veja /help eval)" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -5215,6 +5223,14 @@ msgstr "" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" +"comando executado quando o WeeChat inicia, antes do carregamento dos plugins " +"(nota: conteúdo é avaliado, veja /help eval)" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" @@ -5223,6 +5239,14 @@ msgstr "" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" +"comando executado quando o WeeChat inicia, antes do carregamento dos plugins " +"(nota: conteúdo é avaliado, veja /help eval)" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -10482,15 +10506,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s%s: erro ao criar transferência" #, fuzzy msgid "script name with extension (wildcard \"*\" is allowed) (optional)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 22:06+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1415,10 +1415,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1454,9 +1456,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -4495,6 +4496,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -4504,7 +4509,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -4522,11 +4531,12 @@ msgstr "" msgid "%s: %d signals hooked" msgstr " обработчики сообщений:\n" -#, fuzzy msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" -msgstr "ник, используемый на IRC сервере" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" +msgstr "" msgid "" "if enabled, clicks with left/right buttons on the line with current buffer " @@ -4615,12 +4625,24 @@ msgstr "ник, используемый на IRC сервере" #, fuzzy msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "ник, используемый на IRC сервере" + +#, fuzzy +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "ник, используемый на IRC сервере" #, fuzzy msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "ник, используемый на IRC сервере" + +#, fuzzy +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "ник, используемый на IRC сервере" @@ -10045,15 +10067,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "%s ошибка при отправке данных IRC серверу\n" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2017-01-06 22:07+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1249,10 +1249,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1288,9 +1290,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -4060,6 +4061,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -4069,7 +4074,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -4089,7 +4098,9 @@ msgstr "" msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" msgid "" @@ -4170,11 +4181,21 @@ msgid "" msgstr "" msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" + +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" + +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -9090,15 +9111,9 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" -msgstr "" +#, fuzzy +msgid "URL for file with list of scripts" +msgstr "betiklerin listesi" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 91f392293..403078b02 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-04-08 14:48+0200\n" +"POT-Creation-Date: 2017-04-25 20:37+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1252,10 +1252,12 @@ msgid "" " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" -" 4. a string with max chars (format: \"cut:max,suffix,string\")\n" -" or max chars displayed on screen (format: \"cutscr:max,suffix,string" -"\")\n" -" 5. a color (format: \"color:xxx\")\n" +" 4. a string with max chars (format: \"cut:max,suffix,string\" or \"cut:" +"+max,suffix,string\")\n" +" or max chars displayed on screen (format: \"cutscr:max,suffix,string\" " +"or \"cutscr:+max,suffix,string\")\n" +" 5. a color (format: \"color:xxx\", see \"Plugin API reference\", function " +"\"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" " 8. an environment variable (format: \"env:XXX\")\n" @@ -1291,9 +1293,8 @@ msgid "" " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" -" /eval -n ${cut:2,+,test} ==> te+\n" -" /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" -" /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" +" /eval -n ${cut:3,+,test} ==> tes+\n" +" /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" @@ -4045,6 +4046,10 @@ msgid "" " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" +" - irc_server: IRC server data, defined only on an IRC buffer (see hdata " +"\"irc_server\" in API doc)\n" +" - irc_channel: IRC channel data, defined only on an IRC channel buffer " +"(see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option buflist.format.buffer; " "this can be used in option buflist.format.buffer_current to just change the " @@ -4054,7 +4059,11 @@ msgid "" " - ${number}: indented number, for example \" 1\" if there are between 10 " "and 99 buffers\n" " - ${indent}: indentation for name (channel and private buffers are " -"indented)\n" +"indented) (evaluation of option buflist.format.indent)\n" +" - ${format_nick_prefix}: colored nick prefix for a channel (evaluation " +"of option buflist.format.nick_prefix)\n" +" - ${color_nick_prefix}: color of nick prefix for a channel (set only if " +"the option buflist.look.nick_prefix is enabled)\n" " - ${nick_prefix}: nick prefix for a channel (set only if the option " "buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the name\n" @@ -4074,7 +4083,9 @@ msgstr "" msgid "" "conditions to display a buffer (note: content is evaluated, see /help " -"buflist)" +"buflist); for example to hide server buffers if they are merged with core " +"buffer: \"${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!" +"=core.weechat) || ${buffer.active}==1)\"" msgstr "" msgid "" @@ -4155,11 +4166,21 @@ msgid "" msgstr "" msgid "" +"string displayed to indent channel and private buffers (note: content is " +"evaluated, see /help buflist)" +msgstr "" + +msgid "" "format for lag on an IRC server buffer (note: content is evaluated, see /" "help buflist)" msgstr "" msgid "" +"format for nick prefix on a channel (note: content is evaluated, see /help " +"buflist)" +msgstr "" + +msgid "" "format for buffer number, ${number} is the indented number (note: content is " "evaluated, see /help buflist)" msgstr "" @@ -9006,14 +9027,7 @@ msgid "" "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\"" msgstr "" -msgid "" -"URL for file with list of scripts; by default HTTPS is forced, see option " -"script.scripts.url_force_https" -msgstr "" - -msgid "" -"force use of HTTPS for downloads (index and scripts); you should disable " -"this option only if you have problems with the downloads" +msgid "URL for file with list of scripts" msgstr "" msgid "script name with extension (wildcard \"*\" is allowed) (optional)" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index cba2bb6e7..6496a0732 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -1674,7 +1674,7 @@ COMMAND_CALLBACK(cursor) if (string_strcasecmp (argv[1], "stop") == 0) { - gui_cursor_mode_toggle (); + gui_cursor_mode_stop (); return WEECHAT_RC_OK; } @@ -7269,10 +7269,13 @@ command_init () " 1. an evaluated sub-string (format: \"eval:xxx\")\n" " 2. a string with escaped chars (format: \"esc:xxx\" or \"\\xxx\")\n" " 3. a string with chars to hide (format: \"hide:char,string\")\n" - " 4. a string with max chars (format: \"cut:max,suffix,string\")\n" + " 4. a string with max chars (format: \"cut:max,suffix,string\" " + "or \"cut:+max,suffix,string\")\n" " or max chars displayed on screen " - "(format: \"cutscr:max,suffix,string\")\n" - " 5. a color (format: \"color:xxx\")\n" + "(format: \"cutscr:max,suffix,string\" or " + "\"cutscr:+max,suffix,string\")\n" + " 5. a color (format: \"color:xxx\", see \"Plugin API " + "reference\", function \"color\")\n" " 6. an info (format: \"info:name,arguments\", arguments are " "optional)\n" " 7. current date/time (format: \"date\" or \"date:format\")\n" @@ -7310,9 +7313,8 @@ command_init () " /eval -n ${window.buffer.number} ==> 1\n" " /eval -n ${\\t} ==> <tab>\n" " /eval -n ${hide:-,${relay.network.password}} ==> --------\n" - " /eval -n ${cut:2,+,test} ==> te+\n" - " /eval -n ${cut:2,+,こんにちは世界} ==> こん+\n" - " /eval -n ${cutscr:2,+,こんにちは世界} ==> こ+\n" + " /eval -n ${cut:3,+,test} ==> tes+\n" + " /eval -n ${cut:+3,+,test} ==> te+\n" " /eval -n ${date:%H:%M:%S} ==> 07:46:40\n" " /eval -n ${if:${info:term_width}>80?big:small} ==> big\n" "\n" diff --git a/src/core/wee-eval.c b/src/core/wee-eval.c index 016d99c2d..ebcaec5fe 100644 --- a/src/core/wee-eval.c +++ b/src/core/wee-eval.c @@ -295,8 +295,9 @@ end: * 2. a string to evaluate (format: eval:xxx) * 3. a string with escaped chars (format: esc:xxx or \xxx) * 4. a string with chars to hide (format: hide:char,string) - * 5. a string with max chars (format: cut:max,suffix,string) - * or max chars on screen (format: cutscr:max,suffix,string) + * 5. a string with max chars (format: cut:max,suffix,string or + * cut:+max,suffix,string) or max chars on screen + * (format: cutscr:max,suffix,string or cutscr:+max,suffix,string) * 6. a regex group captured (format: re:N (0.99) or re:+) * 7. a color (format: color:xxx) * 8. an info (format: info:name,arguments) @@ -326,6 +327,7 @@ eval_replace_vars_cb (void *data, const char *text) struct t_hdata *hdata; void *pointer; int i, length_hide_char, length, index, rc, extra_vars_eval, screen; + int count_suffix; long number; long unsigned int ptr; time_t date; @@ -436,6 +438,12 @@ eval_replace_vars_cb (void *data, const char *text) pos = strchr (text + length, ','); if (!pos) return strdup (""); + count_suffix = 0; + if (text[length] == '+') + { + length++; + count_suffix = 1; + } pos2 = strchr (pos + 1, ','); if (!pos2) return strdup (""); @@ -452,7 +460,7 @@ eval_replace_vars_cb (void *data, const char *text) tmp = strndup (pos + 1, pos2 - pos - 1); if (!tmp) return strdup (""); - value = string_cut (pos2 + 1, number, screen, tmp); + value = string_cut (pos2 + 1, number, count_suffix, screen, tmp); free (tmp); return value; } @@ -551,7 +559,7 @@ eval_replace_vars_cb (void *data, const char *text) tmp = eval_expression_condition (condition, pointers, extra_vars, extra_vars_eval, prefix, suffix); - rc = (tmp && strcmp (tmp, "1") == 0); + rc = eval_is_true (tmp); if (tmp) free (tmp); if (rc) diff --git a/src/core/wee-string.c b/src/core/wee-string.c index 70f595553..f974ac063 100644 --- a/src/core/wee-string.c +++ b/src/core/wee-string.c @@ -76,7 +76,7 @@ string_strndup (const char *string, int length) { char *result; - if (!string) + if (!string || (length < 0)) return NULL; if ((int)strlen (string) < length) @@ -96,13 +96,16 @@ string_strndup (const char *string, int length) * Cuts a string after max "length" chars, adds an optional suffix * after the string if it is cut. * + * If count_suffix == 1, the length of suffix is counted in the max length. + * * If screen == 1, the cut is based on width of chars displayed. * * Note: result must be freed after use. */ char * -string_cut (const char *string, int length, int screen, const char *cut_suffix) +string_cut (const char *string, int length, int count_suffix, int screen, + const char *cut_suffix) { int length_result, length_cut_suffix; char *result; @@ -113,7 +116,7 @@ string_cut (const char *string, int length, int screen, const char *cut_suffix) else ptr_string = gui_chat_string_add_offset (string, length); - if (!ptr_string[0]) + if (!ptr_string || !ptr_string[0]) { /* no cut */ return strdup (string); @@ -122,6 +125,24 @@ string_cut (const char *string, int length, int screen, const char *cut_suffix) if (cut_suffix && cut_suffix[0]) { length_cut_suffix = strlen (cut_suffix); + if (count_suffix) + { + if (screen) + length -= utf8_strlen_screen (cut_suffix); + else + length -= length_cut_suffix; + if (length < 0) + return strdup (""); + if (screen) + ptr_string = gui_chat_string_add_offset_screen (string, length); + else + ptr_string = gui_chat_string_add_offset (string, length); + if (!ptr_string || !ptr_string[0]) + { + /* no cut */ + return strdup (string); + } + } length_result = (ptr_string - string) + length_cut_suffix + 1; result = malloc (length_result); if (!result) diff --git a/src/core/wee-string.h b/src/core/wee-string.h index 3769cf299..0c2f0d997 100644 --- a/src/core/wee-string.h +++ b/src/core/wee-string.h @@ -36,8 +36,8 @@ struct t_string_dyn struct t_hashtable; extern char *string_strndup (const char *string, int length); -extern char *string_cut (const char *string, int length, int screen, - const char *cut_suffix); +extern char *string_cut (const char *string, int length, int count_suffix, + int screen, const char *cut_suffix); extern void string_tolower (char *string); extern void string_toupper (char *string); extern int string_strcasecmp (const char *string1, const char *string2); diff --git a/src/gui/gui-cursor.c b/src/gui/gui-cursor.c index dd0ba9d60..52d3d079e 100644 --- a/src/gui/gui-cursor.c +++ b/src/gui/gui-cursor.c @@ -75,6 +75,17 @@ gui_cursor_mode_toggle () } /* + * Stops cursor mode. + */ + +void +gui_cursor_mode_stop () +{ + if (gui_cursor_mode) + gui_cursor_mode_toggle (); +} + +/* * Sets debug for cursor mode. */ diff --git a/src/gui/gui-cursor.h b/src/gui/gui-cursor.h index 53b6ae8f7..2b52ebbb3 100644 --- a/src/gui/gui-cursor.h +++ b/src/gui/gui-cursor.h @@ -30,6 +30,7 @@ extern int gui_cursor_y; /* cursor functions */ extern void gui_cursor_mode_toggle (); +extern void gui_cursor_mode_stop (); extern void gui_cursor_debug_set (int debug); extern void gui_cursor_move_xy (int x, int y); extern void gui_cursor_move_add_xy (int add_x, int add_y); diff --git a/src/plugins/buflist/buflist-bar-item.c b/src/plugins/buflist/buflist-bar-item.c index 25b11a5d4..036b42f0b 100644 --- a/src/plugins/buflist/buflist-bar-item.c +++ b/src/plugins/buflist/buflist-bar-item.c @@ -52,17 +52,23 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, struct t_gui_buffer *ptr_buffer, *ptr_current_buffer; struct t_gui_nick *ptr_gui_nick; struct t_gui_hotlist *ptr_hotlist; + struct t_hdata *hdata_irc_server, *hdata_irc_channel; + struct t_irc_server *ptr_server; + struct t_irc_channel *ptr_channel; char **buflist, *str_buflist, *condition; + char str_condition[512]; char str_format_number[32], str_format_number_empty[32]; - char str_nick_prefix[32]; - char str_number[32], str_indent_name[4], *line, **hotlist, *str_hotlist; + char str_nick_prefix[32], str_color_nick_prefix[32]; + char str_number[32], *line, **hotlist, *str_hotlist; char str_hotlist_count[32]; - const char *ptr_format, *ptr_format_current, *ptr_name, *ptr_type; + const char *ptr_format, *ptr_format_current, *ptr_format_indent; + const char *ptr_name, *ptr_type, *ptr_server_name, *ptr_channel_name; const char *ptr_nick, *ptr_nick_prefix; const char *ptr_hotlist_format, *ptr_hotlist_priority; const char *hotlist_priority_none = "none"; const char *hotlist_priority[4] = { "low", "message", "private", "highlight" }; + const char indent_empty[1] = { '\0' }; const char *ptr_lag; int is_channel, is_private; int i, j, length_max_number, current_buffer, number, prev_number, priority; @@ -78,6 +84,9 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, prev_number = -1; + hdata_irc_server = NULL; + hdata_irc_channel = NULL; + buflist = weechat_string_dyn_alloc (256); ptr_format = weechat_config_string (buflist_config_format_buffer); @@ -112,6 +121,58 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, weechat_hashtable_set (buflist_hashtable_pointers, "buffer", ptr_buffer); + /* set IRC server/channel pointers */ + ptr_server = NULL; + ptr_channel = NULL; + if (strcmp (weechat_buffer_get_string (ptr_buffer, "plugin"), "irc") == 0) + { + ptr_server_name = weechat_buffer_get_string (ptr_buffer, "localvar_server"); + if (ptr_server_name && ptr_server_name[0]) + { + if (!hdata_irc_server) + hdata_irc_server = weechat_hdata_get ("irc_server"); + if (hdata_irc_server) + { + snprintf (str_condition, sizeof (str_condition), + "${irc_server.name} == %s", + ptr_server_name); + ptr_server = weechat_hdata_get_list (hdata_irc_server, + "irc_servers"); + ptr_server = weechat_hdata_search (hdata_irc_server, + ptr_server, + str_condition, + 1); + if (ptr_server) + { + ptr_channel_name = weechat_buffer_get_string (ptr_buffer, + "localvar_channel"); + if (ptr_channel_name && ptr_channel_name[0]) + { + if (!hdata_irc_channel) + hdata_irc_channel = weechat_hdata_get ("irc_channel"); + if (hdata_irc_channel) + { + snprintf (str_condition, sizeof (str_condition), + "${irc_channel.name} == %s", + ptr_channel_name); + ptr_channel = weechat_hdata_pointer (hdata_irc_server, + ptr_server, + "channels"); + ptr_channel = weechat_hdata_search (hdata_irc_channel, + ptr_channel, + str_condition, + 1); + } + } + } + } + } + } + weechat_hashtable_set (buflist_hashtable_pointers, + "irc_server", ptr_server); + weechat_hashtable_set (buflist_hashtable_pointers, + "irc_channel", ptr_channel); + /* check condition: if false, the buffer is not displayed */ condition = weechat_string_eval_expression ( weechat_config_string (buflist_config_look_display_conditions), @@ -163,15 +224,15 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, prev_number = number; /* buffer name */ - str_indent_name[0] = '\0'; ptr_type = weechat_buffer_get_string (ptr_buffer, "localvar_type"); is_channel = (ptr_type && (strcmp (ptr_type, "channel") == 0)); is_private = (ptr_type && (strcmp (ptr_type, "private") == 0)); - if (is_channel || is_private) - snprintf (str_indent_name, sizeof (str_indent_name), " "); + ptr_format_indent = (is_channel || is_private) ? + weechat_config_string (buflist_config_format_indent) : indent_empty; /* nick prefix */ str_nick_prefix[0] = '\0'; + str_color_nick_prefix[0] = '\0'; if (is_channel && weechat_config_boolean (buflist_config_look_nick_prefix)) { @@ -190,12 +251,15 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, ptr_buffer, ptr_gui_nick, "prefix"); if (ptr_nick_prefix && (ptr_nick_prefix[0] != ' ')) { - snprintf (str_nick_prefix, sizeof (str_nick_prefix), - "%s%s", + snprintf (str_color_nick_prefix, + sizeof (str_color_nick_prefix), + "%s", weechat_color ( weechat_nicklist_nick_get_string ( ptr_buffer, ptr_gui_nick, - "prefix_color")), + "prefix_color"))); + snprintf (str_nick_prefix, sizeof (str_nick_prefix), + "%s", ptr_nick_prefix); } } @@ -203,6 +267,12 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, } weechat_hashtable_set (buflist_hashtable_extra_vars, "nick_prefix", str_nick_prefix); + weechat_hashtable_set (buflist_hashtable_extra_vars, + "color_nick_prefix", str_color_nick_prefix); + weechat_hashtable_set (buflist_hashtable_extra_vars, + "format_nick_prefix", + weechat_config_string ( + buflist_config_format_nick_prefix)); /* set extra variables */ weechat_hashtable_set (buflist_hashtable_extra_vars, @@ -216,7 +286,7 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, weechat_config_string ( buflist_config_format_number)); weechat_hashtable_set (buflist_hashtable_extra_vars, - "indent", str_indent_name); + "indent", ptr_format_indent); weechat_hashtable_set (buflist_hashtable_extra_vars, "name", ptr_name); diff --git a/src/plugins/buflist/buflist-command.c b/src/plugins/buflist/buflist-command.c index 2c61252c9..18bbb101c 100644 --- a/src/plugins/buflist/buflist-command.c +++ b/src/plugins/buflist/buflist-command.c @@ -88,6 +88,10 @@ buflist_command_init () " - ${buffer.full_name}\n" " - ${buffer.short_name}\n" " - ${buffer.nicklist_nicks_count}\n" + " - irc_server: IRC server data, defined only on an IRC buffer " + "(see hdata \"irc_server\" in API doc)\n" + " - irc_channel: IRC channel data, defined only on an IRC channel " + "buffer (see hdata \"irc_channel\" in API doc)\n" " - extra variables added by buflist for convenience:\n" " - ${format_buffer}: the evaluated value of option " "buflist.format.buffer; this can be used in option " @@ -98,9 +102,14 @@ buflist_command_init () " - ${number}: indented number, for example \" 1\" if there " "are between 10 and 99 buffers\n" " - ${indent}: indentation for name (channel and private " - "buffers are indented)\n" - " - ${nick_prefix}: nick prefix for a channel (set only " - "if the option buflist.look.nick_prefix is enabled)\n" + "buffers are indented) (evaluation of " + "option buflist.format.indent)\n" + " - ${format_nick_prefix}: colored nick prefix for a channel " + "(evaluation of option buflist.format.nick_prefix)\n" + " - ${color_nick_prefix}: color of nick prefix for a channel " + "(set only if the option buflist.look.nick_prefix is enabled)\n" + " - ${nick_prefix}: nick prefix for a channel " + "(set only if the option buflist.look.nick_prefix is enabled)\n" " - ${name}: the short name (if set), with a fallback on the " "name\n" " - ${color_hotlist}: the color depending on the highest " diff --git a/src/plugins/buflist/buflist-config.c b/src/plugins/buflist/buflist-config.c index d974b198a..9398b4d0e 100644 --- a/src/plugins/buflist/buflist-config.c +++ b/src/plugins/buflist/buflist-config.c @@ -49,7 +49,9 @@ struct t_config_option *buflist_config_format_hotlist; struct t_config_option *buflist_config_format_hotlist_level[4]; struct t_config_option *buflist_config_format_hotlist_level_none; struct t_config_option *buflist_config_format_hotlist_separator; +struct t_config_option *buflist_config_format_indent; struct t_config_option *buflist_config_format_lag; +struct t_config_option *buflist_config_format_nick_prefix; struct t_config_option *buflist_config_format_number; struct t_hook **buflist_config_signals_refresh = NULL; @@ -299,12 +301,13 @@ buflist_config_init () buflist_config_file, ptr_section, "display_conditions", "string", N_("conditions to display a buffer " - "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${buffer.hidden}==0", - NULL, 0, + "(note: content is evaluated, see /help buflist); for example " + "to hide server buffers if they are merged with core buffer: " + "\"${buffer.hidden}==0 && ((${type}!=server && " + "${buffer.full_name}!=core.weechat) || ${buffer.active}==1)\""), + NULL, 0, 0, "${buffer.hidden}==0", NULL, 0, NULL, NULL, NULL, - &buflist_config_change_signals_refresh, NULL, NULL, + &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); buflist_config_look_mouse_jump_visited_buffer = weechat_config_new_option ( buflist_config_file, ptr_section, @@ -368,9 +371,7 @@ buflist_config_init () N_("comma-separated list of fields to sort buffers; each field is " "a hdata variable of buffer; char \"-\" can be used before field " "to reverse order"), - NULL, 0, 0, - "number,-active", - NULL, 0, + NULL, 0, 0, "number,-active", NULL, 0, NULL, NULL, NULL, &buflist_config_change_sort, NULL, NULL, NULL, NULL, NULL); @@ -395,7 +396,7 @@ buflist_config_init () N_("format of each line with a buffer " "(note: content is evaluated, see /help buflist)"), NULL, 0, 0, - "${format_number}${indent}${nick_prefix}${color_hotlist}${name}", + "${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, @@ -405,9 +406,7 @@ buflist_config_init () "buffer_current", "string", N_("format for the line with current buffer " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:lightgreen,blue}${format_buffer}", - NULL, 0, + NULL, 0, 0, "${color:,blue}${format_buffer}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -427,9 +426,7 @@ buflist_config_init () "hotlist_low", "string", N_("format for a buffer with hotlist level \"low\" " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:white}", - NULL, 0, + NULL, 0, 0, "${color:white}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -438,9 +435,7 @@ buflist_config_init () "hotlist_message", "string", N_("format for a buffer with hotlist level \"message\" " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:brown}", - NULL, 0, + NULL, 0, 0, "${color:brown}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -449,9 +444,7 @@ buflist_config_init () "hotlist_private", "string", N_("format for a buffer with hotlist level \"private\" " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:green}", - NULL, 0, + NULL, 0, 0, "${color:green}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -460,9 +453,7 @@ buflist_config_init () "hotlist_highlight", "string", N_("format for a buffer with hotlist level \"highlight\" " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:magenta}", - NULL, 0, + NULL, 0, 0, "${color:magenta}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -471,9 +462,7 @@ buflist_config_init () "hotlist_none", "string", N_("format for a buffer not in hotlist " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:default}", - NULL, 0, + NULL, 0, 0, "${color:default}", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -482,9 +471,16 @@ buflist_config_init () "hotlist_separator", "string", N_("separator for counts in hotlist " "(note: content is evaluated, see /help buflist)"), - NULL, 0, 0, - "${color:default},", - NULL, 0, + NULL, 0, 0, "${color:default},", NULL, 0, + NULL, NULL, NULL, + &buflist_config_change_buflist, NULL, NULL, + NULL, NULL, NULL); + buflist_config_format_indent = weechat_config_new_option ( + buflist_config_file, ptr_section, + "indent", "string", + N_("string displayed to indent channel and private buffers " + "(note: content is evaluated, see /help buflist)"), + NULL, 0, 0, " ", NULL, 0, NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); @@ -499,6 +495,15 @@ buflist_config_init () NULL, NULL, NULL, &buflist_config_change_buflist, NULL, NULL, NULL, NULL, NULL); + buflist_config_format_nick_prefix = weechat_config_new_option ( + buflist_config_file, ptr_section, + "nick_prefix", "string", + N_("format for nick prefix on a channel " + "(note: content is evaluated, see /help buflist)"), + NULL, 0, 0, "${color_nick_prefix}${nick_prefix}", NULL, 0, + NULL, NULL, NULL, + &buflist_config_change_buflist, NULL, NULL, + NULL, NULL, NULL); buflist_config_format_number = weechat_config_new_option ( buflist_config_file, ptr_section, "number", "string", diff --git a/src/plugins/buflist/buflist-config.h b/src/plugins/buflist/buflist-config.h index f78dcce29..f80524c32 100644 --- a/src/plugins/buflist/buflist-config.h +++ b/src/plugins/buflist/buflist-config.h @@ -47,7 +47,9 @@ extern struct t_config_option *buflist_config_format_hotlist; extern struct t_config_option *buflist_config_format_hotlist_level[4]; extern struct t_config_option *buflist_config_format_hotlist_level_none; extern struct t_config_option *buflist_config_format_hotlist_separator; +extern struct t_config_option *buflist_config_format_indent; extern struct t_config_option *buflist_config_format_lag; +extern struct t_config_option *buflist_config_format_nick_prefix; extern struct t_config_option *buflist_config_format_number; extern char **buflist_config_sort_fields; diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index e62832bcf..8afee681c 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -512,7 +512,7 @@ irc_ctcp_dcc_filename_without_quotes (const char *filename) int length; length = strlen (filename); - if (length > 0) + if (length > 1) { if ((filename[0] == '\"') && (filename[length - 1] == '\"')) return weechat_strndup (filename + 1, length - 2); diff --git a/src/plugins/script/script-config.c b/src/plugins/script/script-config.c index 67ca82fce..418bc1e52 100644 --- a/src/plugins/script/script-config.c +++ b/src/plugins/script/script-config.c @@ -86,7 +86,6 @@ struct t_config_option *script_config_scripts_download_timeout; struct t_config_option *script_config_scripts_path; struct t_config_option *script_config_scripts_hold; struct t_config_option *script_config_scripts_url; -struct t_config_option *script_config_scripts_url_force_https; /* @@ -760,17 +759,8 @@ script_config_init () script_config_scripts_url = weechat_config_new_option ( script_config_file, ptr_section, "url", "string", - N_("URL for file with list of scripts; by default HTTPS is forced, " - "see option script.scripts.url_force_https"), - NULL, 0, 0, "http://weechat.org/files/plugins.xml.gz", NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - script_config_scripts_url_force_https = weechat_config_new_option ( - script_config_file, ptr_section, - "url_force_https", "boolean", - N_("force use of HTTPS for downloads (index and scripts); " - "you should disable this option only if you have problems with " - "the downloads"), - NULL, 0, 0, "on", NULL, 0, + N_("URL for file with list of scripts"), + NULL, 0, 0, "https://weechat.org/files/plugins.xml.gz", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); return 1; diff --git a/src/plugins/script/script-config.h b/src/plugins/script/script-config.h index 9e0e45a69..c078271ab 100644 --- a/src/plugins/script/script-config.h +++ b/src/plugins/script/script-config.h @@ -66,7 +66,6 @@ extern struct t_config_option *script_config_scripts_download_timeout; extern struct t_config_option *script_config_scripts_path; extern struct t_config_option *script_config_scripts_hold; extern struct t_config_option *script_config_scripts_url; -extern struct t_config_option *script_config_scripts_url_force_https; extern const char *script_config_get_diff_command (); extern char *script_config_get_xml_filename (); diff --git a/src/plugins/script/script.c b/src/plugins/script/script.c index 43fc248e5..48d68eff5 100644 --- a/src/plugins/script/script.c +++ b/src/plugins/script/script.c @@ -100,9 +100,6 @@ script_language_search_by_extension (const char *extension) /* * Builds download URL (to use with hook_process or hook_process_hashtable). * - * If the option script.scripts.url_force_https is enabled, the protocol is - * forced to HTTPS (if URL starts with "http://"). - * * Note: result must be freed after use. */ @@ -115,21 +112,13 @@ script_build_download_url (const char *url) if (!url || !url[0]) return NULL; - /* length of url + "url:" + 1 (for httpS) */ - length = 4 + 1 + strlen (url) + 1; + /* length of url + "url:" */ + length = 4 + strlen (url) + 1; result = malloc (length); if (!result) return NULL; - if (weechat_config_boolean (script_config_scripts_url_force_https) - && (weechat_strncasecmp (url, "http://", 7) == 0)) - { - snprintf (result, length, "url:https://%s", url + 7); - } - else - { - snprintf (result, length, "url:%s", url); - } + snprintf (result, length, "url:%s", url); return result; } diff --git a/tests/unit/core/test-eval.cpp b/tests/unit/core/test-eval.cpp index e0bd236b7..14f60f80b 100644 --- a/tests/unit/core/test-eval.cpp +++ b/tests/unit/core/test-eval.cpp @@ -237,6 +237,42 @@ TEST(Eval, EvalExpression) WEE_CHECK_EVAL("te+", "${cut:2,+,test}"); WEE_CHECK_EVAL("te+", "${cutscr:2,+,test}"); + WEE_CHECK_EVAL("tes", "${cut:3,,test}"); + WEE_CHECK_EVAL("tes", "${cutscr:3,,test}"); + WEE_CHECK_EVAL("tes", "${cut:+3,,test}"); + WEE_CHECK_EVAL("tes", "${cutscr:+3,,test}"); + + WEE_CHECK_EVAL("tes+", "${cut:3,+,test}"); + WEE_CHECK_EVAL("tes+", "${cutscr:3,+,test}"); + WEE_CHECK_EVAL("tes++", "${cut:3,++,test}"); + WEE_CHECK_EVAL("tes++", "${cutscr:3,++,test}"); + WEE_CHECK_EVAL("tes+++", "${cut:3,+++,test}"); + WEE_CHECK_EVAL("tes+++", "${cutscr:3,+++,test}"); + WEE_CHECK_EVAL("tes++++", "${cut:3,++++,test}"); + WEE_CHECK_EVAL("tes++++", "${cutscr:3,++++,test}"); + WEE_CHECK_EVAL("tes…", "${cut:3,…,test}"); + WEE_CHECK_EVAL("tes…", "${cutscr:3,…,test}"); + WEE_CHECK_EVAL("te+", "${cut:+3,+,test}"); + WEE_CHECK_EVAL("te+", "${cutscr:+3,+,test}"); + WEE_CHECK_EVAL("…", "${cut:+3,…,test}"); + WEE_CHECK_EVAL("te…", "${cutscr:+3,…,test}"); + WEE_CHECK_EVAL("t++", "${cut:+3,++,test}"); + WEE_CHECK_EVAL("t++", "${cutscr:+3,++,test}"); + WEE_CHECK_EVAL("+++", "${cut:+3,+++,test}"); + WEE_CHECK_EVAL("+++", "${cutscr:+3,+++,test}"); + WEE_CHECK_EVAL("", "${cut:+3,++++,test}"); + WEE_CHECK_EVAL("", "${cutscr:+3,++++,test}"); + + WEE_CHECK_EVAL("test", "${cut:4,,test}"); + WEE_CHECK_EVAL("test", "${cutscr:4,,test}"); + WEE_CHECK_EVAL("test", "${cut:+4,,test}"); + WEE_CHECK_EVAL("test", "${cutscr:+4,,test}"); + + WEE_CHECK_EVAL("test", "${cut:4,+,test}"); + WEE_CHECK_EVAL("test", "${cutscr:4,+,test}"); + WEE_CHECK_EVAL("test", "${cut:+4,+,test}"); + WEE_CHECK_EVAL("test", "${cutscr:+4,+,test}"); + WEE_CHECK_EVAL("éà", "${cut:2,,éàô}"); WEE_CHECK_EVAL("éà", "${cutscr:2,,éàô}"); diff --git a/tests/unit/core/test-string.cpp b/tests/unit/core/test-string.cpp index 19e7c89c4..a7bc807de 100644 --- a/tests/unit/core/test-string.cpp +++ b/tests/unit/core/test-string.cpp @@ -123,6 +123,8 @@ TEST(String, Duplicate) POINTERS_EQUAL(NULL, string_strndup (NULL, 0)); + POINTERS_EQUAL(NULL, string_strndup (str_test, -1)); + str = string_strndup (str_test, 0); CHECK(str); CHECK(str != str_test); diff --git a/version.sh b/version.sh index 9eea07a9a..eb71a3462 100755 --- a/version.sh +++ b/version.sh @@ -32,7 +32,7 @@ # devel-patch the patch version of devel (e.g. 2 for version 1.4.2) # -WEECHAT_STABLE=1.7 +WEECHAT_STABLE=1.7.1 WEECHAT_DEVEL=1.8 WEECHAT_DEVEL_FULL=1.8-dev |