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

23 files changed, 30 insertions, 9 deletions

diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 4e8766cea0b..ec93d68ea8f 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -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>
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 95abb868f95..4cdefe79ea9 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -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"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 71740270274..5abb56b9a3f 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -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"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 53cf3736f68..897584131a3 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -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"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index a6a0941625c..65ed5e41766 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -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"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 57f164caac9..553e1f6323e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -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"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 9367f1942e0..e7cb18db762 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,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"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index d2394428d1c..1d568c3dd50 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -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"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index e08c886dec6..ff8b8f04c00 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -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"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index d2122d86405..bbc39fe9e2a 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -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"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 00d03a7c192..2b8fe1e0957 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -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"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 58df04f1f62..71c8b621bc6 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -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"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index c5246746ae2..cc2a88acb73 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -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"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 138f0df1f2c..1321b866c18 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -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"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 781402b4911..f7715d4d693 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -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"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 53ef6f8946c..254d6df7f5b 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -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"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 1f8628dfb04..5157856e1c5 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -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"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 63e7f69df74..54c69083938 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -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"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 0388b71405d..f19100df5f9 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -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"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 2b40b206089..8656eb7cd32 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -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"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 34cd0768f1c..e6fb082dab2 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -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"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index f754b2cc42f..c4a4572ac67 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -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"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 91066f8836c..bd906da957c 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -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"