summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorserg@serg.mylan <>2003-11-18 10:23:49 +0100
committerserg@serg.mylan <>2003-11-18 10:23:49 +0100
commit6d350964dc9f3fe105521c9e4f791443c25e121a (patch)
tree89d4a1ac4663bd62954142074197be3a54b27ee5 /sql/share
parent249c0f9b325e8d69b3087bb3c699901f58f0eb35 (diff)
downloadmariadb-git-6d350964dc9f3fe105521c9e4f791443c25e121a.tar.gz
word substitution in error messages removed - can create problems for i18n
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/czech/errmsg.txt11
-rw-r--r--sql/share/danish/errmsg.txt11
-rw-r--r--sql/share/dutch/errmsg.txt11
-rw-r--r--sql/share/english/errmsg.txt11
-rw-r--r--sql/share/estonian/errmsg.txt11
-rw-r--r--sql/share/french/errmsg.txt11
-rw-r--r--sql/share/german/errmsg.txt11
-rw-r--r--sql/share/greek/errmsg.txt11
-rw-r--r--sql/share/hungarian/errmsg.txt11
-rw-r--r--sql/share/italian/errmsg.txt11
-rw-r--r--sql/share/japanese/errmsg.txt11
-rw-r--r--sql/share/korean/errmsg.txt11
-rw-r--r--sql/share/norwegian-ny/errmsg.txt11
-rw-r--r--sql/share/norwegian/errmsg.txt11
-rw-r--r--sql/share/polish/errmsg.txt11
-rw-r--r--sql/share/portuguese/errmsg.txt11
-rw-r--r--sql/share/romanian/errmsg.txt11
-rw-r--r--sql/share/russian/errmsg.txt11
-rw-r--r--sql/share/serbian/errmsg.txt11
-rw-r--r--sql/share/slovak/errmsg.txt11
-rw-r--r--sql/share/spanish/errmsg.txt11
-rw-r--r--sql/share/swedish/errmsg.txt11
-rw-r--r--sql/share/ukrainian/errmsg.txt11
23 files changed, 115 insertions, 138 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index c01df3b53cd..befba24be1c 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -291,11 +291,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index e67c430c4f7..0a980439816 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -285,11 +285,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 5f77163eeda..8a415aeaec1 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -293,11 +293,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index baecefb8494..c281fb2e781 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL. Otherwise you will get problems if you get an unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 09e63ddd804..75dca762604 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -287,11 +287,10 @@ character-set=latin7
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 0956db6681e..fa374188768 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 2cc98971915..2e69f783a4c 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -294,11 +294,10 @@ character-set=latin1
"Falscher Parameter oder falsche Kombination von Parametern fЭr START SLAVE UNTIL",
"Es wird empfohlen, mit --skip-slave-start zu starten, wenn mit START SLAVE UNTIL eine Schritt-fЭr-Schritt-Replikation ausgefЭhrt wird. Ansonsten gibt es Probleme, wenn der Slave-Server unerwartet neu startet",
"SQL-Thread soll nicht gestartet werden. Daher werden UNTIL-Optionen ignoriert",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 84e48d2f284..eb1d64266b0 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -282,11 +282,10 @@ character-set=greek
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index da71f4b7da6..3be28918bff 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -284,11 +284,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 4ed4d477ab8..535a20b04e8 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index d28cc026159..1c7e6a9e9a4 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -284,11 +284,10 @@ character-set=ujis
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index b0c4bf9463e..8d3ab9dad02 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -282,11 +282,10 @@ character-set=euckr
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 1e9028de1d7..ae6a76a8cba 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 942c18cc045..4fbb13599c2 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 17e6df6c443..a7530d89bbe 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -286,11 +286,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index fdf428c9b6d..d39429e08b8 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -283,11 +283,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 8f4fdb3a702..87420563db6 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -286,11 +286,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 2ef6a2c553b..1d452f54c46 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -284,11 +284,10 @@ character-set=koi8r
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Кеш запросов не может установить размер %lu, новый размер кеша зпросов - %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index cddc1059f44..8386d1439a6 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -277,11 +277,10 @@ character-set=cp1250
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 466e7d478b6..0fda1252f6b 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -290,11 +290,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index de8a245c7f9..4d8fbbb208e 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index d8695db30a4..0f488750be5 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Felaktigt %s namn '%-.100s'",
-"tabell",
-"databas",
-"kolumn",
-"index",
-"katalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Storleken av "Query cache" kunde inte sДttas till %lu, ny storlek Дr %lu",
"Kolumn '%-.64s' kan inte vara del av ett FULLTEXT index",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 3a37ee02731..5a8c6090e80 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -287,11 +287,10 @@ character-set=koi8u
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect %s name '%-.100s'",
-"table",
-"database",
-"column",
-"index",
-"catalog",
+"Incorrect table name '%-.100s'",
+"Incorrect database name '%-.100s'",
+"Incorrect column name '%-.100s'",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
"Кеш запит╕в неспроможен встановити розм╕р %lu, новий розм╕р кеша запит╕в - %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",