summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-04-04 14:23:24 +0200
committerunknown <pem@mysql.com>2003-04-04 14:23:24 +0200
commitf3f0fb581f26ca4ef43f7c681a0bb576b2ace2cc (patch)
tree057b48a138a012cd700c7cabe03030b367b76620
parent094d141b106bf0b2bdedc0494376528e6b8f0015 (diff)
downloadmariadb-git-f3f0fb581f26ca4ef43f7c681a0bb576b2ace2cc.tar.gz
Added missing error message (was only added in english/).
Removed extraneous error message from german/errmsg.txt. sql/share/czech/errmsg.txt: Added missing error message (was only added in english/). sql/share/danish/errmsg.txt: Added missing error message (was only added in english/). sql/share/dutch/errmsg.txt: Added missing error message (was only added in english/). sql/share/estonian/errmsg.txt: Added missing error message (was only added in english/). sql/share/french/errmsg.txt: Added missing error message (was only added in english/). sql/share/german/errmsg.txt: Added missing error message (was only added in english/). Removed extraneous error message. sql/share/greek/errmsg.txt: Added missing error message (was only added in english/). sql/share/hungarian/errmsg.txt: Added missing error message (was only added in english/). sql/share/italian/errmsg.txt: Added missing error message (was only added in english/). sql/share/japanese/errmsg.txt: Added missing error message (was only added in english/). sql/share/korean/errmsg.txt: Added missing error message (was only added in english/). sql/share/norwegian-ny/errmsg.txt: Added missing error message (was only added in english/). sql/share/norwegian/errmsg.txt: Added missing error message (was only added in english/). sql/share/polish/errmsg.txt: Added missing error message (was only added in english/). sql/share/portuguese/errmsg.txt: Added missing error message (was only added in english/). sql/share/romanian/errmsg.txt: Added missing error message (was only added in english/). sql/share/russian/errmsg.txt: Added missing error message (was only added in english/). sql/share/serbian/errmsg.txt: Added missing error message (was only added in english/). sql/share/slovak/errmsg.txt: Added missing error message (was only added in english/). sql/share/spanish/errmsg.txt: Added missing error message (was only added in english/). sql/share/swedish/errmsg.txt: Added missing error message (was only added in english/). sql/share/ukrainian/errmsg.txt: Added missing error message (was only added in english/).
-rw-r--r--sql/share/czech/errmsg.txt1
-rw-r--r--sql/share/danish/errmsg.txt1
-rw-r--r--sql/share/dutch/errmsg.txt1
-rw-r--r--sql/share/estonian/errmsg.txt1
-rw-r--r--sql/share/french/errmsg.txt1
-rw-r--r--sql/share/german/errmsg.txt2
-rw-r--r--sql/share/greek/errmsg.txt1
-rw-r--r--sql/share/hungarian/errmsg.txt1
-rw-r--r--sql/share/italian/errmsg.txt1
-rw-r--r--sql/share/japanese/errmsg.txt1
-rw-r--r--sql/share/korean/errmsg.txt1
-rw-r--r--sql/share/norwegian-ny/errmsg.txt1
-rw-r--r--sql/share/norwegian/errmsg.txt1
-rw-r--r--sql/share/polish/errmsg.txt1
-rw-r--r--sql/share/portuguese/errmsg.txt1
-rw-r--r--sql/share/romanian/errmsg.txt1
-rw-r--r--sql/share/russian/errmsg.txt1
-rw-r--r--sql/share/serbian/errmsg.txt1
-rw-r--r--sql/share/slovak/errmsg.txt1
-rw-r--r--sql/share/spanish/errmsg.txt1
-rw-r--r--sql/share/swedish/errmsg.txt1
-rw-r--r--sql/share/ukrainian/errmsg.txt1
22 files changed, 22 insertions, 1 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 169595c34c5..0f65b118326 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -264,3 +264,4 @@ v/*
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index ff58079f4c8..ff338b5aaaf 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -258,3 +258,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index a0a6755c693..8ed3fd28a80 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -266,3 +266,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 4503f011692..fd157fb7b0f 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -260,3 +260,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 9474d67f2f2..b91e81eff8f 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index ef4110a6b93..26fbeab875c 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -228,7 +228,6 @@
"Foreign_Key Beschränkung konnte nicht hinzugefügt werden.",
"Hinzufügen eines Kind-Datensatzes schlug aufgrund einer Foreign-Key Beschränkung fehl.",
"Löschen eines Eltern-Datensatzes schlug aufgrund einer Foreign-Key Beschränkung fehl.",
-"Datensatz kann aufgrund einer Foreign-Key Beschränkung nicht gelöscht werden.",
"Fehler bei der Verbindung zum Master: %-.128s",
"Beim Ausführen einer Abfrage auf dem Master trat ein Fehler auf: %-.128s.",
"Fehler beim Ausführen des Befehls %s: %-.128s.",
@@ -265,3 +264,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 3f54e7740bd..fae3fb788bc 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 7519448ef33..72271738669 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -257,3 +257,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 71a02896c01..bed8c6accc6 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index b10ddb1d1d2..38d1591b20a 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -257,3 +257,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index be1e85ad33c..464365faf09 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 84c96a0540e..62915658895 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -257,3 +257,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index b57eb19906d..9aa2392f251 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -257,3 +257,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 2d07b362257..c2380bbae83 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -259,3 +259,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 8db48115c49..203dd39517d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 337cfd0963e..ca983240dfd 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -259,3 +259,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index b5d1a0a7e07..592db5f3648 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -257,3 +257,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index d6883efc96b..eb6fd0f06f3 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -251,3 +251,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index ee7d1e9c4fb..f778cffc00c 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -263,3 +263,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 2dfdc7573fa..74b43cd888c 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -256,3 +256,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index efdd261ff59..773d4461583 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -255,3 +255,4 @@
"COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'"
"Slaven har redan startat"
"Slaven har redan stoppat"
+"%d rad(er) kapades av group_concat()"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index be8fe2afea5..1ae75f3d877 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -260,3 +260,4 @@
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
"The slave was already running"
"The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"