# HG changeset patch # User Arun Giridhar # Date 1669667517 18000 # Node ID 3a2c354a52c2e95f226d5936ff90afe33bbba23a # Parent f3e3a310aceb88c9e93f44285ed7dc8c6fa21fd7# Parent 785ac0d19116ed2a3d91531bb7b0ae585d8bd867 maint: Merge stable to default. diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/be_BY.ts --- a/libgui/languages/be_BY.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/be_BY.ts Mon Nov 28 15:31:57 2022 -0500 @@ -476,7 +476,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Для фону ружовы колер (255,0,255) азначае стандартны колер фону {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/ca_ES.ts --- a/libgui/languages/ca_ES.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/ca_ES.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Color de fons; rosa (255,0,255) per defecte diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/de_DE.ts --- a/libgui/languages/de_DE.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/de_DE.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,8 +71,8 @@ - Background color, pink (255, 0, 255) means default - Hintergrundfarbe, Pink (255,0,255) für Standard + Background color, magenta (255, 0, 255) means default + Hintergrundfarbe, Magenta (255,0,255) für Standard diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/en_US.ts --- a/libgui/languages/en_US.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/en_US.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/es_ES.ts --- a/libgui/languages/es_ES.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/es_ES.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Color de fondo; rosa (255,0,255) representa predeterminado diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/eu_ES.ts --- a/libgui/languages/eu_ES.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/eu_ES.ts Mon Nov 28 15:31:57 2022 -0500 @@ -470,7 +470,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Atzeko planoa, kolore magentak (255,0,255) lehenetsia esan nahi du {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/fr_FR.ts --- a/libgui/languages/fr_FR.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/fr_FR.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Couleur de fond, magenta [255,0,255] désigne la valeur par défaut {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/hu_HU.ts --- a/libgui/languages/hu_HU.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/hu_HU.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default A háttérszín, rózsaszín (255, 0, 255) az alapértelmezett diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/it_IT.ts --- a/libgui/languages/it_IT.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/it_IT.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Colore dello sfondo; magenta (255,0,255) indica default diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/ja_JP.ts --- a/libgui/languages/ja_JP.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/ja_JP.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default 背景色,ピンク (255,0,255) が既定を意味する {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/lt_LT.ts --- a/libgui/languages/lt_LT.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/lt_LT.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Fono spalva; šviesi alyvinė spalva (255,0,255) nurodo, kad naudoti numatytąją spalvą diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/nl_NL.ts --- a/libgui/languages/nl_NL.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/nl_NL.ts Mon Nov 28 15:31:57 2022 -0500 @@ -476,7 +476,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Achtergrondkleur; roze (255,0,255) staat voor standaardkleur {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/pt_BR.ts --- a/libgui/languages/pt_BR.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/pt_BR.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Cor de fundo, rosa (255,0,255) significa padrão diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/pt_PT.ts --- a/libgui/languages/pt_PT.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/pt_PT.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Cor de fundo rosa (255,0,255) significa padrão {255, 0, 255)?} diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/ru_RU.ts --- a/libgui/languages/ru_RU.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/ru_RU.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Цвет фона, по умолчанию розовый (255, 0, 255) diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/tr_TR.ts --- a/libgui/languages/tr_TR.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/tr_TR.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default Arka plan rengi, pembe (255, 0, 255) varsayılan anlamına gelir diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/uk_UA.ts --- a/libgui/languages/uk_UA.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/uk_UA.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default diff -r f3e3a310aceb -r 3a2c354a52c2 libgui/languages/zh_CN.ts --- a/libgui/languages/zh_CN.ts Mon Nov 28 10:50:54 2022 -0800 +++ b/libgui/languages/zh_CN.ts Mon Nov 28 15:31:57 2022 -0500 @@ -71,7 +71,7 @@ - Background color, pink (255, 0, 255) means default + Background color, magenta (255, 0, 255) means default 背景颜色,粉红色 (255,0,255) 代表默认值 diff -r f3e3a310aceb -r 3a2c354a52c2 libinterp/corefcn/error.cc --- a/libinterp/corefcn/error.cc Mon Nov 28 10:50:54 2022 -0800 +++ b/libinterp/corefcn/error.cc Mon Nov 28 15:31:57 2022 -0500 @@ -497,7 +497,7 @@ std::string str_id = id ? id : ""; std::string message = format_message (fmt, args); - throw_error ("usage", id, message); + throw_error ("usage", str_id, message); } void error_system::vwarning (const char *name, const char *id,