pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 09:43:13 +02:00
Code Activity

core: do now allow buffer property "input_multiline" to be reset to 0, except if buffer has no lines

Browse Source
This commit is contained in:
Sébastien Helleu
2023-04-19 20:50:38 +02:00
parent e5573bfb4d
commit 5193c0aeea
15 changed files with 114 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
po/cs.po
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5084,6 +5084,12 @@ msgid "%sMaximum number of buffers is reached (%d)"
msgstr ""
"maximální počet navštívených bufferů uchovaných v paměti (0 = nekonečně)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sChyba: je možné spojovat pouze bufferz s formátovaným obsahem"
po/de.po
+7 -1
View File
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-04-13 20:09+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German - Germany <weechatter@arcor.de>\n"
@@ -6308,6 +6308,12 @@ msgstr "%sEin Buffer mit dem selben Namen (%s) existiert bereits"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sMaximale Anzahl an Buffern erreicht (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sEs ist nur möglich Buffer mit formatiertem Inhalt zusammenzufügen"
po/es.po
+7 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5697,6 +5697,12 @@ msgstr "%sError: un buffer con el mismo nombre (%s) ya existe"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "número máximo de buffers visitados en memoria"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr ""
po/fr.po
+10 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"PO-Revision-Date: 2023-04-19 16:34+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-04-20 22:35+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -6173,6 +6173,14 @@ msgstr "%sUn tampon avec le même nom (%s) existe déjà"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sLe nombre maximum de tampons est atteint (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
"%sLa propriété de tampon \"%s\" ne peut pas être désactivée si le tampon "
"contient des lignes (tampon : %s)"
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr ""
po/hu.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2022-10-15 22:51+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4629,6 +4629,12 @@ msgid "%sMaximum number of buffers is reached (%d)"
msgstr ""
"felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr ""
po/it.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5363,6 +5363,12 @@ msgstr "%sErrore: un buffer con lo stesso nome (%s) esiste già"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "numero massimo di buffer visitati da memorizzare"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sErrore: è possibile solo unire i buffer con il contenuto formattato"
po/ja.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -5962,6 +5962,12 @@ msgstr "%sエラー: 同じ名前 (%s) のバッファがあります"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sエラー: バッファ数の最大値に達しました (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sエラー: 書式ありバッファ以外はマージできません"
po/pl.po
+7 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-04-13 20:09+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -6424,6 +6424,12 @@ msgstr "%sIstnieje już bufor o nazwie (%s)"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sOsiągnięto maksymalną ilość buforów (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sMożliwe jest tylko połączenie buforów z sformatowaną zawartością"
po/pt.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -6008,6 +6008,12 @@ msgstr "%sErro: já existe um buffer com o mesmo nome (%s)"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sErro: o número máximo de buffers foi atingido (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sErro: só é possível unir buffers com conteúdo formatado"
po/pt_BR.po
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5322,6 +5322,12 @@ msgstr "%sErro: um buffer com o mesmo nome (%s) já existe"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "número máximo de buffers visitados a serem mantidos em memória"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, fuzzy, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sErro: só é possível mesclar buffers com conteúdo formatado"
po/ru.po
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4667,6 +4667,12 @@ msgstr ""
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "максимальное количество команд в истории (0 = не ограничено)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr ""
po/sr.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-04-13 20:10+0200\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6403,6 +6403,12 @@ msgstr "%sВећ постоји бафер са истим именом (%s)"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sДостигнут је максималан број бафера (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sСпајање је могуће само за бафере са форматираним садржајем"
po/tr.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+0200\n"
"PO-Revision-Date: 2023-03-25 21:13+0100\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6419,6 +6419,12 @@ msgstr "%sAynı adlı başka bir arabellek (%s) halihazırda var"
msgid "%sMaximum number of buffers is reached (%d)"
msgstr "%sEn çok arabellek sayısına ulaşıldı (%d)"
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr "%sYalnızca biçimlendirilmiş içeriğe iye arabellekler birleştirilebilir"
po/weechat.pot
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-04-19 14:56+0200\n"
"POT-Creation-Date: 2023-04-20 22:34+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"
@@ -4249,6 +4249,12 @@ msgstr ""
msgid "%sMaximum number of buffers is reached (%d)"
msgstr ""
#, c-format
msgid ""
"%sBuffer property \"%s\" can not be disabled if buffer contains lines "
"(buffer: %s)"
msgstr ""
#, c-format
msgid "%sIt is only possible to merge buffers with formatted content"
msgstr ""
src/gui/gui-buffer.c
+13
View File
@@ -2102,6 +2102,19 @@ gui_buffer_set_input_multiline (struct t_gui_buffer *buffer,
if (!buffer)
return;
if (buffer->input_multiline
&& !input_multiline
&& buffer->own_lines->first_line)
{
gui_chat_printf (NULL,
_("%sBuffer property \"%s\" can not be disabled "
"if buffer contains lines (buffer: %s)"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
"input_multiline",
buffer->full_name);
return;
}
buffer->input_multiline = (input_multiline) ? 1 : 0;
}