From b29f18d7eac0980adb60ac04597ce616d8e199fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 1 Apr 2017 12:26:48 +0200 Subject: [PATCH] aspell: add options to control delimiters in suggestions (closes #940) New options: - aspell.color.suggestion_delimiter_dict - aspell.color.suggestion_delimiter_word - aspell.look.suggestion_delimiter_dict - aspell.look.suggestion_delimiter_word Option renamed: - aspell.color.suggestions -> aspell.color.suggestion --- ChangeLog.adoc | 1 + ReleaseNotes.adoc | 10 +++ doc/de/autogen/user/aspell_options.adoc | 28 ++++++++- doc/de/weechat_user.de.adoc | 3 +- doc/en/autogen/user/aspell_options.adoc | 28 ++++++++- doc/en/weechat_user.en.adoc | 1 + doc/fr/autogen/user/aspell_options.adoc | 28 ++++++++- doc/fr/weechat_user.fr.adoc | 1 + doc/it/autogen/user/aspell_options.adoc | 28 ++++++++- doc/it/weechat_user.it.adoc | 1 + doc/ja/autogen/user/aspell_options.adoc | 28 ++++++++- doc/ja/weechat_user.ja.adoc | 1 + doc/pl/autogen/user/aspell_options.adoc | 28 ++++++++- doc/pl/weechat_user.pl.adoc | 3 +- po/cs.po | 23 ++++++- po/de.po | 24 ++++++- po/es.po | 24 ++++++- po/fr.po | 35 +++++++++-- po/hu.po | 23 ++++++- po/it.po | 23 ++++++- po/ja.po | 24 ++++++- po/pl.po | 24 ++++++- po/pt.po | 24 ++++++- po/pt_BR.po | 23 ++++++- po/ru.po | 23 ++++++- po/tr.po | 22 ++++++- po/weechat.pot | 22 ++++++- src/plugins/aspell/weechat-aspell-bar-item.c | 66 +++++++++++++------- src/plugins/aspell/weechat-aspell-config.c | 64 +++++++++++++++++-- src/plugins/aspell/weechat-aspell-config.h | 7 ++- 30 files changed, 571 insertions(+), 69 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 7306f97a1..e4b4a8c78 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -26,6 +26,7 @@ New features:: * buflist: new plugin "buflist" (bar item with list of buffers) * api: add arraylist functions: arraylist_new(), arraylist_size(), arraylist_get(), arraylist_search(), arraylist_insert(), arraylist_add(), arraylist_remove(), arraylist_clear(), arraylist_free() * api: add dynamic string functions: string_dyn_alloc(), string_dyn_copy(), string_dyn_concat(), string_dyn_free() + * aspell: add options to control delimiters in suggestions: aspell.color.suggestion_delimiter_{dict|word} and aspell.look.suggestion_delimiter_{dict|word} (issue #940) * irc: send signal "irc_server_lag_changed" and store the lag in the server buffer (local variable) Improvements:: diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index 61a8fbdab..e762e051c 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -17,6 +17,16 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] (file _ChangeLog.adoc_ in sources). +[[v1.8]] +== Version 1.8 (under dev) + +[[v1.8_aspell_options]] +=== Aspell options + +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]] == Version 1.7 (2017-01-15) diff --git a/doc/de/autogen/user/aspell_options.adoc b/doc/de/autogen/user/aspell_options.adoc index 0fab0bd19..b0e753b00 100644 --- a/doc/de/autogen/user/aspell_options.adoc +++ b/doc/de/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen ** Standardwert: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** Beschreibung: pass:none[Textfarbe für die Vorschläge der Rechtsschreibkorrektur (Statusbar)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** Beschreibung: pass:none[text color for suggestion on a misspelled word in bar item "aspell_suggest"] ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen ** Standardwert: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** Beschreibung: pass:none[text color for delimiters displayed between two dictionaries in bar item "aspell_suggest"] +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen +** Standardwert: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** Beschreibung: pass:none[text color for delimiters displayed between two words in bar item "aspell_suggest"] +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen +** Standardwert: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** Beschreibung: pass:none[delimiter displayed between two dictionaries in bar item "aspell_suggest"] +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette +** Standardwert: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** Beschreibung: pass:none[delimiter displayed between two words in bar item "aspell_suggest"] +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette +** Standardwert: `+","+` diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 637231547..b7e9bd688 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -2089,6 +2089,7 @@ Sektionen: | check | /set aspell.check.* | Optionen um Einstellungen an der Rechtschreibprüfung vorzunehmen. | dict | <> + /set aspell.dict.* | Wörterbücher für Buffer (Optionen können in Sektion hinzugefügt/entfernt werden). +| look | /set aspell.look.* | Erscheinungsbild. | option | /set aspell.option.* | <> (Optionen können in Sektion hinzugefügt/entfernt werden). |=== @@ -2164,7 +2165,7 @@ Sektionen: |=== | Sektion | Steuerbefehl | Beschreibung | format | /set buflist.format.* | Formats used to display list of buffers. -| look | /set buflist.look.* | Look and feel. +| look | /set buflist.look.* | Erscheinungsbild. |=== Optionen: diff --git a/doc/en/autogen/user/aspell_options.adoc b/doc/en/autogen/user/aspell_options.adoc index ddae349d2..de55ffc42 100644 --- a/doc/en/autogen/user/aspell_options.adoc +++ b/doc/en/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline ** default value: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** description: pass:none[text color for suggestions on a misspelled word (status bar)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** description: pass:none[text color for suggestion on a misspelled word in bar item "aspell_suggest"] ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline ** default value: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** description: pass:none[text color for delimiters displayed between two dictionaries in bar item "aspell_suggest"] +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline +** default value: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** description: pass:none[text color for delimiters displayed between two words in bar item "aspell_suggest"] +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline +** default value: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** description: pass:none[delimiter displayed between two dictionaries in bar item "aspell_suggest"] +** type: string +** values: any string +** default value: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** description: pass:none[delimiter displayed between two words in bar item "aspell_suggest"] +** type: string +** values: any string +** default value: `+","+` diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index 49630f716..abd867662 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -2040,6 +2040,7 @@ Sections: | check | /set aspell.check.* | Options to control spell checking. | dict | <> + /set aspell.dict.* | Dictionaries used by buffer (options can be added/removed in section). +| look | /set aspell.look.* | Look and feel. | option | /set aspell.option.* | <> (options can be added/removed in section). |=== diff --git a/doc/fr/autogen/user/aspell_options.adoc b/doc/fr/autogen/user/aspell_options.adoc index cdc6c2641..d634e4e30 100644 --- a/doc/fr/autogen/user/aspell_options.adoc +++ b/doc/fr/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné ** valeur par défaut: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** description: pass:none[couleur du texte pour les suggestions sur un mot mal orthographié (barre de statut)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** description: pass:none[couleur du texte pour la suggestion sur un mot mal orthographié dans l'objet de barre "aspell_suggest"] ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné ** valeur par défaut: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** description: pass:none[couleur du texte pour les séparateurs affichés entre deux dictionnaires dans l'objet de barre "aspell_suggest"] +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné +** valeur par défaut: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** description: pass:none[couleur du texte pour les séparateurs affichés entre deux mots dans l'objet de barre "aspell_suggest"] +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné +** valeur par défaut: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** description: pass:none[séparateur affiché entre deux dictionnaires dans l'objet de barre "aspell_suggest"] +** type: chaîne +** valeurs: toute chaîne +** valeur par défaut: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** description: pass:none[séparateur affiché entre deux mots dans l'objet de barre "aspell_suggest"] +** type: chaîne +** valeurs: toute chaîne +** valeur par défaut: `+","+` diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index 35b9e2543..5d70be639 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -2108,6 +2108,7 @@ Sections : | check | /set aspell.check.* | Options pour contrôler la vérification orthographique. | dict | <> + /set aspell.dict.* | Dictionnaires utilisés par tampon (les options peuvent être ajoutées/supprimées dans la section). +| look | /set aspell.look.* | Aspect/présentation. | option | /set aspell.option.* | <> (les options peuvent être ajoutées/supprimées dans la section). |=== diff --git a/doc/it/autogen/user/aspell_options.adoc b/doc/it/autogen/user/aspell_options.adoc index 52181e47c..35f1361c1 100644 --- a/doc/it/autogen/user/aspell_options.adoc +++ b/doc/it/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline ** valore predefinito: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** descrizione: pass:none[text color for suggestions on a misspelled word (status bar)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** descrizione: pass:none[text color for suggestion on a misspelled word in bar item "aspell_suggest"] ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline ** valore predefinito: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** descrizione: pass:none[text color for delimiters displayed between two dictionaries in bar item "aspell_suggest"] +** tipo: colore +** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline +** valore predefinito: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** descrizione: pass:none[text color for delimiters displayed between two words in bar item "aspell_suggest"] +** tipo: colore +** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline +** valore predefinito: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** descrizione: pass:none[delimiter displayed between two dictionaries in bar item "aspell_suggest"] +** tipo: stringa +** valori: qualsiasi stringa +** valore predefinito: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** descrizione: pass:none[delimiter displayed between two words in bar item "aspell_suggest"] +** tipo: stringa +** valori: qualsiasi stringa +** valore predefinito: `+","+` diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 97a9fa3ef..d4e8362fc 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -2152,6 +2152,7 @@ Sections: | check | /set aspell.check.* | Options to control spell checking. | dict | <> + /set aspell.dict.* | Dictionaries used by buffer (options can be added/removed in section). +| look | /set aspell.look.* | Look and feel. | option | /set aspell.option.* | <> (options can be added/removed in section). |=== diff --git a/doc/ja/autogen/user/aspell_options.adoc b/doc/ja/autogen/user/aspell_options.adoc index 24d80da9b..593b7b07a 100644 --- a/doc/ja/autogen/user/aspell_options.adoc +++ b/doc/ja/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" ** デフォルト値: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** 説明: pass:none[スペルミスのある単語に対する修正候補に付ける色 (ステータスバー)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** 説明: pass:none[text color for suggestion on a misspelled word in bar item "aspell_suggest"] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" ** デフォルト値: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** 説明: pass:none[text color for delimiters displayed between two dictionaries in bar item "aspell_suggest"] +** タイプ: 色 +** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" +** デフォルト値: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** 説明: pass:none[text color for delimiters displayed between two words in bar item "aspell_suggest"] +** タイプ: 色 +** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" +** デフォルト値: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** 説明: pass:none[delimiter displayed between two dictionaries in bar item "aspell_suggest"] +** タイプ: 文字列 +** 値: 未制約文字列 +** デフォルト値: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** 説明: pass:none[delimiter displayed between two words in bar item "aspell_suggest"] +** タイプ: 文字列 +** 値: 未制約文字列 +** デフォルト値: `+","+` diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index a1bcb2833..8651b98cb 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -2041,6 +2041,7 @@ Aspell | check | /set aspell.check.* | スペルチェックの操作コマンド | dict | <> + /set aspell.dict.* | バッファが利用するディレクトリ (オプションをセクションに追加/削除出来ます) +| look | /set aspell.look.* | 外観 | option | /set aspell.option.* | <> (オプションをセクションに追加/削除出来ます) |=== diff --git a/doc/pl/autogen/user/aspell_options.adoc b/doc/pl/autogen/user/aspell_options.adoc index 6375ffb5d..c49bddbeb 100644 --- a/doc/pl/autogen/user/aspell_options.adoc +++ b/doc/pl/autogen/user/aspell_options.adoc @@ -50,8 +50,32 @@ ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie ** domyślna wartość: `+lightred+` -* [[option_aspell.color.suggestions]] *aspell.color.suggestions* -** opis: pass:none[kolor tekstu sugestii dla błędnie wprowadzonego słowa (pasek statusu)] +* [[option_aspell.color.suggestion]] *aspell.color.suggestion* +** opis: pass:none[text color for suggestion on a misspelled word in bar item "aspell_suggest"] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie ** domyślna wartość: `+default+` + +* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict* +** opis: pass:none[text color for delimiters displayed between two dictionaries in bar item "aspell_suggest"] +** typ: kolor +** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie +** domyślna wartość: `+cyan+` + +* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word* +** opis: pass:none[text color for delimiters displayed between two words in bar item "aspell_suggest"] +** typ: kolor +** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie +** domyślna wartość: `+cyan+` + +* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict* +** opis: pass:none[delimiter displayed between two dictionaries in bar item "aspell_suggest"] +** typ: ciąg +** wartości: dowolny ciąg +** domyślna wartość: `+" / "+` + +* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word* +** opis: pass:none[delimiter displayed between two words in bar item "aspell_suggest"] +** typ: ciąg +** wartości: dowolny ciąg +** domyślna wartość: `+","+` diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 126b51ce7..9066599be 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -2056,6 +2056,7 @@ Sekcje: | check | /set aspell.check.* | Opcje do kontrolowania sprawdzania pisowni. | dict | <> + /set aspell.dict.* | Słowniki używane w buforze (opcje w tej sekcji mogą być dodawane/usuwane). +| look | /set aspell.look.* | Wygląd. | option | /set aspell.option.* | <> (opcje w tej sekcji mogą być dodawane/usuwane). |=== @@ -2129,7 +2130,7 @@ Sekcje: |=== | Sekcja | Komenda | Opis | format | /set buflist.format.* | Formats used to display list of buffers. -| look | /set buflist.look.* | Look and feel. +| look | /set buflist.look.* | Wygląd. |=== Opcje: diff --git a/po/cs.po b/po/cs.po index d564e3460..631469325 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 21:59+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -4814,9 +4814,21 @@ msgid "text color for misspelled words (input bar)" msgstr "barva použitá pro slova s chybou" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "barva textu pro čas (stavový řádek)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -4858,6 +4870,13 @@ msgstr "" "mimimální délka slova pro kontrolu pravopisu (použijte 0 pro kontrolu všech " "slov)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + #, fuzzy msgid "comma-separated list of dictionaries used in buffer" msgstr "čárkami oddělený seznam slovníků, které použít pro tento buffer" diff --git a/po/de.po b/po/de.po index 062b9796b..18840247f 100644 --- a/po/de.po +++ b/po/de.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-03-12 21:27+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -5668,9 +5668,22 @@ msgstr "" "Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll " "(Eingabezeile)" -msgid "text color for suggestions on a misspelled word (status bar)" +#, fuzzy +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "Textfarbe für die Vorschläge der Rechtsschreibkorrektur (Statusbar)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "Textfarbe für die Nachricht die beim Datumswechsel angezeigt wird" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5720,6 +5733,13 @@ msgstr "" "Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll " "(bei 0 werden alle Wörter überprüft)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" "durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer " diff --git a/po/es.po b/po/es.po index 2e0627d03..62c785a2f 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:01+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5025,9 +5025,22 @@ msgid "text color for misspelled words (input bar)" msgstr "color a usar para palabras mal escritas" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "color para el texto de la hora (en la barra de estado)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "" +"color para las etiquetas de mensaje (mostrados con el comando /debug tags)" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5070,6 +5083,13 @@ msgstr "" "longitud mínima de una palabra para poder ser verificada ortográficamente " "(usar 0 para verificar todas las palabras)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + #, fuzzy msgid "comma-separated list of dictionaries used in buffer" msgstr "lista separada por comas de diccionarios para usar en este buffer" diff --git a/po/fr.po b/po/fr.po index 734526d33..b28b18c84 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" -"PO-Revision-Date: 2017-03-30 20:32+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" +"PO-Revision-Date: 2017-04-01 12:20+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -5553,10 +5553,25 @@ msgstr "%s%s : erreur en création de l'option aspell \"%s\" => \"%s\"" msgid "text color for misspelled words (input bar)" msgstr "couleur du texte pour les mots mal orthographiés (barre de saisie)" -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "" -"couleur du texte pour les suggestions sur un mot mal orthographié (barre de " -"statut)" +"couleur du texte pour la suggestion sur un mot mal orthographié dans l'objet " +"de barre \"aspell_suggest\"" + +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" +"couleur du texte pour les séparateurs affichés entre deux dictionnaires dans " +"l'objet de barre \"aspell_suggest\"" + +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "" +"couleur du texte pour les séparateurs affichés entre deux mots dans l'objet " +"de barre \"aspell_suggest\"" msgid "" "comma separated list of commands for which spell checking is enabled (spell " @@ -5604,6 +5619,16 @@ msgstr "" "longueur minimum d'un mot pour que l'orthographe soit vérifiée (utilisez 0 " "pour vérifier tous les mots)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" +"séparateur affiché entre deux dictionnaires dans l'objet de barre " +"\"aspell_suggest\"" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" +"séparateur affiché entre deux mots dans l'objet de barre \"aspell_suggest\"" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" "liste de dictionnaires (séparés par des virgules) utilisés sur le tampon" diff --git a/po/hu.po b/po/hu.po index f437b2aca..e38ab1cda 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:03+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4360,9 +4360,21 @@ msgid "text color for misspelled words (input bar)" msgstr "státuszsor színe" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "státuszsor színe" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -4396,6 +4408,13 @@ msgid "" "minimum length for a word to be spell checked (use 0 to check all words)" msgstr "" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" diff --git a/po/it.po b/po/it.po index b8fcf8d57..6fa2b86ee 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:04+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -5160,9 +5160,21 @@ msgid "text color for misspelled words (input bar)" msgstr "colore usato per le parole non corrette" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "colore del testo per l'ora (barra di stato)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "colore del testo per i messaggi mostrati al cambio di data" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5207,6 +5219,13 @@ msgid "" msgstr "" "lunghezza minima per una parola da controllare (0 per controllarle tutte)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "elenco separato da virgole di dizionari usati nel buffer" diff --git a/po/ja.po b/po/ja.po index d2c63f47a..a478f428e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-03-26 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \"%s\" の作成中にエラー" msgid "text color for misspelled words (input bar)" msgstr "スペルミスのある単語に付ける色 (入力バー)" -msgid "text color for suggestions on a misspelled word (status bar)" +#, fuzzy +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "スペルミスのある単語に対する修正候補に付ける色 (ステータスバー)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "日付が変わった時に表示されるメッセージのテキスト色" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5346,6 +5359,13 @@ msgid "" "minimum length for a word to be spell checked (use 0 to check all words)" msgstr "スペルチェックを行う単語長の最小値 (0 の場合は全ての単語をチェック)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "バッファで使用中の辞書のコンマ区切りリスト" diff --git a/po/pl.po b/po/pl.po index a205ae1f1..f61f6a138 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:05+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -5415,9 +5415,22 @@ msgstr "%s%s: błąd podczas tworzenia opcji aspell \"%s\" => \"%s\"" msgid "text color for misspelled words (input bar)" msgstr "kolor używany dla błędnie zapisanych słów (pasek wprowadzania)" -msgid "text color for suggestions on a misspelled word (status bar)" +#, fuzzy +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "kolor tekstu sugestii dla błędnie wprowadzonego słowa (pasek statusu)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "kolor tekstu dla wiadomości o zmianie daty" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5461,6 +5474,13 @@ msgid "" msgstr "" "minimalna długość słowa do sprawdzenia ( 0 - sprawdzaj wszystkie słowa)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "oddzielona przecinkami lista słowników używanych w buforze" diff --git a/po/pt.po b/po/pt.po index 6aedcbd5c..f16be67ab 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-14 21:39+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -5412,11 +5412,24 @@ msgstr "%s%s: erro ao criar a opção aspell \"%s\" => \"%s\"" msgid "text color for misspelled words (input bar)" msgstr "cor do texto dos erros ortográficos (barra de entrada)" -msgid "text color for suggestions on a misspelled word (status bar)" +#, fuzzy +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "" "cor do texto das sugestões de correção de erros ortográficos (barra de " "estado)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "cor do texto das mensagens apresentadas depois de passar um dia" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5462,6 +5475,13 @@ msgstr "" "comprimento mínimo que um palavra deve ter para ser verificada (use 0 para " "verificar todas as palavras)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "lista de dicionários separados por vírgula usados no buffer" diff --git a/po/pt_BR.po b/po/pt_BR.po index 446595b9b..9894006a1 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-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -4964,9 +4964,21 @@ msgid "text color for misspelled words (input bar)" msgstr "cor usada em palavras erradas" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "cor de texto para o tempo (barra de status)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "cor de texto para mensagem exibida quando o dia muda" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -5011,6 +5023,13 @@ msgstr "" "tamanho mínimo de uma palavra para ser verificada ortograficamente (use 0 " "para verificar todas as palavras)" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + #, fuzzy msgid "comma-separated list of dictionaries used in buffer" msgstr "lista de dicionários (separados por vírgula) para uso neste buffer" diff --git a/po/ru.po b/po/ru.po index 633ac7c3b..a8dcf1b07 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:06+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -4398,9 +4398,21 @@ msgid "text color for misspelled words (input bar)" msgstr "цвет строки состояния" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "цвет строки состояния" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +#, fuzzy +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -4434,6 +4446,13 @@ msgid "" "minimum length for a word to be spell checked (use 0 to check all words)" msgstr "" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" diff --git a/po/tr.po b/po/tr.po index 800ef5e24..640922a90 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2017-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2017-01-06 22:07+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -3966,9 +3966,20 @@ msgid "text color for misspelled words (input bar)" msgstr "zaman için metin rengi (durum çubuğu)" #, fuzzy -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" msgstr "zaman için metin rengi (durum çubuğu)" +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" +msgstr "" + msgid "" "comma separated list of commands for which spell checking is enabled (spell " "checking is disabled for all other commands)" @@ -4001,6 +4012,13 @@ msgid "" "minimum length for a word to be spell checked (use 0 to check all words)" msgstr "" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 68770dda0..680336070 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-03-30 20:31+0200\n" +"POT-Creation-Date: 2017-04-01 12:14+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -3952,7 +3952,18 @@ msgstr "" msgid "text color for misspelled words (input bar)" msgstr "" -msgid "text color for suggestions on a misspelled word (status bar)" +msgid "" +"text color for suggestion on a misspelled word in bar item \"aspell_suggest\"" +msgstr "" + +msgid "" +"text color for delimiters displayed between two dictionaries in bar item " +"\"aspell_suggest\"" +msgstr "" + +msgid "" +"text color for delimiters displayed between two words in bar item " +"\"aspell_suggest\"" msgstr "" msgid "" @@ -3987,6 +3998,13 @@ msgid "" "minimum length for a word to be spell checked (use 0 to check all words)" msgstr "" +msgid "" +"delimiter displayed between two dictionaries in bar item \"aspell_suggest\"" +msgstr "" + +msgid "delimiter displayed between two words in bar item \"aspell_suggest\"" +msgstr "" + msgid "comma-separated list of dictionaries used in buffer" msgstr "" diff --git a/src/plugins/aspell/weechat-aspell-bar-item.c b/src/plugins/aspell/weechat-aspell-bar-item.c index 7a2221c1c..e89821a85 100644 --- a/src/plugins/aspell/weechat-aspell-bar-item.c +++ b/src/plugins/aspell/weechat-aspell-bar-item.c @@ -70,8 +70,8 @@ weechat_aspell_bar_item_suggest (const void *pointer, void *data, struct t_hashtable *extra_info) { const char *ptr_suggestions, *pos; - char **suggestions, *suggestions2; - int i, num_suggestions, length; + char **suggestions, **suggestions2, **str_suggest; + int i, j, num_suggestions, num_suggestions2; /* make C compiler happy */ (void) pointer; @@ -96,37 +96,61 @@ weechat_aspell_bar_item_suggest (const void *pointer, void *data, pos++; else pos = ptr_suggestions; + + str_suggest = weechat_string_dyn_alloc (256); + if (!str_suggest) + return NULL; + suggestions = weechat_string_split (pos, "/", 0, 0, &num_suggestions); - if (suggestions) + if (!suggestions) + goto end; + + for (i = 0; i < num_suggestions; i++) { - length = 64 + 1; - for (i = 0; i < num_suggestions; i++) + if (i > 0) { - length += strlen (suggestions[i]) + 64; + weechat_string_dyn_concat ( + str_suggest, + weechat_color ( + weechat_config_string ( + weechat_aspell_config_color_suggestion_delimiter_dict))); + weechat_string_dyn_concat ( + str_suggest, + weechat_config_string ( + weechat_aspell_config_look_suggestion_delimiter_dict)); } - suggestions2 = malloc (length); + suggestions2 = weechat_string_split (suggestions[i], ",", 0, 0, + &num_suggestions2); if (suggestions2) { - suggestions2[0] = '\0'; - strcat (suggestions2, - weechat_color (weechat_config_string (weechat_aspell_config_color_suggestions))); - for (i = 0; i < num_suggestions; i++) + for (j = 0; j < num_suggestions2; j++) { - if (i > 0) + if (j > 0) { - strcat (suggestions2, weechat_color ("bar_delim")); - strcat (suggestions2, "/"); - strcat (suggestions2, - weechat_color (weechat_config_string (weechat_aspell_config_color_suggestions))); + weechat_string_dyn_concat ( + str_suggest, + weechat_color ( + weechat_config_string ( + weechat_aspell_config_color_suggestion_delimiter_word))); + weechat_string_dyn_concat ( + str_suggest, + weechat_config_string ( + weechat_aspell_config_look_suggestion_delimiter_word)); } - strcat (suggestions2, suggestions[i]); + weechat_string_dyn_concat ( + str_suggest, + weechat_color ( + weechat_config_string ( + weechat_aspell_config_color_suggestion))); + weechat_string_dyn_concat (str_suggest, suggestions2[j]); } - weechat_string_free_split (suggestions); - return suggestions2; + weechat_string_free_split (suggestions2); } - weechat_string_free_split (suggestions); } - return strdup (pos); + weechat_string_free_split (suggestions); + +end: + return weechat_string_dyn_free (str_suggest, 0); } /* diff --git a/src/plugins/aspell/weechat-aspell-config.c b/src/plugins/aspell/weechat-aspell-config.c index f482dcd48..0d12e9df6 100644 --- a/src/plugins/aspell/weechat-aspell-config.c +++ b/src/plugins/aspell/weechat-aspell-config.c @@ -38,7 +38,9 @@ int weechat_aspell_config_loading = 0; /* aspell config, color section */ struct t_config_option *weechat_aspell_config_color_misspelled; -struct t_config_option *weechat_aspell_config_color_suggestions; +struct t_config_option *weechat_aspell_config_color_suggestion; +struct t_config_option *weechat_aspell_config_color_suggestion_delimiter_dict; +struct t_config_option *weechat_aspell_config_color_suggestion_delimiter_word; /* aspell config, check section */ @@ -50,6 +52,11 @@ struct t_config_option *weechat_aspell_config_check_real_time; struct t_config_option *weechat_aspell_config_check_suggestions; struct t_config_option *weechat_aspell_config_check_word_min_length; +/* aspell config, look section */ + +struct t_config_option *weechat_aspell_config_look_suggestion_delimiter_dict; +struct t_config_option *weechat_aspell_config_look_suggestion_delimiter_word; + char **weechat_aspell_commands_to_check = NULL; int weechat_aspell_count_commands_to_check = 0; @@ -452,12 +459,27 @@ weechat_aspell_config_init () N_("text color for misspelled words (input bar)"), NULL, 0, 0, "lightred", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - weechat_aspell_config_color_suggestions = weechat_config_new_option ( + weechat_aspell_config_color_suggestion = weechat_config_new_option ( weechat_aspell_config_file, ptr_section, - "suggestions", "color", - N_("text color for suggestions on a misspelled word (status bar)"), + "suggestion", "color", + N_("text color for suggestion on a misspelled word in bar item " + "\"aspell_suggest\""), NULL, 0, 0, "default", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + weechat_aspell_config_color_suggestion_delimiter_dict = weechat_config_new_option ( + weechat_aspell_config_file, ptr_section, + "suggestion_delimiter_dict", "color", + N_("text color for delimiters displayed between two dictionaries " + "in bar item \"aspell_suggest\""), + NULL, 0, 0, "cyan", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + weechat_aspell_config_color_suggestion_delimiter_word = weechat_config_new_option ( + weechat_aspell_config_file, ptr_section, + "suggestion_delimiter_word", "color", + N_("text color for delimiters displayed between two words in bar item " + "\"aspell_suggest\""), + NULL, 0, 0, "cyan", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); /* check */ ptr_section = weechat_config_new_section ( @@ -551,6 +573,40 @@ weechat_aspell_config_init () weechat_aspell_config_section_dict = ptr_section; + /* look */ + ptr_section = weechat_config_new_section ( + weechat_aspell_config_file, "look", + 0, 0, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL); + if (!ptr_section) + { + weechat_config_free (weechat_aspell_config_file); + return 0; + } + + weechat_aspell_config_look_suggestion_delimiter_dict = weechat_config_new_option ( + weechat_aspell_config_file, ptr_section, + "suggestion_delimiter_dict", "string", + N_("delimiter displayed between two dictionaries in bar item " + "\"aspell_suggest\""), + NULL, 0, 0, " / ", NULL, 0, + NULL, NULL, NULL, + &weechat_aspell_config_change_suggestions, NULL, NULL, + NULL, NULL, NULL); + weechat_aspell_config_look_suggestion_delimiter_word = weechat_config_new_option ( + weechat_aspell_config_file, ptr_section, + "suggestion_delimiter_word", "string", + N_("delimiter displayed between two words in bar item " + "\"aspell_suggest\""), + NULL, 0, 0, ",", NULL, 0, + NULL, NULL, NULL, + &weechat_aspell_config_change_suggestions, NULL, NULL, + NULL, NULL, NULL); + /* option */ ptr_section = weechat_config_new_section ( weechat_aspell_config_file, "option", diff --git a/src/plugins/aspell/weechat-aspell-config.h b/src/plugins/aspell/weechat-aspell-config.h index 48dcc627e..dc0d42043 100644 --- a/src/plugins/aspell/weechat-aspell-config.h +++ b/src/plugins/aspell/weechat-aspell-config.h @@ -25,7 +25,9 @@ extern struct t_config_option *weechat_aspell_config_color_misspelled; -extern struct t_config_option *weechat_aspell_config_color_suggestions; +extern struct t_config_option *weechat_aspell_config_color_suggestion; +extern struct t_config_option *weechat_aspell_config_color_suggestion_delimiter_dict; +extern struct t_config_option *weechat_aspell_config_color_suggestion_delimiter_word; extern struct t_config_option *weechat_aspell_config_check_commands; extern struct t_config_option *weechat_aspell_config_check_default_dict; @@ -35,6 +37,9 @@ extern struct t_config_option *weechat_aspell_config_check_real_time; extern struct t_config_option *weechat_aspell_config_check_suggestions; extern struct t_config_option *weechat_aspell_config_check_word_min_length; +extern struct t_config_option *weechat_aspell_config_look_suggestion_delimiter_dict; +extern struct t_config_option *weechat_aspell_config_look_suggestion_delimiter_word; + extern char **weechat_aspell_commands_to_check; extern int weechat_aspell_count_commands_to_check; extern int *weechat_aspell_length_commands_to_check;