Skip to content

M
MariaDB
Commit 9e31ab36 authored by unknown's avatar unknown
Browse files
Options

Merge 


sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  SCCS merged
sql/share/dutch/errmsg.txt:
  SCCS merged
sql/share/estonian/errmsg.txt:
  SCCS merged
sql/share/french/errmsg.txt:
  SCCS merged
sql/share/german/errmsg.txt:
  SCCS merged
sql/share/greek/errmsg.txt:
  SCCS merged
sql/share/hungarian/errmsg.txt:
  SCCS merged
sql/share/italian/errmsg.txt:
  SCCS merged
sql/share/japanese/errmsg.txt:
  SCCS merged
sql/share/korean/errmsg.txt:
  SCCS merged
sql/share/norwegian-ny/errmsg.txt:
  SCCS merged
sql/share/norwegian/errmsg.txt:
  SCCS merged
sql/share/polish/errmsg.txt:
  SCCS merged
sql/share/portuguese/errmsg.txt:
  SCCS merged
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  SCCS merged
sql/share/serbian/errmsg.txt:
  SCCS merged
sql/share/slovak/errmsg.txt:
  SCCS merged
sql/share/spanish/errmsg.txt:
  SCCS merged
sql/share/swedish/errmsg.txt:
  SCCS merged
sql/share/ukrainian/errmsg.txt:
  SCCS merged
parents d021b5a5 5582a83a
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 9 deletions
sql/share/charsets/Index.xml
View file @ 9e31ab36
......@@ -58,7 +58,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -76,7 +76,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="cp850_bin" id="80" order="Binary" flag="binary"/>
......@@ -104,7 +104,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="latin1_general_cs" id="49">
......@@ -114,7 +114,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -131,7 +131,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -451,7 +451,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="macroman_bin" id="53" order="Binary" flag="binary"/>
......@@ -462,7 +462,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<!--collation name="macroman_ci_ai" id="55"/-->
......@@ -473,7 +473,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......
sql/share/czech/errmsg.txt
View file @ 9e31ab36
......@@ -264,6 +264,7 @@ 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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/danish/errmsg.txt
View file @ 9e31ab36
......@@ -258,6 +258,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/dutch/errmsg.txt
View file @ 9e31ab36
......@@ -266,6 +266,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/estonian/errmsg.txt
View file @ 9e31ab36
......@@ -260,6 +260,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/french/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/german/errmsg.txt
View file @ 9e31ab36
......@@ -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,6 +264,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/greek/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/hungarian/errmsg.txt
View file @ 9e31ab36
......@@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/italian/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/japanese/errmsg.txt
View file @ 9e31ab36
......@@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/korean/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/norwegian-ny/errmsg.txt
View file @ 9e31ab36
......@@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/norwegian/errmsg.txt
View file @ 9e31ab36
......@@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/polish/errmsg.txt
View file @ 9e31ab36
......@@ -259,6 +259,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/portuguese/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/romanian/errmsg.txt
View file @ 9e31ab36
......@@ -259,6 +259,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/russian/errmsg.txt
View file @ 9e31ab36
......@@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/serbian/errmsg.txt
View file @ 9e31ab36
......@@ -251,6 +251,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/slovak/errmsg.txt
View file @ 9e31ab36
......@@ -263,6 +263,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/spanish/errmsg.txt
View file @ 9e31ab36
......@@ -256,6 +256,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/swedish/errmsg.txt
View file @ 9e31ab36
......@@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
sql/share/ukrainian/errmsg.txt
View file @ 9e31ab36
......@@ -260,6 +260,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7