Mercurial > octave

changeset 31578:3a2c354a52c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Arun Giridhar <arungiridhar@gmail.com>
date Mon, 28 Nov 2022 15:31:57 -0500
parents f3e3a310aceb (current diff) 785ac0d19116 (diff)
children 2ea12c5732ac
files libinterp/corefcn/error.cc
diffstat 19 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation type="unfinished">Для фону ружовы колер (255,0,255) азначае стандартны колер фону {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Color de fons; rosa (255,0,255) per defecte</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
-        <translation>Hintergrundfarbe, Pink (255,0,255) für Standard</translation>
+        <source>Background color, magenta (255, 0, 255) means default</source>
+        <translation>Hintergrundfarbe, Magenta (255,0,255) für Standard</translation>
     </message>
     <message>
         <location line="+2"/>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Color de fondo; rosa (255,0,255) representa predeterminado</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation type="unfinished">Atzeko planoa, kolore magentak (255,0,255) lehenetsia esan nahi du {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Couleur de fond, magenta [255,0,255] désigne la valeur par défaut {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>A háttérszín, rózsaszín (255, 0, 255) az alapértelmezett</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Colore dello sfondo; magenta (255,0,255) indica default</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>背景色，ピンク (255,0,255) が既定を意味する {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Fono spalva; šviesi alyvinė spalva (255,0,255) nurodo, kad naudoti numatytąją spalvą</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Achtergrondkleur; roze (255,0,255) staat voor standaardkleur {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Cor de fundo, rosa (255,0,255) significa padrão</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation type="unfinished">Cor de fundo rosa (255,0,255) significa padrão {255, 0, 255)?}</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Цвет фона, по умолчанию розовый (255, 0, 255)</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>Arka plan rengi, pembe (255, 0, 255) varsayılan anlamına gelir</translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
--- 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 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Background color, pink (255, 0, 255) means default</source>
+        <source>Background color, magenta (255, 0, 255) means default</source>
         <translation>背景颜色，粉红色 (255,0,255) 代表默认值</translation>
     </message>
     <message>
--- 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,