diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | doc/de/autogen/user/weechat_options.txt | 7 | ||||
| -rw-r--r-- | doc/en/autogen/user/weechat_options.txt | 7 | ||||
| -rw-r--r-- | doc/fr/autogen/user/weechat_options.txt | 7 | ||||
| -rw-r--r-- | doc/it/autogen/user/weechat_options.txt | 7 | ||||
| -rw-r--r-- | doc/ja/autogen/user/weechat_options.txt | 7 | ||||
| -rw-r--r-- | po/cs.po | 21 | ||||
| -rw-r--r-- | po/de.po | 21 | ||||
| -rw-r--r-- | po/es.po | 21 | ||||
| -rw-r--r-- | po/fr.po | 32 | ||||
| -rw-r--r-- | po/hu.po | 19 | ||||
| -rw-r--r-- | po/it.po | 21 | ||||
| -rw-r--r-- | po/ja.po | 23 | ||||
| -rw-r--r-- | po/pl.po | 21 | ||||
| -rw-r--r-- | po/pt_BR.po | 21 | ||||
| -rw-r--r-- | po/ru.po | 19 | ||||
| -rw-r--r-- | po/tr.po | 18 | ||||
| -rw-r--r-- | po/weechat.pot | 18 | ||||
| -rw-r--r-- | src/core/wee-config.c | 16 | ||||
| -rw-r--r-- | src/core/wee-config.h | 1 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-chat.c | 30 |
21 files changed, 272 insertions, 71 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.4.2-dev, 2013-08-28 +v0.4.2-dev, 2013-09-02 This document lists all changes for each version. @@ -16,8 +16,8 @@ Version 0.4.2 (under dev!) * core: display day change message dynamically (do not store it as a line in buffer), rename option weechat.look.day_change_time_format to - weechat.look.day_change_message, new option weechat.color.chat_day_change - (task #12775) + weechat.look.day_change_message, new options weechat.look.day_change_message2 + and weechat.color.chat_day_change (task #12775) * core: add syntax "@buffer:item" in bar items to force the buffer used when displaying the bar item (task #12717) * core: add search of regular expression in buffer, don't reset search type on diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index d49811b26..4538a8b0a 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -484,10 +484,15 @@ ** Werte: on, off (Standardwert: `on`) * [[option_weechat.look.day_change_message]] *weechat.look.day_change_message* -** Beschreibung: `message displayed when the day has changed (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** Beschreibung: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"-- %a, %d %b %Y --"`) +* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2* +** Beschreibung: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`) + * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch* ** Beschreibung: `aktiviert man diese Option, dann wird "eat_newline_glitch" auf 0 gesetzt; dies bedeutet, dass am Ende einer Zeile kein Zeilenumbruch an gehangen wird und somit der Text beim kopieren aus WeeChat und beim einfügen in einer anderen Applikation nicht umgebrochen wird (diese Option ist standardmäßig deaktiviert, da es zu schwerwiegenden Grafikfehlern kommen kann)` ** Typ: boolesch diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 66ed593b8..7a2adaba5 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -484,10 +484,15 @@ ** values: on, off (default value: `on`) * [[option_weechat.look.day_change_message]] *weechat.look.day_change_message* -** description: `message displayed when the day has changed (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** description: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` ** type: string ** values: any string (default value: `"-- %a, %d %b %Y --"`) +* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2* +** description: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** type: string +** values: any string (default value: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`) + * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch* ** description: `if set, the eat_newline_glitch will be set to 0; this is used to not add new line char at end of each line, and then not break text when you copy/paste text from WeeChat to another application (this option is disabled by default because it can cause serious display bugs)` ** type: boolean diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index b735a80eb..630cef4d8 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -484,10 +484,15 @@ ** valeurs: on, off (valeur par défaut: `on`) * [[option_weechat.look.day_change_message]] *weechat.look.day_change_message* -** description: `message affiché lorsque le jour a changé (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)` +** description: `message affiché lorsque le jour a changé, avec une date affichée (par exemple au début d'un tampon) (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"-- %a, %d %b %Y --"`) +* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2* +** description: `message affiché lorsque le jour a changé, avec deux dates affichées (entre deux messages); les formats pour la seconde date doivent démarrer par deux "%" car strftime est appelé deux fois sur cette chaîne (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`) + * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch* ** description: `si activé, le eat_newline_glitch sera positionné à 0; cela est utilisé pour ne pas ajouter de nouvelle ligne à la fin de chaque ligne, et donc ne pas couper le texte quand vous copiez/collez du texte depuis WeeChat vers une autre application (cette option est désactivée par défaut car elle peut causer de sérieux problèmes d'affichages)` ** type: booléen diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 5add98f8c..d52cb23b8 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -484,10 +484,15 @@ ** valori: on, off (valore predefinito: `on`) * [[option_weechat.look.day_change_message]] *weechat.look.day_change_message* -** descrizione: `message displayed when the day has changed (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** descrizione: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"-- %a, %d %b %Y --"`) +* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2* +** descrizione: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`) + * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch* ** descrizione: `se attivo, eat_newline_glitch verrà impostato a 0; viene usato per non aggiungere il carattere a capo alla fine di ogni riga, al fine di non danneggiare il testo quando viene copiato/incollato da WeeChat in un'altra applicazione (l'opzione è disabilitata per default, dato che può causare seri errori di visualizzazione)` ** tipo: bool diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt index 01d19786e..d90944bc8 100644 --- a/doc/ja/autogen/user/weechat_options.txt +++ b/doc/ja/autogen/user/weechat_options.txt @@ -484,10 +484,15 @@ ** 値: on, off (デフォルト値: `on`) * [[option_weechat.look.day_change_message]] *weechat.look.day_change_message* -** 説明: `日付が変わった時に表示される時間のフォーマット (日付/時間指定子は strftime の man を参照) (注意: 値は評価されるため "${color:xxx}" フォーマットで色を指定出来ます、/help eval を参照)` +** 説明: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `"-- %a, %d %b %Y --"`) +* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2* +** 説明: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)` +** タイプ: 文字列 +** 値: 未制約文字列 (デフォルト値: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`) + * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch* ** 説明: `セットされた場合、eat_newline_glitch は 0 になる; これは各行の末尾に新しい行を追加しないために使われ、WeeChat から別のアプリケーションにテキストをコピー/ペーストする際にテキストの改行を行わない (致命的な表示上の問題を引き起こすため、このオプションはデフォルトで無効化されている)` ** タイプ: ブール @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2639,9 +2639,22 @@ msgstr "zobrazit speiální zprávy při změně dne" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci " +"data/času)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci " "data/času)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-18 19:01+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -3008,9 +3008,22 @@ msgstr "bei einem Datumswechsel wird eine entsprechende Nachricht angezeigt" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"Format für die Datumsanzeige, wenn ein neuer Tag anbricht (siehe man " +"strftime für Platzhalter für das Datum und die Uhrzeit)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "Format für die Datumsanzeige, wenn ein neuer Tag anbricht (siehe man " "strftime für Platzhalter für das Datum und die Uhrzeit)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2789,9 +2789,22 @@ msgstr "mostrar un mensaje especial cuando el día cambia" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"formato de hora para el elemento de barra \"time\" (ver el manual de " +"strftime para los especificadores de fecha/hora)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "formato de hora para el elemento de barra \"time\" (ver el manual de " "strftime para los especificadores de fecha/hora)" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" -"PO-Revision-Date: 2013-08-28 21:25+0200\n" +"POT-Creation-Date: 2013-09-01 18:16+0200\n" +"PO-Revision-Date: 2013-09-01 15:56+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -2923,13 +2923,29 @@ msgstr "affiche un message quand le jour change" #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" msgstr "" -"message affiché lorsque le jour a changé (voir man strftime pour le format " -"de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des " -"couleurs avec le format \"${color:xxx}\", voir /help eval)" +"message affiché lorsque le jour a changé, avec une date affichée (par " +"exemple au début d'un tampon) (voir man strftime pour le format de date/" +"heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs " +"avec le format \"${color:xxx}\", voir /help eval)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" +msgstr "" +"message affiché lorsque le jour a changé, avec deux dates affichées (entre " +"deux messages); les formats pour la seconde date doivent démarrer par deux " +"\"%\" car strftime est appelé deux fois sur cette chaîne (voir man strftime " +"pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez " +"utiliser des couleurs avec le format \"${color:xxx}\", voir /help eval)" msgid "" "if set, the eat_newline_glitch will be set to 0; this is used to not add new " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2291,9 +2291,20 @@ msgstr "speciális üzenet az aktuális nap megváltozásakor" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "új nap kezdetével megjelenő időbélyeg" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "új nap kezdetével megjelenő időbélyeg" msgid "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2837,9 +2837,22 @@ msgstr "mostra un messaggio speciale al cambio di data" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"formato dell'ora per l'elemento barra \"time\" (consultare man strftime per " +"gli specificatori data/ora)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "formato dell'ora per l'elemento barra \"time\" (consultare man strftime per " "gli specificatori data/ora)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-29 15:13+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-27 03:22+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" @@ -2843,10 +2843,25 @@ msgid "display special message when day changes" msgstr "日付が変わった際に特殊メッセージを表示" #. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"日付が変わった時に表示される時間のフォーマット (日付/時間指定子は strftime " +"の man を参照) (注意: 値は評価されるため \"${color:xxx}\" フォーマットで色を" +"指定出来ます、/help eval を参照)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "日付が変わった時に表示される時間のフォーマット (日付/時間指定子は strftime " "の man を参照) (注意: 値は評価されるため \"${color:xxx}\" フォーマットで色を" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2862,9 +2862,22 @@ msgstr "wyświetlaj specjalną wiadomość, kiedy zmienia się dzień" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"format czasu dla elementu paska \"time\" (zobacz man strftime dla " +"specyfikatorów daty/czasu)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "format czasu dla elementu paska \"time\" (zobacz man strftime dla " "specyfikatorów daty/czasu)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1b4d87952..ec6ecd016 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2709,9 +2709,22 @@ msgstr "mostra uma mensagem especial quando o dia muda" #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" +"formato de tempo para o item de barra \"time\" (veja man strftime para " +"especificadores de data/tempo)" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" "formato de tempo para o item de barra \"time\" (veja man strftime para " "especificadores de data/tempo)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2313,9 +2313,20 @@ msgstr "отображать специальное сообщение при #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "отображение маркера даты при смене дня" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +#, fuzzy +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "отображение маркера даты при смене дня" msgid "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2052,9 +2052,19 @@ msgstr "" #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index c81a3bef0..085f44703 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-28 21:24+0200\n" +"POT-Creation-Date: 2013-09-01 15:56+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2056,9 +2056,19 @@ msgstr "" #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" -"message displayed when the day has changed (see man strftime for date/time " -"specifiers) (note: content is evaluated, so you can use colors with format " -"\"${color:xxx}\", see /help eval)" +"message displayed when the day has changed, with one date displayed (for " +"example at beginning of buffer) (see man strftime for date/time specifiers) " +"(note: content is evaluated, so you can use colors with format \"${color:" +"xxx}\", see /help eval)" +msgstr "" + +#. TRANSLATORS: string "${color:xxx}" must NOT be translated +msgid "" +"message displayed when the day has changed, with two dates displayed " +"(between two messages); the second date specifiers must start with two \"%\" " +"because strftime is called two times on this string (see man strftime for " +"date/time specifiers) (note: content is evaluated, so you can use colors " +"with format \"${color:xxx}\", see /help eval)" msgstr "" msgid "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 0e217deaf..f2a86341d 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -100,6 +100,7 @@ struct t_config_option *config_look_command_chars; struct t_config_option *config_look_confirm_quit; struct t_config_option *config_look_day_change; struct t_config_option *config_look_day_change_message; +struct t_config_option *config_look_day_change_message2; struct t_config_option *config_look_eat_newline_glitch; struct t_config_option *config_look_emphasized_attributes; struct t_config_option *config_look_highlight; @@ -2072,10 +2073,23 @@ config_weechat_init_options () weechat_config_file, ptr_section, "day_change_message", "string", /* TRANSLATORS: string "${color:xxx}" must NOT be translated */ - N_("message displayed when the day has changed (see man strftime for " + N_("message displayed when the day has changed, with one date displayed " + "(for example at beginning of buffer) (see man strftime for " "date/time specifiers) (note: content is evaluated, so you can use " "colors with format \"${color:xxx}\", see /help eval)"), NULL, 0, 0, "-- %a, %d %b %Y --", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_day_change_message2 = config_file_new_option ( + weechat_config_file, ptr_section, + "day_change_message2", "string", + /* TRANSLATORS: string "${color:xxx}" must NOT be translated */ + N_("message displayed when the day has changed, with two dates displayed " + "(between two messages); the second date specifiers must start with " + "two \"%\" because strftime is called two times on this string " + "(see man strftime for date/time specifiers) (note: content is " + "evaluated, so you can use colors with format \"${color:xxx}\", " + "see /help eval)"), + NULL, 0, 0, "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --", NULL, 0, NULL, NULL, + &config_change_buffers, NULL, NULL, NULL); config_look_eat_newline_glitch = config_file_new_option ( weechat_config_file, ptr_section, "eat_newline_glitch", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index a3d13ec03..77200875d 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -117,6 +117,7 @@ extern struct t_config_option *config_look_command_chars; extern struct t_config_option *config_look_confirm_quit; extern struct t_config_option *config_look_day_change; extern struct t_config_option *config_look_day_change_message; +extern struct t_config_option *config_look_day_change_message2; extern struct t_config_option *config_look_eat_newline_glitch; extern struct t_config_option *config_look_emphasized_attributes; extern struct t_config_option *config_look_highlight; diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index e7be8fe11..5756efd5d 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -594,21 +594,29 @@ gui_chat_display_word (struct t_gui_window *window, void gui_chat_display_day_changed (struct t_gui_window *window, - struct tm *date, int simulate) + struct tm *date1, struct tm *date2, + int simulate) { - char message[1024], *message_with_color; + char temp_message[1024], message[1024], *message_with_color; if (simulate) return; - message_with_color = NULL; - /* build the message to display */ - strftime (message, sizeof (message), - CONFIG_STRING(config_look_day_change_message), date); + if (date1) + { + strftime (temp_message, sizeof (temp_message), + CONFIG_STRING(config_look_day_change_message2), date1); + strftime (message, sizeof (message), temp_message, date2); + } + else + { + strftime (message, sizeof (message), + CONFIG_STRING(config_look_day_change_message), date2); + } - if (strstr (message, "${")) - message_with_color = eval_expression (message, NULL, NULL, NULL); + message_with_color = (strstr (message, "${")) ? + eval_expression (message, NULL, NULL, NULL) : NULL; /* display the message */ gui_window_coords_init_line (window, window->win_chat_cursor_y); @@ -1241,7 +1249,8 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, || (local_time.tm_mon != local_time2.tm_mon) || (local_time.tm_year != local_time2.tm_year)) { - gui_chat_display_day_changed (window, &local_time2, simulate); + gui_chat_display_day_changed (window, NULL, &local_time2, + simulate); gui_chat_display_new_line (window, num_lines, count, &lines_displayed, simulate); pre_lines_displayed++; @@ -1438,7 +1447,8 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, || (local_time.tm_mon != local_time2.tm_mon) || (local_time.tm_year != local_time2.tm_year)) { - gui_chat_display_day_changed (window, &local_time2, simulate); + gui_chat_display_day_changed (window, &local_time, &local_time2, + simulate); gui_chat_display_new_line (window, num_lines, count, &lines_displayed, simulate); } |