diff options
| -rw-r--r-- | ChangeLog.asciidoc | 3 | ||||
| -rw-r--r-- | doc/de/weechat_faq.de.asciidoc | 17 | ||||
| -rw-r--r-- | doc/de/weechat_user.de.asciidoc | 22 | ||||
| -rw-r--r-- | doc/en/weechat_faq.en.asciidoc | 11 | ||||
| -rw-r--r-- | doc/en/weechat_user.en.asciidoc | 19 | ||||
| -rw-r--r-- | doc/fr/weechat_faq.fr.asciidoc | 10 | ||||
| -rw-r--r-- | doc/fr/weechat_user.fr.asciidoc | 20 | ||||
| -rw-r--r-- | doc/it/weechat_faq.it.asciidoc | 18 | ||||
| -rw-r--r-- | doc/it/weechat_user.it.asciidoc | 21 | ||||
| -rw-r--r-- | doc/ja/weechat_faq.ja.asciidoc | 18 | ||||
| -rw-r--r-- | doc/ja/weechat_user.ja.asciidoc | 21 | ||||
| -rw-r--r-- | doc/pl/weechat_faq.pl.asciidoc | 16 | ||||
| -rw-r--r-- | doc/pl/weechat_user.pl.asciidoc | 21 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 10 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/pl.po | 6 | ||||
| -rw-r--r-- | po/pt_BR.po | 4 | ||||
| -rw-r--r-- | po/ru.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 4 | ||||
| -rw-r--r-- | po/weechat.pot | 4 | ||||
| -rw-r--r-- | src/core/weechat.c | 65 |
26 files changed, 208 insertions, 136 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 3088cbdc9..055b5a762 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -19,6 +19,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === New features +* core: add tag "term_warning" in warnings about wrong $TERM on startup * core: add option weechat.look.paste_auto_add_newline (issue #543) * core: display a more explicit error when a filter fails to be added (issue #522) @@ -38,6 +39,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === Bugs fixed +* core: don't complain any more about "tmux" and "tmux-256color" $TERM values + when WeeChat is running under tmux (issue #519) * core: fix truncated messages after a word with a length of zero on screen (for example a zero width space: U+200B) (bug #40985, issue #502) * api: fix handle of invalid escape in function string_convert_escaped_chars() diff --git a/doc/de/weechat_faq.de.asciidoc b/doc/de/weechat_faq.de.asciidoc index 2b7b032d9..4d48c7293 100644 --- a/doc/de/weechat_faq.de.asciidoc +++ b/doc/de/weechat_faq.de.asciidoc @@ -145,9 +145,15 @@ werden. Bitte überprüfe die Ausgabe von `echo $TERM` in Deinem Terminal. Abhängig davon von wo WeeChat gestartet wird, solltest Du folgenden Wert haben: -* falls WeeChat lokal oder auf einem entfernten Rechner läuft, je nach benutztem - Terminal: 'xterm', 'xterm-256color', 'rxvt-unicode', 'rxvt-256color', ... -* falls WeeChat unter screen läuft, sollte der Wert 'screen' oder 'screen-256color' lauten. +// TRANSLATION MISSING +* if WeeChat runs locally or on a remote machine without screen nor tmux, it + depends on the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', + 'rxvt-256color', ... +// TRANSLATION MISSING +* if WeeChat runs under screen, you should have 'screen' or 'screen-256color', +// TRANSLATION MISSING +* if WeeChat runs under tmux, you should have 'tmux', 'tmux-256color', + 'screen' or 'screen-256color'. Falls nötig korrigiere den Wert Deiner Variablen TERM: `export TERM="xxx"`. @@ -338,7 +344,10 @@ Zuerst sollte überprüft werden ob die 'TERM'-Umgebungsvariable korrekt hinterl ist. Folgende Werte sind zu empfehlen: * falls screen genutzt wird: 'screen-256color' -* screen wird nicht genutzt: 'xterm-256color', 'rxvt-256color', 'putty-256color',... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Es sollte das Paket "ncurses-term" installiert werden um die Werte der 'TERM' diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc index d56116509..282e464aa 100644 --- a/doc/de/weechat_user.de.asciidoc +++ b/doc/de/weechat_user.de.asciidoc @@ -1505,18 +1505,15 @@ was die Farbdarstellung in WeeChat betrifft: [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | Farben | Paare ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | Farben | Paare +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ Auch falls die Terminal-Emulation mehr als 256 Farbpaare unterstützten sollte -können lediglich 256 Farbpaare durch WeeChat genutzt werden, dies ist eine Einschränkung -von ncurses. - Mittels `weechat --colors` oder dem internen WeeChat-Befehl `/color` kann man sich die Einschränkungen für die jeweilige Umgebungsvariable anzeigen lassen. @@ -1524,7 +1521,10 @@ Folgende Werte sind für die 'TERM'-Umgebungsvariable zu empfehlen, sofern man 2 nutzen möchte: * falls screen genutzt wird: 'screen-256color' -* screen wird nicht genutzt: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Es sollte das Paket "ncurses-term" installiert werden um die Werte der 'TERM' diff --git a/doc/en/weechat_faq.en.asciidoc b/doc/en/weechat_faq.en.asciidoc index 0402392eb..f583579ff 100644 --- a/doc/en/weechat_faq.en.asciidoc +++ b/doc/en/weechat_faq.en.asciidoc @@ -128,10 +128,12 @@ output of `echo $TERM` in your terminal). Depending on where you launch WeeChat, you should have: -* if WeeChat runs locally or on a remote machine without screen, it depends on - the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', +* if WeeChat runs locally or on a remote machine without screen nor tmux, it + depends on the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', 'rxvt-256color', ... -* if WeeChat runs under screen, you should have 'screen' or 'screen-256color'. +* if WeeChat runs under screen, you should have 'screen' or 'screen-256color', +* if WeeChat runs under tmux, you should have 'tmux', 'tmux-256color', + 'screen' or 'screen-256color'. If needed, fix your TERM variable: `export TERM="xxx"`. @@ -318,7 +320,8 @@ First check that your 'TERM' environment variable is correct, recommended values are: * under screen: 'screen-256color' -* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',... +* under tmux: 'screen-256color' or 'tmux-256color' +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] You may have to install package "ncurses-term" to use these values in 'TERM' diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc index 8cd7a92fb..f9d8981a6 100644 --- a/doc/en/weechat_user.en.asciidoc +++ b/doc/en/weechat_user.en.asciidoc @@ -1476,24 +1476,23 @@ for colors in WeeChat: [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | Colors | Pairs ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | Colors | Pairs +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be -used in WeeChat, because of a ncurses limitation. - You can run `weechat --colors` or use command `/color` in WeeChat to display limits for your environment. Some recommended values for 'TERM' if you want 256 colors: * under screen: 'screen-256color' -* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +* under tmux: 'screen-256color' or 'tmux-256color' +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] You may have to install package "ncurses-term" to use these values in 'TERM' diff --git a/doc/fr/weechat_faq.fr.asciidoc b/doc/fr/weechat_faq.fr.asciidoc index 0f2a06bdb..a5688b999 100644 --- a/doc/fr/weechat_faq.fr.asciidoc +++ b/doc/fr/weechat_faq.fr.asciidoc @@ -134,10 +134,12 @@ sortie de `echo $TERM` dans votre terminal). Selon la façon de lancer WeeChat, vous devriez avoir : -* si WeeChat tourne en local ou sur une machine distante sans screen : +* si WeeChat tourne en local ou sur une machine distante sans screen ni tmux : cela dépend du terminal utilisé : 'xterm', 'xterm-256color', 'rxvt-unicode', 'rxvt-256color', etc... -* si WeeChat tourne sous screen, vous devriez avoir 'screen' ou 'screen-256color'. +* si WeeChat tourne sous screen, vous devriez avoir 'screen' ou 'screen-256color', +* si WeeChat tourne sous tmux, vous devriez avoir 'tmux', 'tmux-256color', + 'screen' ou 'screen-256color'. Si besoin, corrigez la variable TERM : `export TERM="xxx"`. @@ -330,7 +332,9 @@ Premièrement vérifiez que votre variable d'environnement 'TERM' est correcte, les valeurs recommandées sont : * sous screen : 'screen-256color' -* en dehors de screen : 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +* sous tmux : 'screen-256color' ou 'tmux-256color' +* en dehors de screen/tmux : 'xterm-256color', 'rxvt-256color', + 'putty-256color', ... [NOTE] Vous devrez peut-être installer le paquet "ncurses-term" pour utiliser ces diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc index 7fb99869b..4c0526ff4 100644 --- a/doc/fr/weechat_user.fr.asciidoc +++ b/doc/fr/weechat_user.fr.asciidoc @@ -1519,24 +1519,24 @@ limites suivantes pour les couleurs dans WeeChat : [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | Couleurs | Paires ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | Couleurs | Paires +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ Même si votre terminal supporte plus de 256 paires, seules 256 paires -peuvent être utilisées dans WeeChat, en raison d'une limitation de ncurses. - Vous pouvez lancer `weechat --colors` ou utiliser la commande `/color` dans WeeChat pour afficher les limites de votre environnement. Quelques valeurs recommandées pour 'TERM' si vous voulez 256 couleurs : * sous screen : 'screen-256color' -* en dehors de screen : 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +* sous tmux : 'screen-256color' ou 'tmux-256color' +* en dehors de screen/tmux : 'xterm-256color', 'rxvt-256color', + 'putty-256color', ... Si vous utilisez screen, vous pouvez ajouter cette ligne dans votre '~/.screenrc': diff --git a/doc/it/weechat_faq.it.asciidoc b/doc/it/weechat_faq.it.asciidoc index ab2577c8f..4a4480f73 100644 --- a/doc/it/weechat_faq.it.asciidoc +++ b/doc/it/weechat_faq.it.asciidoc @@ -143,10 +143,15 @@ shell (consultare l'output di `echo $TERM` nel terminale). A seconda di dove viene eseguito WeeChat, si dovrebbe avere: -* se WeeChat viene eseguito localmente o su una macchina remota senza - screen, dipende dal terminale utilizzato: 'xterm', 'xterm-256color', - 'rxvt-unicode', 'rxvt-256color', ... -* se WeeChat viene eseguito in screen, dovrebbe essere 'screen' o 'screen-256color'. +// TRANSLATION MISSING +* if WeeChat runs locally or on a remote machine without screen nor tmux, it + depends on the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', + 'rxvt-256color', ... +// TRANSLATION MISSING +* if WeeChat runs under screen, you should have 'screen' or 'screen-256color', +// TRANSLATION MISSING +* if WeeChat runs under tmux, you should have 'tmux', 'tmux-256color', + 'screen' or 'screen-256color'. Se necessario, correggere la variabile TERM: `export TERM="xxx"`. @@ -341,7 +346,10 @@ Per prima cosa verificare che la variabile di ambiente 'TERM' sia corretta, i valori raccomandati sono: * con screen: 'screen-256color' -* al di fuori di screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Potrebbe essere necessario installare il pacchetto "ncurses-term" per usare diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc index da233209f..e907449f6 100644 --- a/doc/it/weechat_user.it.asciidoc +++ b/doc/it/weechat_user.it.asciidoc @@ -1551,24 +1551,25 @@ seguenti limiti per i colori in WeeChat: [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | Colori | Coppie ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | Colori | Coppie +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ Anche se il terminale supporta più di 256 coppie, possono essere utilizzate -solo 256 coppie in WeeChat, a causa di una limitazione di ncurses. - È possibile eseguire `weechat --colors` o utilizzare il comando `/color` in WeeChat per visualizzare i limiti del proprio ambiente. Alcuni valori raccomandati per 'TERM' se si desiderano 256 colori: * con screen: 'screen-256color' -* al di fuori di screen: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Potrebbe essere necessario installare il pacchetto "ncurses-term" per usare diff --git a/doc/ja/weechat_faq.ja.asciidoc b/doc/ja/weechat_faq.ja.asciidoc index a51260bd5..3b732f84f 100644 --- a/doc/ja/weechat_faq.ja.asciidoc +++ b/doc/ja/weechat_faq.ja.asciidoc @@ -132,10 +132,15 @@ https://github.com/weechat/weechat/issues/79 WeeChat を起動した場所に依存しますが、以下の値を持つはずです: -* WeeChat を screen を使わずにローカル又はリモートマシンで起動した場合、 - 利用しているターミナルに依存します: 'xterm' 、'xterm-256color' 、'rxvt-unicode' 、 - 'rxvt-256color' 、... -* WeeChat を screen 内で起動した場合、'screen' 又は 'screen-256color' 。 +// TRANSLATION MISSING +* if WeeChat runs locally or on a remote machine without screen nor tmux, it + depends on the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', + 'rxvt-256color', ... +// TRANSLATION MISSING +* if WeeChat runs under screen, you should have 'screen' or 'screen-256color', +// TRANSLATION MISSING +* if WeeChat runs under tmux, you should have 'tmux', 'tmux-256color', + 'screen' or 'screen-256color'. もし必要であれば、TERM 変数を修正してください: `export TERM="xxx"` @@ -321,7 +326,10 @@ WeeChat ≥ 1.0 では、再起動せずに変更できます: お勧めの値は: * screen の中: 'screen-256color' -* screen の外: 'xterm-256color' 、'rxvt-256color' 、'putty-256color' 、... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] これらの値を 'TERM' に設定するには、"ncurses-term" diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc index 0f1fc757a..90096822d 100644 --- a/doc/ja/weechat_user.ja.asciidoc +++ b/doc/ja/weechat_user.ja.asciidoc @@ -1479,24 +1479,25 @@ WeeChat ではバーやチャットエリアにおけるテキスト表示に 25 [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | 色 | ペア ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | 色 | ペア +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ 端末が 256 ペア以上の表示をサポートしていても、WeeChat -では ncurses の制限により 256 ペア以上の表示は行えません。 - `weechat --colors` を実行するか、`/color` コマンドをin WeeChat の中で実行することで、色表示の制限を確認できます。 256 色を利用したい場合に推奨される 'TERM' 環境変数の値は: * screen の中: 'screen-256color' -* screen の外: 'xterm-256color' 、'rxvt-256color' 、'putty-256color' 、... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] 'TERM' 環境変数の値に上の値を設定するには、"ncurses-term" diff --git a/doc/pl/weechat_faq.pl.asciidoc b/doc/pl/weechat_faq.pl.asciidoc index 1853c02d7..136cb64eb 100644 --- a/doc/pl/weechat_faq.pl.asciidoc +++ b/doc/pl/weechat_faq.pl.asciidoc @@ -133,10 +133,15 @@ wynik `echo $TERM` w terminalu). W zależności, gdzie uruchamiasz WeeChat, powinieneś uzyskać: -* jeśli WeeChat jest uruchomiony lokalnie lub na zdalnej maszynie bez screena, - zależy od używanego terminala: 'xterm', 'xterm-256color', 'rxvt-unicode', +// TRANSLATION MISSING +* if WeeChat runs locally or on a remote machine without screen nor tmux, it + depends on the terminal used: 'xterm', 'xterm-256color', 'rxvt-unicode', 'rxvt-256color', ... -* jeśli WeeChat działa w screenie, należy użyć 'screen' lub 'screen-256color'. +// TRANSLATION MISSING +* if WeeChat runs under screen, you should have 'screen' or 'screen-256color', +// TRANSLATION MISSING +* if WeeChat runs under tmux, you should have 'tmux', 'tmux-256color', + 'screen' or 'screen-256color'. W razie potrzeby, popraw zmienna TERM: `export TERM="xxx"`. @@ -322,7 +327,10 @@ Najpierw należy sprawdzić czy wartość zmiennej środowiskowej 'TERM' jest po zalecane wartości to: * w screenie: 'screen-256color' -* poza screenem: 'xterm-256color', 'rxvt-256color', 'putty-256color',... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Może okazać się konieczne zainstalowanie pakietu "ncurses-term" w celu użycia diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc index 9d280efb8..08455c3d9 100644 --- a/doc/pl/weechat_user.pl.asciidoc +++ b/doc/pl/weechat_user.pl.asciidoc @@ -1491,24 +1491,25 @@ limity dla kolorów w WeeChat: [width="50%",cols="8,>2,>2",options="header"] |=== -| $TERM | Kolory | Pary ^(1)^ -| "rxvt-unicode", "xterm", ... | 88 | 256 -| "rxvt-256color", "xterm-256color", ... | 256 | 32767 -| "screen" | 8 | 64 -| "screen-256color" | 256 | 32767 +| $TERM | Kolory | Pary +| "rxvt-unicode", "xterm", ... | 88 | 256 +| "rxvt-256color", "xterm-256color", ... | 256 | 256 +| "screen" | 8 | 64 +| "screen-256color" | 256 | 256 +| "tmux" | 8 | 64 +| "tmux-256color" | 256 | 256 |=== -[NOTE] -^(1)^ Nawet w przypadku, kiedy twój terminal obsługuje więcej niż 256 par, WeeChat -może użyć ich tylko 256, ze względu na ograniczenia ncurses. - Możesz wykonać `weechat --colors` lub użyć komendy `/color` w WeeChat, aby wyświetlić limity dla twojego środowiska. Niektóre z zalecanych wartości dla 'TERM' jeśli chcesz używać 256 kolorów: * dla screena: 'screen-256color' -* bez screena: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... +// TRANSLATION MISSING +* under tmux: 'screen-256color' or 'tmux-256color' +// TRANSLATION MISSING +* outside screen/tmux: 'xterm-256color', 'rxvt-256color', 'putty-256color', ... [NOTE] Być może konieczne jest zainstalowanie pakietu "ncurses-term", w celu użycia @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-10-25 15:19+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -221,10 +221,10 @@ msgstr "" "connect ( podívejte se na /help server)." #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux" -#, c-format +#, fuzzy, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" "%sVarování: WeeChat běží jako %s a $TERM je \"%s\", což může způsobovat " "chyby zobrazení; $TERM by měl být nastaven na \"screen-256color\" nebo " @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-11-12 16:23+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" @@ -229,10 +229,10 @@ msgstr "" "die Befehle /server und /connect verwendet werden (siehe /help server)." #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux" -#, c-format +#, fuzzy, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" "%sWarnung: WeeChat läuft in einer %s-Sitzung und die Umgebungsvariable $TERM " "lautet \"%s\". Diese Einstellung kann zu Darstellungsfehlern führen; $TERM " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-09-30 20:55+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -219,7 +219,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" -"PO-Revision-Date: 2015-11-04 18:10+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" +"PO-Revision-Date: 2015-11-12 19:55+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -225,11 +225,11 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" "%sAttention : WeeChat tourne sous %s et $TERM est \"%s\", ce qui peut poser " -"des problèmes d'affichage ; $TERM devrait être égal à \"screen-256color\" ou " -"\"screen\"" +"des problèmes d'affichage ; $TERM devrait être égal à l'une de ces valeurs : " +"%s" #, c-format msgid "%sYou should add this line in the file %s: %s" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-09-09 09:13+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -214,7 +214,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-09-30 20:55+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -211,7 +211,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-11-04 18:11+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -219,10 +219,10 @@ msgstr "" "使ってください (/help server 参照)。" #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux" -#, c-format +#, fuzzy, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" "%s警告: WeeChat は %s の中で実行中で $TERM は \"%s\" です、この状態は表示上の" "バグを引き起こす恐れがあります; $TERM を \"screen-256color\" または \"screen" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-11-04 18:12+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -222,10 +222,10 @@ msgstr "" "connect (zobacz /help server)." #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux" -#, c-format +#, fuzzy, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" "%sUwaga: WeeChat działa pod %s i term $TERM = \"%s\", co może powodować " "błędy wyświetlania; $TERM powinno być ustawione na \"screen-256color\" lub " diff --git a/po/pt_BR.po b/po/pt_BR.po index 83df104e4..aa600c5cd 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: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-09-30 20:56+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -243,7 +243,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-09-09 09:13+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -223,7 +223,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\n" "PO-Revision-Date: 2015-03-10 21:33+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -185,7 +185,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format diff --git a/po/weechat.pot b/po/weechat.pot index 4cbe5d007..f6260a76b 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: 2015-11-04 18:09+0100\n" +"POT-Creation-Date: 2015-11-12 16:20+0100\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" @@ -182,7 +182,7 @@ msgstr "" #, c-format msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " -"display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" +"display bugs; $TERM should be set to one of these values: %s" msgstr "" #, c-format diff --git a/src/core/weechat.c b/src/core/weechat.c index db11e991a..5bc295fdd 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -462,35 +462,62 @@ void weechat_term_check () { char *term, *sty, *tmux; + const char *screen_terms = "screen-256color, screen"; + const char *tmux_terms = "tmux-256color, tmux, screen-256color, screen"; + const char *ptr_terms; int is_term_ok, is_screen, is_tmux; term = getenv ("TERM"); sty = getenv ("STY"); tmux = getenv ("TMUX"); - is_term_ok = (term && (strncmp (term, "screen", 6) == 0)); is_screen = (sty && sty[0]); is_tmux = (tmux && tmux[0]); - if ((is_screen || is_tmux) && !is_term_ok) + if (is_screen || is_tmux) { - gui_chat_printf ( - NULL, - /* TRANSLATORS: the "under %s" can be "under screen" or "under tmux" */ - _("%sWarning: WeeChat is running under %s and $TERM is \"%s\", " - "which can cause display bugs; $TERM should be set to " - "\"screen-256color\" or \"screen\""), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - (is_screen) ? "screen" : "tmux", - (term) ? term : ""); - gui_chat_printf ( - NULL, - _("%sYou should add this line in the file %s: %s"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - (is_screen) ? "~/.screenrc" : "~/.tmux.conf", - (is_screen) ? - "term screen-256color" : - "set -g default-terminal \"screen-256color\""); + /* check if $TERM is OK (according to screen/tmux) */ + is_term_ok = 0; + ptr_terms = NULL; + if (is_screen) + { + is_term_ok = (term && (strncmp (term, "screen", 6) == 0)); + ptr_terms = screen_terms; + } + else if (is_tmux) + { + is_term_ok = (term + && ((strncmp (term, "screen", 6) == 0) + || (strncmp (term, "tmux", 4) == 0))); + ptr_terms = tmux_terms; + } + + /* display a warning if $TERM is NOT OK */ + if (!is_term_ok) + { + gui_chat_printf_date_tags ( + NULL, + 0, + "term_warning", + /* TRANSLATORS: the "under %s" can be "under screen" or "under tmux" */ + _("%sWarning: WeeChat is running under %s and $TERM is \"%s\", " + "which can cause display bugs; $TERM should be set to one " + "of these values: %s"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + (is_screen) ? "screen" : "tmux", + (term) ? term : "", + ptr_terms); + gui_chat_printf_date_tags ( + NULL, + 0, + "term_warning", + _("%sYou should add this line in the file %s: %s"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + (is_screen) ? "~/.screenrc" : "~/.tmux.conf", + (is_screen) ? + "term screen-256color" : + "set -g default-terminal \"tmux-256color\""); + } } } |