Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/share/errmsg.txt:
  Auto merged

extra/comp_err.c

@@ -132,6 +132,8 @@ static struct message *parse_message_string(struct message *new_message,
 					    char *str);
 static struct message *find_message(struct errors *err, const char *lang,
                                     my_bool no_default);
+static int check_message_format(struct errors *err,
+                                const char* mess);
 static int parse_input_file(const char *file_name, struct errors **top_error,
 			    struct languages **top_language);
 static int get_options(int *argc, char ***argv);
@@ -458,6 +460,13 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
 		current_error->er_name, current_message.lang_short_name);
 	DBUG_RETURN(0);
       }
+      if (check_message_format(current_error, current_message.text))
+      {
+	fprintf(stderr, "Wrong formatspecifier of error message string"
+                        " for error '%s' in language '%s'\n",
+		current_error->er_name, current_message.lang_short_name);
+	DBUG_RETURN(0);
+      }
       if (insert_dynamic(&current_error->msg, (byte *) & current_message))
 	DBUG_RETURN(0);
       continue;
@@ -599,6 +608,117 @@ static struct message *find_message(struct errors *err, const char *lang,
 }
 
 
+
+/*
+  Check message format specifiers against error message for
+  previous language
+
+  SYNOPSIS
+    checksum_format_specifier()
+    msg            String for which to generate checksum
+                   for the format specifiers
+
+  RETURN VALUE
+    Returns the checksum for all the characters of the
+    format specifiers
+
+    Ex.
+     "text '%-64.s' text part 2 %d'"
+            ^^^^^^              ^^
+            characters will be xored to form checksum
+
+    NOTE:
+      Does not support format specifiers with positional args
+      like "%2$s" but that is not yet supported by my_vsnprintf
+      either.
+*/
+
+static char checksum_format_specifier(const char* msg)
+{
+  char chksum= 0;
+  const char* p= msg;
+  int is_format_specifier= 0;
+  int num_format_specifiers= 0;
+  while (*p)
+  {
+
+    if (*p == '%')
+    {
+      is_format_specifier= 1; /* Entering format specifier */
+      num_format_specifiers++;
+    }
+
+    if (is_format_specifier)
+    {
+      chksum^= *p;
+      switch(*p)
+      {
+      case 'd':
+      case 'u':
+      case 'x':
+      case 's':
+        is_format_specifier= 0; /* Not in format specifier anymore */
+        break;
+
+      default:
+        break;
+      }
+    }
+
+    p++;
+  }
+
+  if (is_format_specifier)
+  {
+    /* Still inside a format specifier after end of string */
+
+    fprintf(stderr, "Still inside formatspecifier after end of string"
+                    " in'%s'\n", msg);
+    DBUG_ASSERT(is_format_specifier==0);
+  }
+
+  /* Add number of format specifiers to checksum as extra safeguard */
+  chksum+= num_format_specifiers;
+
+  return chksum;
+}
+
+
+/*
+  Check message format specifiers against error message for
+  previous language
+
+  SYNOPSIS
+    check_message_format()
+    err             Error to check message for
+    mess            Message to check
+
+  RETURN VALUE
+    Returns 0 if no previous error message or message format is ok
+*/
+static int check_message_format(struct errors *err,
+                                const char* mess)
+{
+  struct message *first;
+  DBUG_ENTER("check_message_format");
+
+  /*  Get first message(if any) */
+  if ((err->msg).elements == 0)
+    DBUG_RETURN(0); /* No previous message to compare against */
+
+  first= dynamic_element(&err->msg, 0, struct message*);
+  DBUG_ASSERT(first != NULL);
+
+  if (checksum_format_specifier(first->text) !=
+      checksum_format_specifier(mess))
+  {
+    /* Check sum of format specifiers failed, they should be equal */
+    DBUG_RETURN(1);
+  }
+  DBUG_RETURN(0);
+}
+
+
 /*
   Skips spaces and or tabs till the beginning of the next word
   Returns pointer to the beginning of the first character of the word

sql/share/errmsg.txt

@@ -51,54 +51,54 @@ ER_YES
 	spa "SI"
 	ukr ""
 ER_CANT_CREATE_FILE  
-	cze "Nemohu vytvo-Bit soubor '%-.64s' (chybov kd: %d)"
-	dan "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)"
-	nla "Kan file '%-.64s' niet aanmaken (Errcode: %d)"
+	cze "Nemohu vytvo-Bit soubor '%-.200s' (chybov kd: %d)"
+	dan "Kan ikke oprette filen '%-.200s' (Fejlkode: %d)"
+	nla "Kan file '%-.200s' niet aanmaken (Errcode: %d)"
 	eng "Can't create file '%-.200s' (errno: %d)"
-	est "Ei suuda luua faili '%-.64s' (veakood: %d)"
-	fre "Ne peut crer le fichier '%-.64s' (Errcode: %d)"
-	ger "Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)"
-	greek "     '%-.64s' ( : %d)"
-	hun "A '%-.64s' file nem hozhato letre (hibakod: %d)"
-	ita "Impossibile creare il file '%-.64s' (errno: %d)"
-	jpn "'%-.64s' ե뤬ޤ (errno: %d)"
-	kor "ȭ '%-.64s'  ߽ϴ. (ȣ: %d)"
-	nor "Kan ikke opprette fila '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje opprette fila '%-.64s' (Feilkode: %d)"
-	pol "Nie mona stworzy pliku '%-.64s' (Kod bdu: %d)"
-	por "No pode criar o arquivo '%-.64s' (erro no. %d)"
-	rum "Nu pot sa creez fisierul '%-.64s' (Eroare: %d)"
-	rus "   '%-.64s' (: %d)"
-	serbian "Ne mogu da kreiram file '%-.64s' (errno: %d)"
-	slo "Nemem vytvori sbor '%-.64s' (chybov kd: %d)"
-	spa "No puedo crear archivo '%-.64s' (Error: %d)"
-	swe "Kan inte skapa filen '%-.64s' (Felkod: %d)"
-	ukr "    '%-.64s' (: %d)"
+	est "Ei suuda luua faili '%-.200s' (veakood: %d)"
+	fre "Ne peut crer le fichier '%-.200s' (Errcode: %d)"
+	ger "Kann Datei '%-.200s' nicht erzeugen (Fehler: %d)"
+	greek "     '%-.200s' ( : %d)"
+	hun "A '%-.200s' file nem hozhato letre (hibakod: %d)"
+	ita "Impossibile creare il file '%-.200s' (errno: %d)"
+	jpn "'%-.200s' ե뤬ޤ (errno: %d)"
+	kor "ȭ '%-.200s'  ߽ϴ. (ȣ: %d)"
+	nor "Kan ikke opprette fila '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje opprette fila '%-.200s' (Feilkode: %d)"
+	pol "Nie mona stworzy pliku '%-.200s' (Kod bdu: %d)"
+	por "No pode criar o arquivo '%-.200s' (erro no. %d)"
+	rum "Nu pot sa creez fisierul '%-.200s' (Eroare: %d)"
+	rus "   '%-.200s' (: %d)"
+	serbian "Ne mogu da kreiram file '%-.200s' (errno: %d)"
+	slo "Nemem vytvori sbor '%-.200s' (chybov kd: %d)"
+	spa "No puedo crear archivo '%-.200s' (Error: %d)"
+	swe "Kan inte skapa filen '%-.200s' (Felkod: %d)"
+	ukr "    '%-.200s' (: %d)"
 ER_CANT_CREATE_TABLE  
-	cze "Nemohu vytvo-Bit tabulku '%-.64s' (chybov kd: %d)"
-	dan "Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)"
-	nla "Kan tabel '%-.64s' niet aanmaken (Errcode: %d)"
+	cze "Nemohu vytvo-Bit tabulku '%-.200s' (chybov kd: %d)"
+	dan "Kan ikke oprette tabellen '%-.200s' (Fejlkode: %d)"
+	nla "Kan tabel '%-.200s' niet aanmaken (Errcode: %d)"
 	eng "Can't create table '%-.200s' (errno: %d)"
-	jps "'%-.64s' e[u܂.(errno: %d)",
-	est "Ei suuda luua tabelit '%-.64s' (veakood: %d)"
-	fre "Ne peut crer la table '%-.64s' (Errcode: %d)"
-	ger "Kann Tabelle '%-.64s' nicht erzeugen (Fehler: %d)"
-	greek "     '%-.64s' ( : %d)"
-	hun "A '%-.64s' tabla nem hozhato letre (hibakod: %d)"
-	ita "Impossibile creare la tabella '%-.64s' (errno: %d)"
-	jpn "'%-.64s' ơ֥뤬ޤ.(errno: %d)"
-	kor "̺ '%-.64s'  ߽ϴ. (ȣ: %d)"
-	nor "Kan ikke opprette tabellen '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje opprette tabellen '%-.64s' (Feilkode: %d)"
-	pol "Nie mona stworzy tabeli '%-.64s' (Kod bdu: %d)"
-	por "No pode criar a tabela '%-.64s' (erro no. %d)"
-	rum "Nu pot sa creez tabla '%-.64s' (Eroare: %d)"
-	rus "   '%-.64s' (: %d)"
-	serbian "Ne mogu da kreiram tabelu '%-.64s' (errno: %d)"
-	slo "Nemem vytvori tabuku '%-.64s' (chybov kd: %d)"
-	spa "No puedo crear tabla '%-.64s' (Error: %d)"
-	swe "Kan inte skapa tabellen '%-.64s' (Felkod: %d)"
-	ukr "    '%-.64s' (: %d)"
+	jps "'%-.200s' e[u܂.(errno: %d)",
+	est "Ei suuda luua tabelit '%-.200s' (veakood: %d)"
+	fre "Ne peut crer la table '%-.200s' (Errcode: %d)"
+	ger "Kann Tabelle '%-.200s' nicht erzeugen (Fehler: %d)"
+	greek "     '%-.200s' ( : %d)"
+	hun "A '%-.200s' tabla nem hozhato letre (hibakod: %d)"
+	ita "Impossibile creare la tabella '%-.200s' (errno: %d)"
+	jpn "'%-.200s' ơ֥뤬ޤ.(errno: %d)"
+	kor "̺ '%-.200s'  ߽ϴ. (ȣ: %d)"
+	nor "Kan ikke opprette tabellen '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje opprette tabellen '%-.200s' (Feilkode: %d)"
+	pol "Nie mona stworzy tabeli '%-.200s' (Kod bdu: %d)"
+	por "No pode criar a tabela '%-.200s' (erro no. %d)"
+	rum "Nu pot sa creez tabla '%-.200s' (Eroare: %d)"
+	rus "   '%-.200s' (: %d)"
+	serbian "Ne mogu da kreiram tabelu '%-.200s' (errno: %d)"
+	slo "Nemem vytvori tabuku '%-.200s' (chybov kd: %d)"
+	spa "No puedo crear tabla '%-.200s' (Error: %d)"
+	swe "Kan inte skapa tabellen '%-.200s' (Felkod: %d)"
+	ukr "    '%-.200s' (: %d)"
 ER_CANT_CREATE_DB  
 	cze "Nemohu vytvo-Bit databzi '%-.64s' (chybov kd: %d)"
 	dan "Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)"
@@ -275,30 +275,30 @@ ER_CANT_FIND_SYSTEM_REC
 	swe "Hittar inte posten i systemregistret"
 	ukr "     ϧ æ"
 ER_CANT_GET_STAT  
-	cze "Nemohu z-Bskat stav '%-.64s' (chybov kd: %d)"
-	dan "Kan ikke lse status af '%-.64s' (Fejlkode: %d)"
-	nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"
+	cze "Nemohu z-Bskat stav '%-.200s' (chybov kd: %d)"
+	dan "Kan ikke lse status af '%-.200s' (Fejlkode: %d)"
+	nla "Kan de status niet krijgen van '%-.200s' (Errcode: %d)"
 	eng "Can't get status of '%-.200s' (errno: %d)"
-	jps "'%-.64s' ̃XeC^X܂. (errno: %d)",
-	est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"
-	fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
-	ger "Kann Status von '%-.64s' nicht ermitteln (Fehler: %d)"
-	greek "        '%-.64s' ( : %d)"
-	hun "A(z) '%-.64s' statusza nem allapithato meg (hibakod: %d)"
-	ita "Impossibile leggere lo stato di '%-.64s' (errno: %d)"
-	jpn "'%-.64s' Υƥޤ. (errno: %d)"
-	kor "'%-.64s' ¸  ߽ϴ. (ȣ: %d)"
-	nor "Kan ikke lese statusen til '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje lese statusen til '%-.64s' (Feilkode: %d)"
-	pol "Nie mona otrzyma statusu '%-.64s' (Kod bdu: %d)"
-	por "No pode obter o status de '%-.64s' (erro no. %d)"
-	rum "Nu pot sa obtin statusul lui '%-.64s' (Eroare: %d)"
-	rus "     '%-.64s' (: %d)"
-	serbian "Ne mogu da dobijem stanje file-a '%-.64s' (errno: %d)"
-	slo "Nemem zisti stav '%-.64s' (chybov kd: %d)"
-	spa "No puedo obtener el estado de '%-.64s' (Error: %d)"
-	swe "Kan inte lsa filinformationen (stat) frn '%-.64s' (Felkod: %d)"
-	ukr "    '%-.64s' (: %d)"
+	jps "'%-.200s' ̃XeC^X܂. (errno: %d)",
+	est "Ei suuda lugeda '%-.200s' olekut (veakood: %d)"
+	fre "Ne peut obtenir le status de '%-.200s' (Errcode: %d)"
+	ger "Kann Status von '%-.200s' nicht ermitteln (Fehler: %d)"
+	greek "        '%-.200s' ( : %d)"
+	hun "A(z) '%-.200s' statusza nem allapithato meg (hibakod: %d)"
+	ita "Impossibile leggere lo stato di '%-.200s' (errno: %d)"
+	jpn "'%-.200s' Υƥޤ. (errno: %d)"
+	kor "'%-.200s' ¸  ߽ϴ. (ȣ: %d)"
+	nor "Kan ikke lese statusen til '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje lese statusen til '%-.200s' (Feilkode: %d)"
+	pol "Nie mona otrzyma statusu '%-.200s' (Kod bdu: %d)"
+	por "No pode obter o status de '%-.200s' (erro no. %d)"
+	rum "Nu pot sa obtin statusul lui '%-.200s' (Eroare: %d)"
+	rus "     '%-.200s' (: %d)"
+	serbian "Ne mogu da dobijem stanje file-a '%-.200s' (errno: %d)"
+	slo "Nemem zisti stav '%-.200s' (chybov kd: %d)"
+	spa "No puedo obtener el estado de '%-.200s' (Error: %d)"
+	swe "Kan inte lsa filinformationen (stat) frn '%-.200s' (Felkod: %d)"
+	ukr "    '%-.200s' (: %d)"
 ER_CANT_GET_WD  
 	cze "Chyba p-Bi zjiovn pracovn adres (chybov kd: %d)"
 	dan "Kan ikke lse aktive folder (Fejlkode: %d)"
@@ -350,55 +350,55 @@ ER_CANT_LOCK
 	swe "Kan inte lsa filen. (Felkod: %d)"
 	ukr "    (: %d)"
 ER_CANT_OPEN_FILE  
-	cze "Nemohu otev-Bt soubor '%-.64s' (chybov kd: %d)"
-	dan "Kan ikke bne fil: '%-.64s' (Fejlkode: %d)"
-	nla "Kan de file '%-.64s' niet openen (Errcode: %d)"
+	cze "Nemohu otev-Bt soubor '%-.200s' (chybov kd: %d)"
+	dan "Kan ikke bne fil: '%-.200s' (Fejlkode: %d)"
+	nla "Kan de file '%-.200s' niet openen (Errcode: %d)"
 	eng "Can't open file: '%-.200s' (errno: %d)"
-	jps "'%-.64s' t@CJł܂ (errno: %d)",
-	est "Ei suuda avada faili '%-.64s' (veakood: %d)"
-	fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
-	ger "Kann Datei '%-.64s' nicht ffnen (Fehler: %d)"
-	greek "      : '%-.64s' ( : %d)"
-	hun "A '%-.64s' file nem nyithato meg (hibakod: %d)"
-	ita "Impossibile aprire il file: '%-.64s' (errno: %d)"
-	jpn "'%-.64s' ե򳫤Ǥޤ (errno: %d)"
-	kor "ȭ  ߽ϴ.: '%-.64s' (ȣ: %d)"
-	nor "Kan ikke pne fila: '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje pne fila: '%-.64s' (Feilkode: %d)"
-	pol "Nie mona otworzy pliku: '%-.64s' (Kod bdu: %d)"
-	por "No pode abrir o arquivo '%-.64s' (erro no. %d)"
-	rum "Nu pot sa deschid fisierul: '%-.64s' (Eroare: %d)"
-	rus "  : '%-.64s' (: %d)"
-	serbian "Ne mogu da otvorim file: '%-.64s' (errno: %d)"
-	slo "Nemem otvori sbor: '%-.64s' (chybov kd: %d)"
-	spa "No puedo abrir archivo: '%-.64s' (Error: %d)"
-	swe "Kan inte anvnda '%-.64s' (Felkod: %d)"
-	ukr "  צ : '%-.64s' (: %d)"
+	jps "'%-.200s' t@CJł܂ (errno: %d)",
+	est "Ei suuda avada faili '%-.200s' (veakood: %d)"
+	fre "Ne peut ouvrir le fichier: '%-.200s' (Errcode: %d)"
+	ger "Kann Datei '%-.200s' nicht ffnen (Fehler: %d)"
+	greek "      : '%-.200s' ( : %d)"
+	hun "A '%-.200s' file nem nyithato meg (hibakod: %d)"
+	ita "Impossibile aprire il file: '%-.200s' (errno: %d)"
+	jpn "'%-.200s' ե򳫤Ǥޤ (errno: %d)"
+	kor "ȭ  ߽ϴ.: '%-.200s' (ȣ: %d)"
+	nor "Kan ikke pne fila: '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje pne fila: '%-.200s' (Feilkode: %d)"
+	pol "Nie mona otworzy pliku: '%-.200s' (Kod bdu: %d)"
+	por "No pode abrir o arquivo '%-.200s' (erro no. %d)"
+	rum "Nu pot sa deschid fisierul: '%-.200s' (Eroare: %d)"
+	rus "  : '%-.200s' (: %d)"
+	serbian "Ne mogu da otvorim file: '%-.200s' (errno: %d)"
+	slo "Nemem otvori sbor: '%-.200s' (chybov kd: %d)"
+	spa "No puedo abrir archivo: '%-.200s' (Error: %d)"
+	swe "Kan inte anvnda '%-.200s' (Felkod: %d)"
+	ukr "  צ : '%-.200s' (: %d)"
 ER_FILE_NOT_FOUND  
-	cze "Nemohu naj-Bt soubor '%-.64s' (chybov kd: %d)"
-	dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"
-	nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"
+	cze "Nemohu naj-Bt soubor '%-.200s' (chybov kd: %d)"
+	dan "Kan ikke finde fila: '%-.200s' (Fejlkode: %d)"
+	nla "Kan de file: '%-.200s' niet vinden (Errcode: %d)"
 	eng "Can't find file: '%-.200s' (errno: %d)"
-	jps "'%-.64s' t@Ct鎖ł܂.(errno: %d)",
-	est "Ei suuda leida faili '%-.64s' (veakood: %d)"
-	fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
-	ger "Kann Datei '%-.64s' nicht finden (Fehler: %d)"
-	greek "   : '%-.64s' ( : %d)"
-	hun "A(z) '%-.64s' file nem talalhato (hibakod: %d)"
-	ita "Impossibile trovare il file: '%-.64s' (errno: %d)"
-	jpn "'%-.64s' եդǤޤ.(errno: %d)"
-	kor "ȭ ã ߽ϴ.: '%-.64s' (ȣ: %d)"
-	nor "Kan ikke finne fila: '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje finne fila: '%-.64s' (Feilkode: %d)"
-	pol "Nie mona znale pliku: '%-.64s' (Kod bdu: %d)"
-	por "No pode encontrar o arquivo '%-.64s' (erro no. %d)"
-	rum "Nu pot sa gasesc fisierul: '%-.64s' (Eroare: %d)"
-	rus "  : '%-.64s' (: %d)"
-	serbian "Ne mogu da pronaem file: '%-.64s' (errno: %d)"
-	slo "Nemem njs sbor: '%-.64s' (chybov kd: %d)"
-	spa "No puedo encontrar archivo: '%-.64s' (Error: %d)"
-	swe "Hittar inte filen '%-.64s' (Felkod: %d)"
-	ukr "   : '%-.64s' (: %d)"
+	jps "'%-.200s' t@Ct鎖ł܂.(errno: %d)",
+	est "Ei suuda leida faili '%-.200s' (veakood: %d)"
+	fre "Ne peut trouver le fichier: '%-.200s' (Errcode: %d)"
+	ger "Kann Datei '%-.200s' nicht finden (Fehler: %d)"
+	greek "   : '%-.200s' ( : %d)"
+	hun "A(z) '%-.200s' file nem talalhato (hibakod: %d)"
+	ita "Impossibile trovare il file: '%-.200s' (errno: %d)"
+	jpn "'%-.200s' եդǤޤ.(errno: %d)"
+	kor "ȭ ã ߽ϴ.: '%-.200s' (ȣ: %d)"
+	nor "Kan ikke finne fila: '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje finne fila: '%-.200s' (Feilkode: %d)"
+	pol "Nie mona znale pliku: '%-.200s' (Kod bdu: %d)"
+	por "No pode encontrar o arquivo '%-.200s' (erro no. %d)"
+	rum "Nu pot sa gasesc fisierul: '%-.200s' (Eroare: %d)"
+	rus "  : '%-.200s' (: %d)"
+	serbian "Ne mogu da pronaem file: '%-.200s' (errno: %d)"
+	slo "Nemem njs sbor: '%-.200s' (chybov kd: %d)"
+	spa "No puedo encontrar archivo: '%-.200s' (Error: %d)"
+	swe "Hittar inte filen '%-.200s' (Felkod: %d)"
+	ukr "   : '%-.200s' (: %d)"
 ER_CANT_READ_DIR  
 	cze "Nemohu -Bst adres '%-.64s' (chybov kd: %d)"
 	dan "Kan ikke lse folder '%-.64s' (Fejlkode: %d)"
@@ -480,7 +480,7 @@ ER_DISK_FULL
 	jps "Disk full (%s). N炷܂ł܂Ă...",
 	est "Ketas tis (%s). Ootame kuni tekib vaba ruumi..."
 	fre "Disque plein (%s). J'attend que quelqu'un libre de l'espace..."
-	ger "Festplatte voll (%-.64s). Warte, bis jemand Platz schafft ..."
+	ger "Festplatte voll (%s). Warte, bis jemand Platz schafft ..."
 	greek "     (%s). ,    ..."
 	hun "A lemez megtelt (%s)."
 	ita "Disco pieno (%s). In attesa che qualcuno liberi un po' di spazio..."
@@ -546,80 +546,80 @@ ER_ERROR_ON_CLOSE
 	swe "Fick fel vid stngning av '%-.64s' (Felkod: %d)"
 	ukr "   '%-.64s' (: %d)"
 ER_ERROR_ON_READ  
-	cze "Chyba p-Bi ten souboru '%-.64s' (chybov kd: %d)"
-	dan "Fejl ved lsning af '%-.64s' (Fejlkode: %d)"
-	nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"
+	cze "Chyba p-Bi ten souboru '%-.200s' (chybov kd: %d)"
+	dan "Fejl ved lsning af '%-.200s' (Fejlkode: %d)"
+	nla "Fout bij het lezen van file '%-.200s' (Errcode: %d)"
 	eng "Error reading file '%-.200s' (errno: %d)"
-	jps "'%-.64s' t@C̓ǂݍ݃G[ (errno: %d)",
-	est "Viga faili '%-.64s' lugemisel (veakood: %d)"
-	fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
-	ger "Fehler beim Lesen der Datei '%-.64s' (Fehler: %d)"
-	greek "      '%-.64s' ( : %d)"
-	hun "Hiba a '%-.64s'file olvasasakor. (hibakod: %d)"
-	ita "Errore durante la lettura del file '%-.64s' (errno: %d)"
-	jpn "'%-.64s' եɤ߹ߥ顼 (errno: %d)"
-	kor "'%-.64s'ȭ б  (ȣ: %d)"
-	nor "Feil ved lesing av '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Feil ved lesing av '%-.64s' (Feilkode: %d)"
-	pol "B?d podczas odczytu pliku '%-.64s' (Kod bdu: %d)"
-	por "Erro ao ler arquivo '%-.64s' (erro no. %d)"
-	rum "Eroare citind fisierul '%-.64s' (errno: %d)"
-	rus "   '%-.64s' (: %d)"
-	serbian "Greka pri itanju file-a '%-.64s' (errno: %d)"
-	slo "Chyba pri tan sboru '%-.64s' (chybov kd: %d)"
-	spa "Error leyendo el fichero '%-.64s' (Error: %d)"
-	swe "Fick fel vid lsning av '%-.64s' (Felkod %d)"
-	ukr "    '%-.64s' (: %d)"
+	jps "'%-.200s' t@C̓ǂݍ݃G[ (errno: %d)",
+	est "Viga faili '%-.200s' lugemisel (veakood: %d)"
+	fre "Erreur en lecture du fichier '%-.200s' (Errcode: %d)"
+	ger "Fehler beim Lesen der Datei '%-.200s' (Fehler: %d)"
+	greek "      '%-.200s' ( : %d)"
+	hun "Hiba a '%-.200s'file olvasasakor. (hibakod: %d)"
+	ita "Errore durante la lettura del file '%-.200s' (errno: %d)"
+	jpn "'%-.200s' եɤ߹ߥ顼 (errno: %d)"
+	kor "'%-.200s'ȭ б  (ȣ: %d)"
+	nor "Feil ved lesing av '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Feil ved lesing av '%-.200s' (Feilkode: %d)"
+	pol "B?d podczas odczytu pliku '%-.200s' (Kod bdu: %d)"
+	por "Erro ao ler arquivo '%-.200s' (erro no. %d)"
+	rum "Eroare citind fisierul '%-.200s' (errno: %d)"
+	rus "   '%-.200s' (: %d)"
+	serbian "Greka pri itanju file-a '%-.200s' (errno: %d)"
+	slo "Chyba pri tan sboru '%-.200s' (chybov kd: %d)"
+	spa "Error leyendo el fichero '%-.200s' (Error: %d)"
+	swe "Fick fel vid lsning av '%-.200s' (Felkod %d)"
+	ukr "    '%-.200s' (: %d)"
 ER_ERROR_ON_RENAME  
-	cze "Chyba p-Bi pejmenovn '%-.64s' na '%-.64s' (chybov kd: %d)"
-	dan "Fejl ved omdbning af '%-.64s' til '%-.64s' (Fejlkode: %d)"
-	nla "Fout bij het hernoemen van '%-.64s' naar '%-.64s' (Errcode: %d)"
+	cze "Chyba p-Bi pejmenovn '%-.150s' na '%-.150s' (chybov kd: %d)"
+	dan "Fejl ved omdbning af '%-.150s' til '%-.150s' (Fejlkode: %d)"
+	nla "Fout bij het hernoemen van '%-.150s' naar '%-.150s' (Errcode: %d)"
 	eng "Error on rename of '%-.150s' to '%-.150s' (errno: %d)"
-	jps "'%-.64s'  '%-.64s'  rename ł܂ (errno: %d)",
-	est "Viga faili '%-.64s' mbernimetamisel '%-.64s'-ks (veakood: %d)"
-	fre "Erreur en renommant '%-.64s' en '%-.64s' (Errcode: %d)"
-	ger "Fehler beim Umbenennen von '%-.64s' in '%-.64s' (Fehler: %d)"
-	greek "      '%-.64s' to '%-.64s' ( : %d)"
-	hun "Hiba a '%-.64s' file atnevezesekor. (hibakod: %d)"
-	ita "Errore durante la rinominazione da '%-.64s' a '%-.64s' (errno: %d)"
-	jpn "'%-.64s'  '%-.64s'  rename Ǥޤ (errno: %d)"
-	kor "'%-.64s' '%-.64s' ̸   (ȣ: %d)"
-	nor "Feil ved omdping av '%-.64s' til '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Feil ved omdyping av '%-.64s' til '%-.64s' (Feilkode: %d)"
-	pol "B?d podczas zmieniania nazwy '%-.64s' na '%-.64s' (Kod bdu: %d)"
-	por "Erro ao renomear '%-.64s' para '%-.64s' (erro no. %d)"
-	rum "Eroare incercind sa renumesc '%-.64s' in '%-.64s' (errno: %d)"
-	rus "   '%-.64s'  '%-.64s' (: %d)"
-	serbian "Greka pri promeni imena '%-.64s' na '%-.64s' (errno: %d)"
-	slo "Chyba pri premenovvan '%-.64s' na '%-.64s' (chybov kd: %d)"
-	spa "Error en el renombrado de '%-.64s' a '%-.64s' (Error: %d)"
-	swe "Kan inte byta namn frn '%-.64s' till '%-.64s' (Felkod: %d)"
-	ukr "   '%-.64s'  '%-.64s' (: %d)"
+	jps "'%-.150s'  '%-.150s'  rename ł܂ (errno: %d)",
+	est "Viga faili '%-.150s' mbernimetamisel '%-.150s'-ks (veakood: %d)"
+	fre "Erreur en renommant '%-.150s' en '%-.150s' (Errcode: %d)"
+	ger "Fehler beim Umbenennen von '%-.150s' in '%-.150s' (Fehler: %d)"
+	greek "      '%-.150s' to '%-.150s' ( : %d)"
+	hun "Hiba a '%-.150s' file atnevezesekor '%-.150s'. (hibakod: %d)"
+	ita "Errore durante la rinominazione da '%-.150s' a '%-.150s' (errno: %d)"
+	jpn "'%-.150s'  '%-.150s'  rename Ǥޤ (errno: %d)"
+	kor "'%-.150s' '%-.150s' ̸   (ȣ: %d)"
+	nor "Feil ved omdping av '%-.150s' til '%-.150s' (Feilkode: %d)"
+	norwegian-ny "Feil ved omdyping av '%-.150s' til '%-.150s' (Feilkode: %d)"
+	pol "B?d podczas zmieniania nazwy '%-.150s' na '%-.150s' (Kod bdu: %d)"
+	por "Erro ao renomear '%-.150s' para '%-.150s' (erro no. %d)"
+	rum "Eroare incercind sa renumesc '%-.150s' in '%-.150s' (errno: %d)"
+	rus "   '%-.150s'  '%-.150s' (: %d)"
+	serbian "Greka pri promeni imena '%-.150s' na '%-.150s' (errno: %d)"
+	slo "Chyba pri premenovvan '%-.150s' na '%-.150s' (chybov kd: %d)"
+	spa "Error en el renombrado de '%-.150s' a '%-.150s' (Error: %d)"
+	swe "Kan inte byta namn frn '%-.150s' till '%-.150s' (Felkod: %d)"
+	ukr "   '%-.150s'  '%-.150s' (: %d)"
 ER_ERROR_ON_WRITE  
-	cze "Chyba p-Bi zpisu do souboru '%-.64s' (chybov kd: %d)"
-	dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"
-	nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"
+	cze "Chyba p-Bi zpisu do souboru '%-.200s' (chybov kd: %d)"
+	dan "Fejl ved skriving av filen '%-.200s' (Fejlkode: %d)"
+	nla "Fout bij het wegschrijven van file '%-.200s' (Errcode: %d)"
 	eng "Error writing file '%-.200s' (errno: %d)"
-	jps "'%-.64s' t@Cł܂ (errno: %d)",
-	est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"
-	fre "Erreur d'criture du fichier '%-.64s' (Errcode: %d)"
-	ger "Fehler beim Speichern der Datei '%-.64s' (Fehler: %d)"
-	greek "      '%-.64s' ( : %d)"
-	hun "Hiba a '%-.64s' file irasakor. (hibakod: %d)"
-	ita "Errore durante la scrittura del file '%-.64s' (errno: %d)"
-	jpn "'%-.64s' ե񤯻Ǥޤ (errno: %d)"
-	kor "'%-.64s'ȭ    (ȣ: %d)"
-	nor "Feil ved skriving av fila '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Feil ved skriving av fila '%-.64s' (Feilkode: %d)"
-	pol "B?d podczas zapisywania pliku '%-.64s' (Kod bdu: %d)"
-	por "Erro ao gravar arquivo '%-.64s' (erro no. %d)"
-	rum "Eroare scriind fisierul '%-.64s' (errno: %d)"
-	rus "    '%-.64s' (: %d)"
-	serbian "Greka pri upisu '%-.64s' (errno: %d)"
-	slo "Chyba pri zpise do sboru '%-.64s' (chybov kd: %d)"
-	spa "Error escribiendo el archivo '%-.64s' (Error: %d)"
-	swe "Fick fel vid skrivning till '%-.64s' (Felkod %d)"
-	ukr "    '%-.64s' (: %d)"
+	jps "'%-.200s' t@Cł܂ (errno: %d)",
+	est "Viga faili '%-.200s' kirjutamisel (veakood: %d)"
+	fre "Erreur d'criture du fichier '%-.200s' (Errcode: %d)"
+	ger "Fehler beim Speichern der Datei '%-.200s' (Fehler: %d)"
+	greek "      '%-.200s' ( : %d)"
+	hun "Hiba a '%-.200s' file irasakor. (hibakod: %d)"
+	ita "Errore durante la scrittura del file '%-.200s' (errno: %d)"
+	jpn "'%-.200s' ե񤯻Ǥޤ (errno: %d)"
+	kor "'%-.200s'ȭ    (ȣ: %d)"
+	nor "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
+	pol "B?d podczas zapisywania pliku '%-.200s' (Kod bdu: %d)"
+	por "Erro ao gravar arquivo '%-.200s' (erro no. %d)"
+	rum "Eroare scriind fisierul '%-.200s' (errno: %d)"
+	rus "    '%-.200s' (: %d)"
+	serbian "Greka pri upisu '%-.200s' (errno: %d)"
+	slo "Chyba pri zpise do sboru '%-.200s' (chybov kd: %d)"
+	spa "Error escribiendo el archivo '%-.200s' (Error: %d)"
+	swe "Fick fel vid skrivning till '%-.200s' (Felkod %d)"
+	ukr "    '%-.200s' (: %d)"
 ER_FILE_USED  
 	cze "'%-.64s' je zam-Ben proti zmnm"
 	dan "'%-.64s' er lst mod opdateringer"
@@ -741,7 +741,7 @@ ER_ILLEGAL_HA
 	serbian "Handler tabela za '%-.64s' nema ovu opciju"
 	slo "Obsluha tabuky '%-.64s' nem tento parameter"
 	spa "El manejador de la tabla de '%-.64s' no tiene esta opcion"
-	swe "Registrets databas har inte denna facilitet"
+	swe "Tabellhanteraren for tabell '%-.64s' stdjer ej detta"
 	ukr " æ '%-.64s'   æ Ԧ"
 ER_KEY_NOT_FOUND  
 	cze "Nemohu naj-Bt zznam v '%-.64s'"
@@ -766,58 +766,58 @@ ER_KEY_NOT_FOUND
 	serbian "Ne mogu da pronaem slog u '%-.64s'"
 	slo "Nemem njs zznam v '%-.64s'"
 	spa "No puedo encontrar el registro en '%-.64s'"
-	swe "Hittar inte posten"
+	swe "Hittar inte posten '%-.64s'"
 	ukr "    '%-.64s'"
 ER_NOT_FORM_FILE  
-	cze "Nespr-Bvn informace v souboru '%-.64s'"
-	dan "Forkert indhold i: '%-.64s'"
-	nla "Verkeerde info in file: '%-.64s'"
+	cze "Nespr-Bvn informace v souboru '%-.200s'"
+	dan "Forkert indhold i: '%-.200s'"
+	nla "Verkeerde info in file: '%-.200s'"
 	eng "Incorrect information in file: '%-.200s'"
-	jps "t@C '%-.64s'  info ԈĂ悤ł",
-	est "Vigane informatsioon failis '%-.64s'"
-	fre "Information erronne dans le fichier: '%-.64s'"
-	ger "Falsche Information in Datei '%-.64s'"
-	greek "   : '%-.64s'"
-	hun "Ervenytelen info a file-ban: '%-.64s'"
-	ita "Informazione errata nel file: '%-.64s'"
-	jpn "ե '%-.64s'  info ְäƤ褦Ǥ"
-	kor "ȭ Ȯ : '%-.64s'"
-	nor "Feil informasjon i filen: '%-.64s'"
-	norwegian-ny "Feil informasjon i fila: '%-.64s'"
-	pol "Niewa?ciwa informacja w pliku: '%-.64s'"
-	por "Informao incorreta no arquivo '%-.64s'"
-	rum "Informatie incorecta in fisierul: '%-.64s'"
-	rus "    '%-.64s'"
-	serbian "Pogrena informacija u file-u: '%-.64s'"
-	slo "Nesprvna informcia v sbore: '%-.64s'"
-	spa "Informacion erronea en el archivo: '%-.64s'"
-	swe "Felaktig fil: '%-.64s'"
-	ukr " æ  ̦: '%-.64s'"
+	jps "t@C '%-.200s'  info ԈĂ悤ł",
+	est "Vigane informatsioon failis '%-.200s'"
+	fre "Information erronne dans le fichier: '%-.200s'"
+	ger "Falsche Information in Datei '%-.200s'"
+	greek "   : '%-.200s'"
+	hun "Ervenytelen info a file-ban: '%-.200s'"
+	ita "Informazione errata nel file: '%-.200s'"
+	jpn "ե '%-.200s'  info ְäƤ褦Ǥ"
+	kor "ȭ Ȯ : '%-.200s'"
+	nor "Feil informasjon i filen: '%-.200s'"
+	norwegian-ny "Feil informasjon i fila: '%-.200s'"
+	pol "Niewa?ciwa informacja w pliku: '%-.200s'"
+	por "Informao incorreta no arquivo '%-.200s'"
+	rum "Informatie incorecta in fisierul: '%-.200s'"
+	rus "    '%-.200s'"
+	serbian "Pogrena informacija u file-u: '%-.200s'"
+	slo "Nesprvna informcia v sbore: '%-.200s'"
+	spa "Informacion erronea en el archivo: '%-.200s'"
+	swe "Felaktig fil: '%-.200s'"
+	ukr " æ  ̦: '%-.200s'"
 ER_NOT_KEYFILE  
-	cze "Nespr-Bvn kl pro tabulku '%-.64s'; pokuste se ho opravit"
-	dan "Fejl i indeksfilen til tabellen '%-.64s'; prv at reparere den"
-	nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"
+	cze "Nespr-Bvn kl pro tabulku '%-.200s'; pokuste se ho opravit"
+	dan "Fejl i indeksfilen til tabellen '%-.200s'; prv at reparere den"
+	nla "Verkeerde zoeksleutel file voor tabel: '%-.200s'; probeer het te repareren"
 	eng "Incorrect key file for table '%-.200s'; try to repair it"
-	jps "'%-.64s' e[u key file ԈĂ悤ł. CĂ",
-	est "Tabeli '%-.64s' vtmefail on vigane; proovi seda parandada"
-	fre "Index corrompu dans la table: '%-.64s'; essayez de le rparer"
-	ger "Fehlerhafte Index-Datei fr Tabelle '%-.64s'; versuche zu reparieren"
-	greek "   (key file)   : '%-.64s'; ,  !"
-	hun "Ervenytelen kulcsfile a tablahoz: '%-.64s'; probalja kijavitani!"
-	ita "File chiave errato per la tabella : '%-.64s'; prova a riparalo"
-	jpn "'%-.64s' ơ֥ key file ְäƤ褦Ǥ. 򤷤Ƥ"
-	kor "'%-.64s' ̺ Ȯ Ű . Ͻÿ!"
-	nor "Tabellen '%-.64s' har feil i nkkelfilen; forsk  reparer den"
-	norwegian-ny "Tabellen '%-.64s' har feil i nykkelfila; prv  reparere den"
-	pol "Niewa?ciwy plik kluczy dla tabeli: '%-.64s'; sprbuj go naprawi"
-	por "Arquivo de ndice incorreto para tabela '%-.64s'; tente repar-lo"
-	rum "Cheia fisierului incorecta pentru tabela: '%-.64s'; incearca s-o repari"
-	rus "    : '%-.64s'.   "
-	serbian "Pogrean key file za tabelu: '%-.64s'; probajte da ga ispravite"
-	slo "Nesprvny k pre tabuku '%-.64s'; pokste sa ho opravi"
-	spa "Clave de archivo erronea para la tabla: '%-.64s'; intente repararlo"
-	swe "Fatalt fel vid hantering av register '%-.64s'; kr en reparation"
-	ukr "    æ: '%-.64s';   צ"
+	jps "'%-.200s' e[u key file ԈĂ悤ł. CĂ",
+	est "Tabeli '%-.200s' vtmefail on vigane; proovi seda parandada"
+	fre "Index corrompu dans la table: '%-.200s'; essayez de le rparer"
+	ger "Fehlerhafte Index-Datei fr Tabelle '%-.200s'; versuche zu reparieren"
+	greek "   (key file)   : '%-.200s'; ,  !"
+	hun "Ervenytelen kulcsfile a tablahoz: '%-.200s'; probalja kijavitani!"
+	ita "File chiave errato per la tabella : '%-.200s'; prova a riparalo"
+	jpn "'%-.200s' ơ֥ key file ְäƤ褦Ǥ. 򤷤Ƥ"
+	kor "'%-.200s' ̺ Ȯ Ű . Ͻÿ!"
+	nor "Tabellen '%-.200s' har feil i nkkelfilen; forsk  reparer den"
+	norwegian-ny "Tabellen '%-.200s' har feil i nykkelfila; prv  reparere den"
+	pol "Niewa?ciwy plik kluczy dla tabeli: '%-.200s'; sprbuj go naprawi"
+	por "Arquivo de ndice incorreto para tabela '%-.200s'; tente repar-lo"
+	rum "Cheia fisierului incorecta pentru tabela: '%-.200s'; incearca s-o repari"
+	rus "    : '%-.200s'.   "
+	serbian "Pogrean key file za tabelu: '%-.200s'; probajte da ga ispravite"
+	slo "Nesprvny k pre tabuku '%-.200s'; pokste sa ho opravi"
+	spa "Clave de archivo erronea para la tabla: '%-.200s'; intente repararlo"
+	swe "Fatalt fel vid hantering av register '%-.200s'; kr en reparation"
+	ukr "    æ: '%-.200s';   צ"
 ER_OLD_KEYFILE  
 	cze "Star-B klov soubor pro '%-.64s'; opravte ho."
 	dan "Gammel indeksfil for tabellen '%-.64s'; reparer den"
@@ -1072,7 +1072,7 @@ ER_ACCESS_DENIED_ERROR 28000
 	jps "[U[ '%-.32s'@'%-.64s' ۂ܂.uUsing password: %s)",
 	est "Ligips keelatud kasutajale '%-.32s'@'%-.64s' (kasutab parooli: %s)"
 	fre "Accs refus pour l'utilisateur: '%-.32s'@'@%-.64s' (mot de passe: %s)"
-	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung (verwendetes Passwort: %-.64s)"
+	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung (verwendetes Passwort: %s)"
 	greek "     : '%-.32s'@'%-.64s' ( password: %s)"
 	hun "A(z) '%-.32s'@'%-.64s' felhasznalo szamara tiltott eleres. (Hasznalja a jelszot: %s)"
 	ita "Accesso non consentito per l'utente: '%-.32s'@'%-.64s' (Password: %s)"
@@ -1239,28 +1239,28 @@ ER_BAD_TABLE_ERROR 42S02
 	swe "Oknd tabell '%-.100s'"
 	ukr "צ  '%-.100s'"
 ER_NON_UNIQ_ERROR 23000 
-	cze "Sloupec '%-.64s' v %s nen-B zcela jasn"
-	dan "Felt: '%-.64s' i tabel %s er ikke entydigt"
-	nla "Kolom: '%-.64s' in %s is niet eenduidig"
+	cze "Sloupec '%-.64s' v %-.64s nen-B zcela jasn"
+	dan "Felt: '%-.64s' i tabel %-.64s er ikke entydigt"
+	nla "Kolom: '%-.64s' in %-.64s is niet eenduidig"
 	eng "Column '%-.64s' in %-.64s is ambiguous"
 	est "Vli '%-.64s' %-.64s-s ei ole hene"
-	fre "Champ: '%-.64s' dans %s est ambigu"
+	fre "Champ: '%-.64s' dans %-.64s est ambigu"
 	ger "Feld '%-.64s' in %-.64s ist nicht eindeutig"
 	greek " : '%-.64s'  %-.64s   "
 	hun "A(z) '%-.64s' oszlop %-.64s-ben ketertelmu"
 	ita "Colonna: '%-.64s' di %-.64s e` ambigua"
 	jpn "Column: '%-.64s' in %-.64s is ambiguous"
 	kor "Į: '%-.64s' in '%-.64s'  ȣ"
-	nor "Felt: '%-.64s' i tabell %s er ikke entydig"
-	norwegian-ny "Kolonne: '%-.64s' i tabell %s er ikkje eintydig"
-	pol "Kolumna: '%-.64s' w  %s jest dwuznaczna"
+	nor "Felt: '%-.64s' i tabell %-.64s er ikke entydig"
+	norwegian-ny "Kolonne: '%-.64s' i tabell %-.64s er ikkje eintydig"
+	pol "Kolumna: '%-.64s' w  %-.64s jest dwuznaczna"
 	por "Coluna '%-.64s' em '%-.64s'  ambgua"
 	rum "Coloana: '%-.64s' in %-.64s este ambigua"
 	rus " '%-.64s'  %-.64s  "
 	serbian "Kolona '%-.64s' u %-.64s nije jedinstvena u kontekstu"
 	slo "Pole: '%-.64s' v %-.64s je nejasn"
-	spa "La columna: '%-.64s' en %s es ambigua"
-	swe "Kolumn '%-.64s' i %s r inte unik"
+	spa "La columna: '%-.64s' en %-.64s es ambigua"
+	swe "Kolumn '%-.64s' i %-.64s r inte unik"
 	ukr " '%-.64s'  %-.64s  "
 ER_SERVER_SHUTDOWN 08S01 
 	cze "Prob-Bh ukonovn prce serveru"
@@ -1288,29 +1288,29 @@ ER_SERVER_SHUTDOWN 08S01
 	swe "Servern gr nu ned"
 	ukr "դ  "
 ER_BAD_FIELD_ERROR 42S22 S0022
-	cze "Nezn-Bm sloupec '%-.64s' v %s"
-	dan "Ukendt kolonne '%-.64s' i tabel %s"
-	nla "Onbekende kolom '%-.64s' in %s"
+	cze "Nezn-Bm sloupec '%-.64s' v %-.64s"
+	dan "Ukendt kolonne '%-.64s' i tabel %-.64s"
+	nla "Onbekende kolom '%-.64s' in %-.64s"
 	eng "Unknown column '%-.64s' in '%-.64s'"
 	jps "'%-.64s' column  '%-.64s' ɂ͂܂.",
 	est "Tundmatu tulp '%-.64s' '%-.64s'-s"
-	fre "Champ '%-.64s' inconnu dans %s"
+	fre "Champ '%-.64s' inconnu dans %-.64s"
 	ger "Unbekanntes Tabellenfeld '%-.64s' in %-.64s"
 	greek "  '%-.64s'  '%-.64s'"
 	hun "A(z) '%-.64s' oszlop ervenytelen '%-.64s'-ben"
 	ita "Colonna sconosciuta '%-.64s' in '%-.64s'"
 	jpn "'%-.64s' column  '%-.64s' ˤϤޤ."
 	kor "Unknown Į '%-.64s' in '%-.64s'"
-	nor "Ukjent kolonne '%-.64s' i tabell %s"
-	norwegian-ny "Ukjent felt '%-.64s' i tabell %s"
-	pol "Nieznana kolumna '%-.64s' w  %s"
+	nor "Ukjent kolonne '%-.64s' i tabell %-.64s"
+	norwegian-ny "Ukjent felt '%-.64s' i tabell %-.64s"
+	pol "Nieznana kolumna '%-.64s' w  %-.64s"
 	por "Coluna '%-.64s' desconhecida em '%-.64s'"
 	rum "Coloana invalida '%-.64s' in '%-.64s'"
 	rus "  '%-.64s'  '%-.64s'"
 	serbian "Nepoznata kolona '%-.64s' u '%-.64s'"
 	slo "Neznme pole '%-.64s' v '%-.64s'"
-	spa "La columna '%-.64s' en %s es desconocida"
-	swe "Oknd kolumn '%-.64s' i %s"
+	spa "La columna '%-.64s' en %-.64s es desconocida"
+	swe "Oknd kolumn '%-.64s' i %-.64s"
 	ukr "צ  '%-.64s'  '%-.64s'"
 ER_WRONG_FIELD_WITH_GROUP 42000 S1009
 	cze "Pou-Bit '%-.64s' nebylo v group by"
@@ -1404,29 +1404,29 @@ ER_WRONG_VALUE_COUNT 21S01
 	swe "Antalet kolumner motsvarar inte antalet vrden"
 	ukr "˦ æ  Ц  ˦˦ "
 ER_TOO_LONG_IDENT 42000 S1009
-	cze "Jm-Bno identifiktoru '%-.64s' je pli dlouh"
-	dan "Navnet '%-.64s' er for langt"
-	nla "Naam voor herkenning '%-.64s' is te lang"
+	cze "Jm-Bno identifiktoru '%-.100s' je pli dlouh"
+	dan "Navnet '%-.100s' er for langt"
+	nla "Naam voor herkenning '%-.100s' is te lang"
 	eng "Identifier name '%-.100s' is too long"
 	jps "Identifier name '%-.100s' ͒܂",
 	est "Identifikaatori '%-.100s' nimi on liiga pikk"
-	fre "Le nom de l'identificateur '%-.64s' est trop long"
+	fre "Le nom de l'identificateur '%-.100s' est trop long"
 	ger "Name des Bezeichners '%-.100s' ist zu lang"
 	greek " identifier name '%-.100s'   "
 	hun "A(z) '%-.100s' azonositonev tul hosszu."
 	ita "Il nome dell'identificatore '%-.100s' e` troppo lungo"
 	jpn "Identifier name '%-.100s' Ĺޤ"
 	kor "Identifier '%-.100s' ʹ 決."
-	nor "Identifikator '%-.64s' er for lang"
-	norwegian-ny "Identifikator '%-.64s' er for lang"
-	pol "Nazwa identyfikatora '%-.64s' jest zbyt duga"
+	nor "Identifikator '%-.100s' er for lang"
+	norwegian-ny "Identifikator '%-.100s' er for lang"
+	pol "Nazwa identyfikatora '%-.100s' jest zbyt duga"
 	por "Nome identificador '%-.100s'  longo demais"
 	rum "Numele indentificatorului '%-.100s' este prea lung"
 	rus "   '%-.100s'"
 	serbian "Ime '%-.100s' je predugako"
 	slo "Meno identifiktora '%-.100s' je prli dlh"
-	spa "El nombre del identificador '%-.64s' es demasiado grande"
-	swe "Kolumnnamn '%-.64s' r fr lngt"
+	spa "El nombre del identificador '%-.100s' es demasiado grande"
+	swe "Kolumnnamn '%-.100s' r fr lngt"
 	ukr "' Ʀ '%-.100s' "
 ER_DUP_FIELDNAME 42S21 S1009
 	cze "Zdvojen-B jmno sloupce '%-.64s'"
@@ -1527,29 +1527,29 @@ ER_WRONG_FIELD_SPEC 42000 S1009
 	swe "Felaktigt kolumntyp fr kolumn '%-.64s'"
 	ukr "צ Ʀ  '%-.64s'"
 ER_PARSE_ERROR 42000 
-	cze "%s bl-Bzko '%-.64s' na dku %d"
-	dan "%s nr '%-.64s' p linje %d"
-	nla "%s bij '%-.64s' in regel %d"
+	cze "%s bl-Bzko '%-.80s' na dku %d"
+	dan "%s nr '%-.80s' p linje %d"
+	nla "%s bij '%-.80s' in regel %d"
 	eng "%s near '%-.80s' at line %d"
 	jps "%s  : '%-.80s' t  : %d s",
 	est "%s '%-.80s' ligidal real %d"
-	fre "%s prs de '%-.64s'  la ligne %d"
+	fre "%s prs de '%-.80s'  la ligne %d"
 	ger "%s bei '%-.80s' in Zeile %d"
 	greek "%s  '%-.80s'   %d"
 	hun "A %s a '%-.80s'-hez kozeli a %d sorban"
 	ita "%s vicino a '%-.80s' linea %d"
 	jpn "%s  : '%-.80s' ն  : %d "
-	kor "'%-.64s'  ϴ. ('%-.80s' ɾ  %d)"
-	nor "%s nr '%-.64s' p linje %d"
-	norwegian-ny "%s attmed '%-.64s' p line %d"
-	pol "%s obok '%-.64s' w linii %d"
+	kor "'%s'  ϴ. ('%-.80s' ɾ  %d)"
+	nor "%s nr '%-.80s' p linje %d"
+	norwegian-ny "%s attmed '%-.80s' p line %d"
+	pol "%s obok '%-.80s' w linii %d"
 	por "%s prximo a '%-.80s' na linha %d"
 	rum "%s linga '%-.80s' pe linia %d"
 	rus "%s  '%-.80s'   %d"
 	serbian "'%s' u iskazu '%-.80s' na liniji %d"
 	slo "%s blzko '%-.80s' na riadku %d"
-	spa "%s cerca '%-.64s' en la linea %d"
-	swe "%s nra '%-.64s' p rad %d"
+	spa "%s cerca '%-.80s' en la linea %d"
+	swe "%s nra '%-.80s' p rad %d"
 	ukr "%s ¦ '%-.80s'  æ %d"
 ER_EMPTY_QUERY 42000  
 	cze "V-Bsledek dotazu je przdn"
@@ -1821,30 +1821,30 @@ ER_WRONG_AUTO_KEY 42000 S1009
 	swe "Det fr finnas endast ett AUTO_INCREMENT-flt och detta mste vara en nyckel"
 	ukr "צ  æ;      ,      "
 ER_READY  
-	cze "%s: p-Bipraven na spojen"
-	dan "%s: klar til tilslutninger"
-	nla "%s: klaar voor verbindingen"
+	cze "%s: p-Bipraven na spojen\nVersion: '%s'  socket: '%s'  port: %d"
+	dan "%s: klar til tilslutninger\nVersion: '%s'  socket: '%s'  port: %d"
+	nla "%s: klaar voor verbindingen\nVersion: '%s'  socket: '%s'  port: %d"
 	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d"
-	jps "%s: ",
-	est "%s: ootab hendusi"
-	fre "%s: Prt pour des connections"
-	ger "%-.64s: Bereit fr Verbindungen.\nVersion: '%2'  Socket: '%s'  Port: %d"
-	greek "%s:   "
-	hun "%s: kapcsolatra kesz"
-	ita "%s: Pronto per le connessioni\n"
-	jpn "%s: λ"
-	kor "%s:  غԴϴ"
-	nor "%s: klar for tilkoblinger"
-	norwegian-ny "%s: klar for tilkoblingar"
-	pol "%s: gotowe do po?czenia"
-	por "%s: Pronto para conexes"
-	rum "%s: sint gata pentru conectii"
-	rus "%s:   .\n: '%s'  : '%s'  : %d  %s"
-	serbian "%s: Spreman za konekcije\n"
-	slo "%s: pripraven na spojenie"
-	spa "%s: preparado para conexiones"
-	swe "%s: klar att ta emot klienter"
-	ukr "%s:   '!"
+	jps "%s: \nVersion: '%s'  socket: '%s'  port: %d",
+	est "%s: ootab hendusi\nVersion: '%s'  socket: '%s'  port: %d"
+	fre "%s: Prt pour des connections\nVersion: '%s'  socket: '%s'  port: %d"
+	ger "%s: Bereit fr Verbindungen.\nVersion: '%s'  Socket: '%s'  Port: %d"
+	greek "%s:   \nVersion: '%s'  socket: '%s'  port: %d"
+	hun "%s: kapcsolatra kesz\nVersion: '%s'  socket: '%s'  port: %d"
+	ita "%s: Pronto per le connessioni\nVersion: '%s'  socket: '%s'  port: %d"
+	jpn "%s: λ\nVersion: '%s'  socket: '%s'  port: %d"
+	kor "%s:  غԴϴ\nVersion: '%s'  socket: '%s'  port: %d"
+	nor "%s: klar for tilkoblinger\nVersion: '%s'  socket: '%s'  port: %d"
+	norwegian-ny "%s: klar for tilkoblingar\nVersion: '%s'  socket: '%s'  port: %d"
+	pol "%s: gotowe do po?czenia\nVersion: '%s'  socket: '%s'  port: %d"
+	por "%s: Pronto para conexes\nVersion: '%s'  socket: '%s'  port: %d"
+	rum "%s: sint gata pentru conectii\nVersion: '%s'  socket: '%s'  port: %d"
+	rus "%s:   .\n: '%s'  : '%s'  : %d"
+	serbian "%s: Spreman za konekcije\nVersion: '%s'  socket: '%s'  port: %d"
+	slo "%s: pripraven na spojenie\nVersion: '%s'  socket: '%s'  port: %d"
+	spa "%s: preparado para conexiones\nVersion: '%s'  socket: '%s'  port: %d"
+	swe "%s: klar att ta emot klienter\nVersion: '%s'  socket: '%s'  port: %d"
+	ukr "%s:   '!\nVersion: '%s'  socket: '%s'  port: %d"
 ER_NORMAL_SHUTDOWN  
 	cze "%s: norm-Bln ukonen\n"
 	dan "%s: Normal nedlukning\n"
@@ -1852,7 +1852,7 @@ ER_NORMAL_SHUTDOWN
 	eng "%s: Normal shutdown\n"
 	est "%s: MySQL lpetas\n"
 	fre "%s: Arrt normal du serveur\n"
-	ger "%-.64s: Normal heruntergefahren\n"
+	ger "%s: Normal heruntergefahren\n"
 	greek "%s:   shutdown\n"
 	hun "%s: Normal leallitas\n"
 	ita "%s: Shutdown normale\n"
@@ -1876,7 +1876,7 @@ ER_GOT_SIGNAL
 	jps "%s: Got signal %d. f!\n",
 	est "%s: sain signaali %d. Lpetan!\n"
 	fre "%s: Reu le signal %d. Abandonne!\n"
-	ger "%-.64s: Signal %d erhalten. Abbruch!\n"
+	ger "%s: Signal %d erhalten. Abbruch!\n"
 	greek "%s:    %d.   !\n"
 	hun "%s: %d jelzes. Megszakitva!\n"
 	ita "%s: Ricevuto segnale %d. Interruzione!\n"
@@ -1901,7 +1901,7 @@ ER_SHUTDOWN_COMPLETE
 	jps "%s: Shutdown \n",
 	est "%s: Lpp\n"
 	fre "%s: Arrt du serveur termin\n"
-	ger "%-.64s: Herunterfahren beendet\n"
+	ger "%s: Herunterfahren beendet\n"
 	greek "%s:   Shutdown \n"
 	hun "%s: A leallitas kesz\n"
 	ita "%s: Shutdown completato\n"
@@ -1919,29 +1919,29 @@ ER_SHUTDOWN_COMPLETE
 	swe "%s: Avslutning klar\n"
 	ukr "%s:  \n"
 ER_FORCING_CLOSE 08S01 
-	cze "%s: n-Bsiln uzaven threadu %ld uivatele '%-.64s'\n"
-	dan "%s: Forceret nedlukning af trd: %ld  bruger: '%-.64s'\n"
-	nla "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.64s'\n"
+	cze "%s: n-Bsiln uzaven threadu %ld uivatele '%-.32s'\n"
+	dan "%s: Forceret nedlukning af trd: %ld  bruger: '%-.32s'\n"
+	nla "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.32s'\n"
 	eng "%s: Forcing close of thread %ld  user: '%-.32s'\n"
-	jps "%s: Xbh %ld I  user: '%-.64s'\n",
+	jps "%s: Xbh %ld I  user: '%-.32s'\n",
 	est "%s: Sulgen juga lime %ld  kasutaja: '%-.32s'\n"
-	fre "%s: Arrt forc de la tche (thread) %ld  utilisateur: '%-.64s'\n"
+	fre "%s: Arrt forc de la tche (thread) %ld  utilisateur: '%-.32s'\n"
 	ger "%s: Thread %ld zwangsweise beendet. Benutzer: '%-.32s'\n"
-	greek "%s:  thread   %ld  user: '%-.64s'\n"
-	hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.64s'\n"
-	ita "%s: Forzata la chiusura del thread %ld utente: '%-.64s'\n"
-	jpn "%s: å %ld λ  user: '%-.64s'\n"
-	kor "%s: thread %ld   user: '%-.64s'\n"
-	nor "%s: Ptvinget avslutning av trd %ld  bruker: '%-.64s'\n"
-	norwegian-ny "%s: Ptvinga avslutning av trd %ld  brukar: '%-.64s'\n"
-	pol "%s: Wymuszenie zamknicia w?tku %ld  uytkownik: '%-.64s'\n"
+	greek "%s:  thread   %ld  user: '%-.32s'\n"
+	hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.32s'\n"
+	ita "%s: Forzata la chiusura del thread %ld utente: '%-.32s'\n"
+	jpn "%s: å %ld λ  user: '%-.32s'\n"
+	kor "%s: thread %ld   user: '%-.32s'\n"
+	nor "%s: Ptvinget avslutning av trd %ld  bruker: '%-.32s'\n"
+	norwegian-ny "%s: Ptvinga avslutning av trd %ld  brukar: '%-.32s'\n"
+	pol "%s: Wymuszenie zamknicia w?tku %ld  uytkownik: '%-.32s'\n"
 	por "%s: Forando finalizao da 'thread' %ld - usurio '%-.32s'\n"
 	rum "%s: Terminare fortata a thread-ului %ld  utilizatorului: '%-.32s'\n"
 	rus "%s:    %ld  : '%-.32s'\n"
 	serbian "%s: Usiljeno gaenje thread-a %ld koji pripada korisniku: '%-.32s'\n"
-	slo "%s: nsiln ukonenie vlkna %ld uvatea '%-.64s'\n"
-	spa "%s: Forzando a cerrar el thread %ld  usuario: '%-.64s'\n"
-	swe "%s: Stnger av trd %ld; anvndare: '%-.64s'\n"
+	slo "%s: nsiln ukonenie vlkna %ld uvatea '%-.32s'\n"
+	spa "%s: Forzando a cerrar el thread %ld  usuario: '%-.32s'\n"
+	swe "%s: Stnger av trd %ld; anvndare: '%-.32s'\n"
 	ukr "%s:   Ǧ %ld : '%-.32s'\n"
 ER_IPSOCK_ERROR 08S01 
 	cze "Nemohu vytvo-Bit IP socket"
@@ -2041,55 +2041,55 @@ ER_BLOBS_AND_NO_TERMINATED 42000 S1009
 	swe "Man kan inte anvnda fast radlngd med blobs. Anvnd 'fields terminated by'"
 	ukr "       BLOB.  'fields terminated by'"
 ER_TEXTFILE_NOT_READABLE  
-	cze "Soubor '%-.64s' mus-B bt v adresi databze nebo iteln pro vechny"
-	dan "Filen '%-.64s' skal vre i database-folderen og kunne lses af alle"
-	nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
+	cze "Soubor '%-.128s' mus-B bt v adresi databze nebo iteln pro vechny"
+	dan "Filen '%-.128s' skal vre i database-folderen og kunne lses af alle"
+	nla "Het bestand '%-.128s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
 	eng "The file '%-.128s' must be in the database directory or be readable by all"
-	jps "t@C '%-.64s'  databse  directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.",
-	est "Fail '%-.64s' peab asuma andmebaasi kataloogis vi olema kigile loetav"
-	fre "Le fichier '%-.64s' doit tre dans le rpertoire de la base et lisible par tous"
-	ger "Datei '%-.64s' muss im Datenbank-Verzeichnis vorhanden oder lesbar fr alle sein"
-	greek "  '%-.64s'     database directory       "
-	hun "A(z) '%-.64s'-nak az adatbazis konyvtarban kell lennie, vagy mindenki szamara olvashatonak"
-	ita "Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti"
-	jpn "ե '%-.64s'  databse  directory ˤ뤫ƤΥ桼ɤ褦˵ĤƤʤФʤޤ."
-	kor "'%-.64s' ȭϴ Ÿ̽ 丮 ϰų ο б Ͽ մϴ."
-	nor "Filen '%-.64s' m vre i database-katalogen for  vre lesbar for alle"
-	norwegian-ny "Filen '%-.64s' m vre i database-katalogen for  vre lesbar for alle"
-	pol "Plik '%-.64s' musi znajdowa sie w katalogu bazy danych lub mie prawa czytania przez wszystkich"
-	por "Arquivo '%-.64s' tem que estar no diretrio do banco de dados ou ter leitura possvel para todos"
-	rum "Fisierul '%-.64s' trebuie sa fie in directorul bazei de data sau trebuie sa poata sa fie citit de catre toata lumea (verifica permisiile)"
-	rus " '%-.64s'      ,    ,     "
-	serbian "File '%-.64s' mora biti u direktorijumu gde su file-ovi baze i mora imati odgovarajua prava pristupa"
-	slo "Sbor '%-.64s' mus by v adresri databzy, alebo itaten pre vetkch"
-	spa "El archivo '%-.64s' debe estar en el directorio de la base de datos o ser de lectura por todos"
-	swe "Textfilen '%.64s' mste finnas i databasbiblioteket eller vara lsbar fr alla"
-	ukr " '%-.64s'    æ          Ӧ"
+	jps "t@C '%-.128s'  databse  directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.",
+	est "Fail '%-.128s' peab asuma andmebaasi kataloogis vi olema kigile loetav"
+	fre "Le fichier '%-.128s' doit tre dans le rpertoire de la base et lisible par tous"
+	ger "Datei '%-.128s' muss im Datenbank-Verzeichnis vorhanden oder lesbar fr alle sein"
+	greek "  '%-.128s'     database directory       "
+	hun "A(z) '%-.128s'-nak az adatbazis konyvtarban kell lennie, vagy mindenki szamara olvashatonak"
+	ita "Il file '%-.128s' deve essere nella directory del database e deve essere leggibile da tutti"
+	jpn "ե '%-.128s'  databse  directory ˤ뤫ƤΥ桼ɤ褦˵ĤƤʤФʤޤ."
+	kor "'%-.128s' ȭϴ Ÿ̽ 丮 ϰų ο б Ͽ մϴ."
+	nor "Filen '%-.128s' m vre i database-katalogen for  vre lesbar for alle"
+	norwegian-ny "Filen '%-.128s' m vre i database-katalogen for  vre lesbar for alle"
+	pol "Plik '%-.128s' musi znajdowa sie w katalogu bazy danych lub mie prawa czytania przez wszystkich"
+	por "Arquivo '%-.128s' tem que estar no diretrio do banco de dados ou ter leitura possvel para todos"
+	rum "Fisierul '%-.128s' trebuie sa fie in directorul bazei de data sau trebuie sa poata sa fie citit de catre toata lumea (verifica permisiile)"
+	rus " '%-.128s'      ,    ,     "
+	serbian "File '%-.128s' mora biti u direktorijumu gde su file-ovi baze i mora imati odgovarajua prava pristupa"
+	slo "Sbor '%-.128s' mus by v adresri databzy, alebo itaten pre vetkch"
+	spa "El archivo '%-.128s' debe estar en el directorio de la base de datos o ser de lectura por todos"
+	swe "Textfilen '%-.128s' mste finnas i databasbiblioteket eller vara lsbar fr alla"
+	ukr " '%-.128s'    æ          Ӧ"
 ER_FILE_EXISTS_ERROR  
-	cze "Soubor '%-.64s' ji-B existuje"
-	dan "Filen '%-.64s' eksisterer allerede"
-	nla "Het bestand '%-.64s' bestaat reeds"
+	cze "Soubor '%-.200s' ji-B existuje"
+	dan "Filen '%-.200s' eksisterer allerede"
+	nla "Het bestand '%-.200s' bestaat reeds"
 	eng "File '%-.200s' already exists"
-	jps "File '%-.64s' ͊ɑ݂܂",
-	est "Fail '%-.80s' juba eksisteerib"
-	fre "Le fichier '%-.64s' existe dj"
-	ger "Datei '%-.80s' bereits vorhanden"
-	greek "  '%-.64s'  "
-	hun "A '%-.64s' file mar letezik."
-	ita "Il file '%-.64s' esiste gia`"
-	jpn "File '%-.64s' ϴ¸ߤޤ"
-	kor "'%-.64s' ȭ ̹ մϴ."
-	nor "Filen '%-.64s' eksisterte allerede"
-	norwegian-ny "Filen '%-.64s' eksisterte allereide"
-	pol "Plik '%-.64s' ju istnieje"
-	por "Arquivo '%-.80s' j existe"
-	rum "Fisierul '%-.80s' exista deja"
-	rus " '%-.80s'  "
-	serbian "File '%-.80s' ve postoji"
-	slo "Sbor '%-.64s' u existuje"
-	spa "El archivo '%-.64s' ya existe"
-	swe "Filen '%-.64s' existerar redan"
-	ukr " '%-.80s'  դ"
+	jps "File '%-.200s' ͊ɑ݂܂",
+	est "Fail '%-.200s' juba eksisteerib"
+	fre "Le fichier '%-.200s' existe dj"
+	ger "Datei '%-.200s' bereits vorhanden"
+	greek "  '%-.200s'  "
+	hun "A '%-.200s' file mar letezik."
+	ita "Il file '%-.200s' esiste gia`"
+	jpn "File '%-.200s' ϴ¸ߤޤ"
+	kor "'%-.200s' ȭ ̹ մϴ."
+	nor "Filen '%-.200s' eksisterte allerede"
+	norwegian-ny "Filen '%-.200s' eksisterte allereide"
+	pol "Plik '%-.200s' ju istnieje"
+	por "Arquivo '%-.200s' j existe"
+	rum "Fisierul '%-.200s' exista deja"
+	rus " '%-.200s'  "
+	serbian "File '%-.200s' ve postoji"
+	slo "Sbor '%-.200s' u existuje"
+	spa "El archivo '%-.200s' ya existe"
+	swe "Filen '%-.200s' existerar redan"
+	ukr " '%-.200s'  դ"
 ER_LOAD_INFO  
 	cze "Z-Bznam: %ld  Vymazno: %ld  Peskoeno: %ld  Varovn: %ld"
 	dan "Poster: %ld  Fjernet: %ld  Sprunget over: %ld  Advarsler: %ld"
@@ -2319,51 +2319,51 @@ ER_NO_TABLES_USED
 	swe "Inga tabeller angivna"
 	ukr "  "
 ER_TOO_BIG_SET  
-	cze "P-Bli mnoho etzc pro sloupec %s a SET"
+	cze "P-Bli mnoho etzc pro sloupec %-.64s a SET"
 	dan "For mange tekststrenge til specifikationen af SET i kolonne %-.64s"
-	nla "Teveel strings voor kolom %s en SET"
+	nla "Teveel strings voor kolom %-.64s en SET"
 	eng "Too many strings for column %-.64s and SET"
 	est "Liiga palju string tulbale %-.64s tbile SET"
-	fre "Trop de chanes dans la colonne %s avec SET"
+	fre "Trop de chanes dans la colonne %-.64s avec SET"
 	ger "Zu viele Strings fr Feld %-.64s und SET angegeben"
 	greek "  strings    %-.64s  SET"
 	hun "Tul sok karakter: %-.64s es SET"
 	ita "Troppe stringhe per la colonna %-.64s e la SET"
 	kor "Į %-.64s SET Ʈ ʹ ϴ."
-	nor "For mange tekststrenger kolonne %s og SET"
-	norwegian-ny "For mange tekststrengar felt %s og SET"
-	pol "Zbyt wiele acuchw dla kolumny %s i polecenia SET"
+	nor "For mange tekststrenger kolonne %-.64s og SET"
+	norwegian-ny "For mange tekststrengar felt %-.64s og SET"
+	pol "Zbyt wiele acuchw dla kolumny %-.64s i polecenia SET"
 	por "'Strings' demais para coluna '%-.64s' e SET"
 	rum "Prea multe siruri pentru coloana %-.64s si SET"
 	rus "     %-.64s  SET"
 	serbian "Previe string-ova za kolonu '%-.64s' i komandu 'SET'"
 	slo "Prli mnoho reazcov pre pole %-.64s a SET"
-	spa "Muchas strings para columna %s y SET"
-	swe "Fr mnga alternativ till kolumn %s fr SET"
+	spa "Muchas strings para columna %-.64s y SET"
+	swe "Fr mnga alternativ till kolumn %-.64s fr SET"
 	ukr "    %-.64s  SET"
 ER_NO_UNIQUE_LOGFILE  
-	cze "Nemohu vytvo-Bit jednoznan jmno logovacho souboru %s.(1-999)\n"
-	dan "Kan ikke lave unikt log-filnavn %s.(1-999)\n"
-	nla "Het is niet mogelijk een unieke naam te maken voor de logfile %s.(1-999)\n"
+	cze "Nemohu vytvo-Bit jednoznan jmno logovacho souboru %-.200s.(1-999)\n"
+	dan "Kan ikke lave unikt log-filnavn %-.200s.(1-999)\n"
+	nla "Het is niet mogelijk een unieke naam te maken voor de logfile %-.200s.(1-999)\n"
 	eng "Can't generate a unique log-filename %-.200s.(1-999)\n"
-	est "Ei suuda luua unikaalset logifaili nime %-.64s.(1-999)\n"
-	fre "Ne peut gnrer un unique nom de journal %s.(1-999)\n"
-	ger "Kann keinen eindeutigen Dateinamen fr die Logdatei %-.64s(1-999) erzeugen\n"
-	greek "   unique log-filename %-.64s.(1-999)\n"
-	hun "Egyedi log-filenev nem generalhato: %-.64s.(1-999)\n"
-	ita "Impossibile generare un nome del file log unico %-.64s.(1-999)\n"
-	kor "Unique αȭ '%-.64s'  ϴ.(1-999)\n"
-	nor "Kan ikke lage unikt loggfilnavn %s.(1-999)\n"
-	norwegian-ny "Kan ikkje lage unikt loggfilnavn %s.(1-999)\n"
-	pol "Nie mona stworzy unikalnej nazwy pliku z logiem %s.(1-999)\n"
-	por "No pode gerar um nome de arquivo de 'log' nico '%-.64s'.(1-999)\n"
-	rum "Nu pot sa generez un nume de log unic %-.64s.(1-999)\n"
-	rus "      %-.64s.(1-999)\n"
-	serbian "Ne mogu da generiem jedinstveno ime log-file-a: '%-.64s.(1-999)'\n"
-	slo "Nemem vytvori uniktne meno log-sboru %-.64s.(1-999)\n"
-	spa "No puede crear un unico archivo log %s.(1-999)\n"
-	swe "Kan inte generera ett unikt filnamn %s.(1-999)\n"
-	ukr "   Φ ' log- %-.64s.(1-999)\n"
+	est "Ei suuda luua unikaalset logifaili nime %-.200s.(1-999)\n"
+	fre "Ne peut gnrer un unique nom de journal %-.200s.(1-999)\n"
+	ger "Kann keinen eindeutigen Dateinamen fr die Logdatei %-.200s(1-999) erzeugen\n"
+	greek "   unique log-filename %-.200s.(1-999)\n"
+	hun "Egyedi log-filenev nem generalhato: %-.200s.(1-999)\n"
+	ita "Impossibile generare un nome del file log unico %-.200s.(1-999)\n"
+	kor "Unique αȭ '%-.200s'  ϴ.(1-999)\n"
+	nor "Kan ikke lage unikt loggfilnavn %-.200s.(1-999)\n"
+	norwegian-ny "Kan ikkje lage unikt loggfilnavn %-.200s.(1-999)\n"
+	pol "Nie mona stworzy unikalnej nazwy pliku z logiem %-.200s.(1-999)\n"
+	por "No pode gerar um nome de arquivo de 'log' nico '%-.200s'.(1-999)\n"
+	rum "Nu pot sa generez un nume de log unic %-.200s.(1-999)\n"
+	rus "      %-.200s.(1-999)\n"
+	serbian "Ne mogu da generiem jedinstveno ime log-file-a: '%-.200s.(1-999)'\n"
+	slo "Nemem vytvori uniktne meno log-sboru %-.200s.(1-999)\n"
+	spa "No puede crear un unico archivo log %-.200s.(1-999)\n"
+	swe "Kan inte generera ett unikt filnamn %-.200s.(1-999)\n"
+	ukr "   Φ ' log- %-.200s.(1-999)\n"
 ER_TABLE_NOT_LOCKED_FOR_WRITE  
 	cze "Tabulka '%-.64s' byla zam-Bena s READ a neme bt zmnna"
 	dan "Tabellen '%-.64s' var lst med READ ls og kan ikke opdateres"
@@ -2439,54 +2439,54 @@ ER_BLOB_CANT_HAVE_DEFAULT 42000
 	swe "BLOB flt '%-.64s' kan inte ha ett DEFAULT-vrde"
 	ukr " BLOB '%-.64s'      "
 ER_WRONG_DB_NAME 42000 
-	cze "Nep-Bpustn jmno databze '%-.64s'"
-	dan "Ugyldigt database navn '%-.64s'"
-	nla "Databasenaam '%-.64s' is niet getoegestaan"
+	cze "Nep-Bpustn jmno databze '%-.100s'"
+	dan "Ugyldigt database navn '%-.100s'"
+	nla "Databasenaam '%-.100s' is niet getoegestaan"
 	eng "Incorrect database name '%-.100s'"
 	jps "w肵 database  '%-.100s' ԈĂ܂",
 	est "Vigane andmebaasi nimi '%-.100s'"
-	fre "Nom de base de donne illgal: '%-.64s'"
+	fre "Nom de base de donne illgal: '%-.100s'"
 	ger "Unerlaubter Datenbankname '%-.100s'"
 	greek "    '%-.100s'"
 	hun "Hibas adatbazisnev: '%-.100s'"
 	ita "Nome database errato '%-.100s'"
 	jpn "ꤷ database ̾ '%-.100s' ְäƤޤ"
 	kor "'%-.100s' Ÿ̽ ̸ Ȯմϴ."
-	nor "Ugyldig database navn '%-.64s'"
-	norwegian-ny "Ugyldig database namn '%-.64s'"
-	pol "Niedozwolona nazwa bazy danych '%-.64s'"
+	nor "Ugyldig database navn '%-.100s'"
+	norwegian-ny "Ugyldig database namn '%-.100s'"
+	pol "Niedozwolona nazwa bazy danych '%-.100s'"
 	por "Nome de banco de dados '%-.100s' incorreto"
 	rum "Numele bazei de date este incorect '%-.100s'"
 	rus "    '%-.100s'"
 	serbian "Pogreno ime baze '%-.100s'"
 	slo "Neprpustn meno databzy '%-.100s'"
-	spa "Nombre de base de datos ilegal '%-.64s'"
-	swe "Felaktigt databasnamn '%-.64s'"
+	spa "Nombre de base de datos ilegal '%-.100s'"
+	swe "Felaktigt databasnamn '%-.100s'"
 	ukr "צ '   '%-.100s'"
 ER_WRONG_TABLE_NAME 42000 
-	cze "Nep-Bpustn jmno tabulky '%-.64s'"
-	dan "Ugyldigt tabel navn '%-.64s'"
-	nla "Niet toegestane tabelnaam '%-.64s'"
+	cze "Nep-Bpustn jmno tabulky '%-.100s'"
+	dan "Ugyldigt tabel navn '%-.100s'"
+	nla "Niet toegestane tabelnaam '%-.100s'"
 	eng "Incorrect table name '%-.100s'"
 	jps "w肵 table  '%-.100s' ͂܂Ă܂",
 	est "Vigane tabeli nimi '%-.100s'"
-	fre "Nom de table illgal: '%-.64s'"
+	fre "Nom de table illgal: '%-.100s'"
 	ger "Unerlaubter Tabellenname '%-.100s'"
 	greek "   '%-.100s'"
 	hun "Hibas tablanev: '%-.100s'"
 	ita "Nome tabella errato '%-.100s'"
 	jpn "ꤷ table ̾ '%-.100s' ϤޤäƤޤ"
 	kor "'%-.100s' ̺ ̸ Ȯմϴ."
-	nor "Ugyldig tabell navn '%-.64s'"
-	norwegian-ny "Ugyldig tabell namn '%-.64s'"
-	pol "Niedozwolona nazwa tabeli '%-.64s'..."
+	nor "Ugyldig tabell navn '%-.100s'"
+	norwegian-ny "Ugyldig tabell namn '%-.100s'"
+	pol "Niedozwolona nazwa tabeli '%-.100s'..."
 	por "Nome de tabela '%-.100s' incorreto"
 	rum "Numele tabelei este incorect '%-.100s'"
 	rus "   '%-.100s'"
 	serbian "Pogreno ime tabele '%-.100s'"
 	slo "Neprpustn meno tabuky '%-.100s'"
-	spa "Nombre de tabla ilegal '%-.64s'"
-	swe "Felaktigt tabellnamn '%-.64s'"
+	spa "Nombre de tabla ilegal '%-.100s'"
+	swe "Felaktigt tabellnamn '%-.100s'"
 	ukr "צ ' æ '%-.100s'"
 ER_TOO_BIG_SELECT 42000 
 	cze "Zadan-B SELECT by prochzel pli mnoho zznam a trval velmi dlouho. Zkontrolujte tvar WHERE a je-li SELECT v podku, pouijte SET SQL_BIG_SELECTS=1"
@@ -2534,97 +2534,97 @@ ER_UNKNOWN_ERROR
 	swe "Oidentifierat fel"
 	ukr "צ "
 ER_UNKNOWN_PROCEDURE 42000 
-	cze "Nezn-Bm procedura %s"
-	dan "Ukendt procedure %s"
-	nla "Onbekende procedure %s"
+	cze "Nezn-Bm procedura %-.64s"
+	dan "Ukendt procedure %-.64s"
+	nla "Onbekende procedure %-.64s"
 	eng "Unknown procedure '%-.64s'"
 	est "Tundmatu protseduur '%-.64s'"
-	fre "Procdure %s inconnue"
+	fre "Procdure %-.64s inconnue"
 	ger "Unbekannte Prozedur '%-.64s'"
 	greek "  '%-.64s'"
 	hun "Ismeretlen eljaras: '%-.64s'"
 	ita "Procedura '%-.64s' sconosciuta"
 	kor "˼  ๮ : '%-.64s'"
-	nor "Ukjent prosedyre %s"
-	norwegian-ny "Ukjend prosedyre %s"
-	pol "Unkown procedure %s"
+	nor "Ukjent prosedyre %-.64s"
+	norwegian-ny "Ukjend prosedyre %-.64s"
+	pol "Unkown procedure %-.64s"
 	por "'Procedure' '%-.64s' desconhecida"
 	rum "Procedura unknown '%-.64s'"
 	rus "  '%-.64s'"
 	serbian "Nepoznata procedura '%-.64s'"
 	slo "Neznm procedra '%-.64s'"
-	spa "Procedimiento desconocido %s"
-	swe "Oknd procedur: %s"
+	spa "Procedimiento desconocido %-.64s"
+	swe "Oknd procedur: %-.64s"
 	ukr "צ  '%-.64s'"
 ER_WRONG_PARAMCOUNT_TO_PROCEDURE 42000 
-	cze "Chybn-B poet parametr procedury %s"
-	dan "Forkert antal  parametre til proceduren %s"
-	nla "Foutief aantal parameters doorgegeven aan procedure %s"
+	cze "Chybn-B poet parametr procedury %-.64s"
+	dan "Forkert antal  parametre til proceduren %-.64s"
+	nla "Foutief aantal parameters doorgegeven aan procedure %-.64s"
 	eng "Incorrect parameter count to procedure '%-.64s'"
 	est "Vale parameetrite hulk protseduurile '%-.64s'"
-	fre "Mauvais nombre de paramtres pour la procedure %s"
+	fre "Mauvais nombre de paramtres pour la procedure %-.64s"
 	ger "Falsche Parameterzahl fr Prozedur '%-.64s'"
 	greek "     '%-.64s'"
 	hun "Rossz parameter a(z) '%-.64s'eljaras szamitasanal"
 	ita "Numero di parametri errato per la procedura '%-.64s'"
 	kor "'%-.64s' ๮  Ȯ Ķ"
-	nor "Feil parameter antall til prosedyren %s"
-	norwegian-ny "Feil parameter tal til prosedyra %s"
-	pol "Incorrect parameter count to procedure %s"
+	nor "Feil parameter antall til prosedyren %-.64s"
+	norwegian-ny "Feil parameter tal til prosedyra %-.64s"
+	pol "Incorrect parameter count to procedure %-.64s"
 	por "Nmero de parmetros incorreto para a 'procedure' '%-.64s'"
 	rum "Procedura '%-.64s' are un numar incorect de parametri"
 	rus "     '%-.64s'"
 	serbian "Pogrean broj parametara za proceduru '%-.64s'"
 	slo "Chybn poet parametrov procedry '%-.64s'"
-	spa "Equivocado parametro count para procedimiento %s"
-	swe "Felaktigt antal parametrar till procedur %s"
+	spa "Equivocado parametro count para procedimiento %-.64s"
+	swe "Felaktigt antal parametrar till procedur %-.64s"
 	ukr " ˦˦ Ҧ  '%-.64s'"
 ER_WRONG_PARAMETERS_TO_PROCEDURE  
-	cze "Chybn-B parametry procedury %s"
-	dan "Forkert(e) parametre til proceduren %s"
-	nla "Foutieve parameters voor procedure %s"
+	cze "Chybn-B parametry procedury %-.64s"
+	dan "Forkert(e) parametre til proceduren %-.64s"
+	nla "Foutieve parameters voor procedure %-.64s"
 	eng "Incorrect parameters to procedure '%-.64s'"
 	est "Vigased parameetrid protseduurile '%-.64s'"
-	fre "Paramtre erron pour la procedure %s"
+	fre "Paramtre erron pour la procedure %-.64s"
 	ger "Falsche Parameter fr Prozedur '%-.64s'"
 	greek "    '%-.64s'"
 	hun "Rossz parameter a(z) '%-.64s' eljarasban"
 	ita "Parametri errati per la procedura '%-.64s'"
 	kor "'%-.64s' ๮  Ȯ Ķ"
-	nor "Feil parametre til prosedyren %s"
-	norwegian-ny "Feil parameter til prosedyra %s"
-	pol "Incorrect parameters to procedure %s"
+	nor "Feil parametre til prosedyren %-.64s"
+	norwegian-ny "Feil parameter til prosedyra %-.64s"
+	pol "Incorrect parameters to procedure %-.64s"
 	por "Parmetros incorretos para a 'procedure' '%-.64s'"
 	rum "Procedura '%-.64s' are parametrii incorecti"
 	rus "    '%-.64s'"
 	serbian "Pogreni parametri prosleeni proceduri '%-.64s'"
 	slo "Chybn parametre procedry '%-.64s'"
-	spa "Equivocados parametros para procedimiento %s"
-	swe "Felaktiga parametrar till procedur %s"
+	spa "Equivocados parametros para procedimiento %-.64s"
+	swe "Felaktiga parametrar till procedur %-.64s"
 	ukr "   '%-.64s'"
 ER_UNKNOWN_TABLE 42S02 
-	cze "Nezn-Bm tabulka '%-.64s' v %s"
-	dan "Ukendt tabel '%-.64s' i %s"
-	nla "Onbekende tabel '%-.64s' in %s"
+	cze "Nezn-Bm tabulka '%-.64s' v %-.32s"
+	dan "Ukendt tabel '%-.64s' i %-.32s"
+	nla "Onbekende tabel '%-.64s' in %-.32s"
 	eng "Unknown table '%-.64s' in %-.32s"
 	est "Tundmatu tabel '%-.64s' %-.32s-s"
-	fre "Table inconnue '%-.64s' dans %s"
-	ger "Unbekannte Tabelle '%-.64s' in '%-.64s'"
-	greek "  '%-.64s'  %s"
-	hun "Ismeretlen tabla: '%-.64s' %s-ban"
-	ita "Tabella '%-.64s' sconosciuta in %s"
-	jpn "Unknown table '%-.64s' in %s"
-	kor "˼  ̺ '%-.64s' (Ÿ̽ %s)"
-	nor "Ukjent tabell '%-.64s' i %s"
-	norwegian-ny "Ukjend tabell '%-.64s' i %s"
-	pol "Unknown table '%-.64s' in %s"
+	fre "Table inconnue '%-.64s' dans %-.32s"
+	ger "Unbekannte Tabelle '%-.64s' in '%-.32s'"
+	greek "  '%-.64s'  %-.32s"
+	hun "Ismeretlen tabla: '%-.64s' %-.32s-ban"
+	ita "Tabella '%-.64s' sconosciuta in %-.32s"
+	jpn "Unknown table '%-.64s' in %-.32s"
+	kor "˼  ̺ '%-.64s' (Ÿ̽ %-.32s)"
+	nor "Ukjent tabell '%-.64s' i %-.32s"
+	norwegian-ny "Ukjend tabell '%-.64s' i %-.32s"
+	pol "Unknown table '%-.64s' in %-.32s"
 	por "Tabela '%-.64s' desconhecida em '%-.32s'"
 	rum "Tabla '%-.64s' invalida in %-.32s"
 	rus "  '%-.64s'  %-.32s"
 	serbian "Nepoznata tabela '%-.64s' u '%-.32s'"
-	slo "Neznma tabuka '%-.64s' v %s"
-	spa "Tabla desconocida '%-.64s' in %s"
-	swe "Oknd tabell '%-.64s' i '%-.64s'"
+	slo "Neznma tabuka '%-.64s' v %-.32s"
+	spa "Tabla desconocida '%-.64s' in %-.32s"
+	swe "Oknd tabell '%-.64s' i '%-.32s'"
 	ukr "צ  '%-.64s'  %-.32s"
 ER_FIELD_SPECIFIED_TWICE 42000 
 	cze "Polo-Bka '%-.64s' je zadna dvakrt"
@@ -2803,27 +2803,27 @@ ER_TOO_MANY_FIELDS
 	swe "Fr mnga flt"
 	ukr " æ"
 ER_TOO_BIG_ROWSIZE 42000 
-	cze "-Bdek je pli velk. Maximln velikost dku, nepotaje poloky blob, je %d. Muste zmnit nkter poloky na blob"
-	dan "For store poster. Max post strrelse, uden BLOB's, er %d. Du m lave nogle felter til BLOB's"
-	nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %d. U dient sommige velden in blobs te veranderen."
+	cze "-Bdek je pli velk. Maximln velikost dku, nepotaje poloky blob, je %ld. Muste zmnit nkter poloky na blob"
+	dan "For store poster. Max post strrelse, uden BLOB's, er %ld. Du m lave nogle felter til BLOB's"
+	nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %ld. U dient sommige velden in blobs te veranderen."
 	eng "Row size too large. The maximum row size for the used table type, not counting BLOBs, is %ld. You have to change some columns to TEXT or BLOBs"
-	jps "row size 傫܂. BLOB ܂܂Ȃꍇ row size ̍ő %d ł. ‚ field  BLOB ɕςĂ.",
-	est "Liiga pikk kirje. Kirje maksimumpikkus arvestamata BLOB-tpi vlju on %d. Muuda mned vljad BLOB-tpi vljadeks"
-	fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB"
+	jps "row size 傫܂. BLOB ܂܂Ȃꍇ row size ̍ő %ld ł. ‚ field  BLOB ɕςĂ.",
+	est "Liiga pikk kirje. Kirje maksimumpikkus arvestamata BLOB-tpi vlju on %ld. Muuda mned vljad BLOB-tpi vljadeks"
+	fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %ld. Changez le type de quelques colonnes en BLOB"
 	ger "Zeilenlnge zu gro. Die maximale Zeilenlnge fr den verwendeten Tabellentyp (ohne BLOB-Felder) betrgt %ld. Einige Felder mssen in BLOB oder TEXT umgewandelt werden"
-	greek "   .    ,     blobs,  %d.       blobs"
-	hun "Tul nagy sormeret. A maximalis sormeret (nem szamolva a blob objektumokat) %d. Nehany mezot meg kell valtoztatnia"
-	ita "Riga troppo grande. La massima grandezza di una riga, non contando i BLOB, e` %d. Devi cambiare alcuni campi in BLOB"
-	jpn "row size 礭ޤ. BLOB ޤޤʤ row size κ %d Ǥ. Ĥ field  BLOB ѤƤ."
-	kor "ʹ ū row Դϴ. BLOB  ʰ ִ row  %dԴϴ. 󸶰 ʵ BLOB ٲټž ڱ.."
-	por "Tamanho de linha grande demais. O mximo tamanho de linha, no contando BLOBs,  %d. Voc tem que mudar alguns campos para BLOBs"
-	rum "Marimea liniei (row) prea mare. Marimea maxima a liniei, excluzind BLOB-urile este de %d. Trebuie sa schimbati unele cimpuri in BLOB-uri"
-	rus "   .   ,   BLOB, - %d. ,        BLOB"
-	serbian "Prevelik slog. Maksimalna veliina sloga, ne raunajui BLOB polja, je %d. Trebali bi da promenite tip nekih polja u BLOB"
-	slo "Riadok je prli vek. Maximlna vekos riadku, okrem 'BLOB', je %d. Muste zmeni niektor poloky na BLOB"
-	spa "Tamao de lnea muy grande. Mximo tamao de lnea, no contando blob, es %d. Tu tienes que cambiar algunos campos para blob"
-	swe "Fr stor total radlngd. Den hgst tilltna radlngden, frutom BLOBs, r %d. ndra ngra av dina flt till BLOB"
-	ukr " . ¦  ,   BLOB,  %d.  Ҧ  ˦ æ   BLOB"
+	greek "   .    ,     blobs,  %ld.       blobs"
+	hun "Tul nagy sormeret. A maximalis sormeret (nem szamolva a blob objektumokat) %ld. Nehany mezot meg kell valtoztatnia"
+	ita "Riga troppo grande. La massima grandezza di una riga, non contando i BLOB, e` %ld. Devi cambiare alcuni campi in BLOB"
+	jpn "row size 礭ޤ. BLOB ޤޤʤ row size κ %ld Ǥ. Ĥ field  BLOB ѤƤ."
+	kor "ʹ ū row Դϴ. BLOB  ʰ ִ row  %ldԴϴ. 󸶰 ʵ BLOB ٲټž ڱ.."
+	por "Tamanho de linha grande demais. O mximo tamanho de linha, no contando BLOBs,  %ld. Voc tem que mudar alguns campos para BLOBs"
+	rum "Marimea liniei (row) prea mare. Marimea maxima a liniei, excluzind BLOB-urile este de %ld. Trebuie sa schimbati unele cimpuri in BLOB-uri"
+	rus "   .   ,   BLOB, - %ld. ,        BLOB"
+	serbian "Prevelik slog. Maksimalna veliina sloga, ne raunajui BLOB polja, je %ld. Trebali bi da promenite tip nekih polja u BLOB"
+	slo "Riadok je prli vek. Maximlna vekos riadku, okrem 'BLOB', je %ld. Muste zmeni niektor poloky na BLOB"
+	spa "Tamao de lnea muy grande. Mximo tamao de lnea, no contando blob, es %ld. Tu tienes que cambiar algunos campos para blob"
+	swe "Fr stor total radlngd. Den hgst tilltna radlngden, frutom BLOBs, r %ld. ndra ngra av dina flt till BLOB"
+	ukr " . ¦  ,   BLOB,  %ld.  Ҧ  ˦ æ   BLOB"
 ER_STACK_OVERRUN  
 	cze "P-Beteen zsobnku threadu: pouito %ld z %ld. Pouijte 'mysqld -O thread_stack=#' k zadn vtho zsobnku"
 	dan "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld -O thread_stack=#' for at allokere en strre stak om ndvendigt"
@@ -2865,29 +2865,29 @@ ER_WRONG_OUTER_JOIN 42000
 	swe "Felaktigt referens i OUTER JOIN.  Kontrollera ON-uttrycket"
 	ukr " Φ  OUTER JOIN. צ  ON"
 ER_NULL_COLUMN_IN_INDEX 42000 
-	cze "Sloupec '%-.32s' je pou-Bit s UNIQUE nebo INDEX, ale nen definovn jako NOT NULL"
-	dan "Kolonne '%-.32s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL"
+	cze "Sloupec '%-.64s' je pou-Bit s UNIQUE nebo INDEX, ale nen definovn jako NOT NULL"
+	dan "Kolonne '%-.64s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL"
 	nla "Kolom '%-.64s' wordt gebruikt met UNIQUE of INDEX maar is niet gedefinieerd als NOT NULL"
 	eng "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
 	jps "Column '%-.64s'  UNIQUE  INDEX Ŏgp܂. ̃J NOT NULL ƒ`Ă܂.",
 	est "Tulp '%-.64s' on kasutusel indeksina, kuid ei ole mratletud kui NOT NULL"
-	fre "La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas dfinie comme NOT NULL"
+	fre "La colonne '%-.64s' fait partie d'un index UNIQUE ou INDEX mais n'est pas dfinie comme NOT NULL"
 	ger "Spalte '%-.64s' wurde mit UNIQUE oder INDEX benutzt, ist aber nicht als NOT NULL definiert"
 	greek "  '%-.64s'   UNIQUE  INDEX      NOT NULL"
 	hun "A(z) '%-.64s' oszlop INDEX vagy UNIQUE (egyedi), de a definicioja szerint nem NOT NULL"
 	ita "La colonna '%-.64s' e` usata con UNIQUE o INDEX ma non e` definita come NOT NULL"
 	jpn "Column '%-.64s'  UNIQUE  INDEX ǻѤޤ. Υ NOT NULL Ƥޤ."
 	kor "'%-.64s' Į UNIQUE INDEX Ͽ NOT NULL ǵ ʾұ..."
-	nor "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
-	norwegian-ny "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
-	pol "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	nor "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	norwegian-ny "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	pol "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
 	por "Coluna '%-.64s'  usada com nica (UNIQUE) ou ndice (INDEX), mas no est definida como no-nula (NOT NULL)"
 	rum "Coloana '%-.64s' e folosita cu UNIQUE sau INDEX dar fara sa fie definita ca NOT NULL"
 	rus " '%-.64s'   UNIQUE   INDEX,     NOT NULL"
 	serbian "Kolona '%-.64s' je upotrebljena kao 'UNIQUE' ili 'INDEX' ali nije definisana kao 'NOT NULL'"
 	slo "Pole '%-.64s' je pouit s UNIQUE alebo INDEX, ale nie je zadefinovan ako NOT NULL"
-	spa "Columna '%-.32s' es usada con UNIQUE o INDEX pero no est definida como NOT NULL"
-	swe "Kolumn '%-.32s' r anvnd med UNIQUE eller INDEX men r inte definerad med NOT NULL"
+	spa "Columna '%-.64s' es usada con UNIQUE o INDEX pero no est definida como NOT NULL"
+	swe "Kolumn '%-.64s' r anvnd med UNIQUE eller INDEX men r inte definerad med NOT NULL"
 	ukr " '%-.64s' դ  UNIQUE  INDEX,     NOT NULL"
 ER_CANT_FIND_UDF  
 	cze "Nemohu na-Bst funkci '%-.64s'"
@@ -2995,13 +2995,13 @@ ER_CANT_OPEN_LIBRARY
 	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %-.128s)"
 	pol "Can't open shared library '%-.64s' (errno: %d %-.128s)"
 	por "No pode abrir biblioteca compartilhada '%-.64s' (erro no. '%d' - '%-.128s')"
-	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.64s)"
-	rus "    '%-.64s' (: %d %-.64s)"
-	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.64s)"
-	slo "Nemem otvori zdiean kninicu '%-.64s' (chybov kd: %d %s)"
-	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %s)"
-	swe "Kan inte ppna det dynamiska biblioteket '%-.64s' (Felkod: %d %s)"
-	ukr "  צ Ħ ¦̦ '%-.64s' (: %d %-.64s)"
+	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.128s)"
+	rus "    '%-.64s' (: %d %-.128s)"
+	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.128s)"
+	slo "Nemem otvori zdiean kninicu '%-.64s' (chybov kd: %d %-.128s)"
+	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %-.128s)"
+	swe "Kan inte ppna det dynamiska biblioteket '%-.64s' (Felkod: %d %-.128s)"
+	ukr "  צ Ħ ¦̦ '%-.64s' (: %d %-.128s)"
 ER_CANT_FIND_DL_ENTRY  
 	cze "Nemohu naj-Bt funkci '%-.128s' v knihovn"
 	dan "Kan ikke finde funktionen '%-.128s' i bibliotek"
@@ -3048,14 +3048,14 @@ ER_FUNCTION_NOT_DEFINED
 	ukr "æ '%-.64s'  "
 ER_HOST_IS_BLOCKED  
 	cze "Stroj '%-.64s' je zablokov-Bn kvli mnoha chybm pi pipojovn. Odblokujete pouitm 'mysqladmin flush-hosts'"
-	dan "Vrten er blokeret p grund af mange fejlforesprgsler. Ls op med 'mysqladmin flush-hosts'"
+	dan "Vrten '%-.64s' er blokeret p grund af mange fejlforesprgsler. Ls op med 'mysqladmin flush-hosts'"
 	nla "Host '%-.64s' is geblokkeeerd vanwege te veel verbindings fouten. Deblokkeer met 'mysqladmin flush-hosts'"
 	eng "Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'"
 	jps "Host '%-.64s'  many connection error ̂߁Aۂ܂.  'mysqladmin flush-hosts' ʼnĂ",
 	est "Masin '%-.64s' on blokeeritud hulgaliste hendusvigade tttu. Blokeeringu saab thistada 'mysqladmin flush-hosts' ksuga"
 	fre "L'hte '%-.64s' est bloqu  cause d'un trop grand nombre d'erreur de connection. Dbloquer le par 'mysqladmin flush-hosts'"
 	ger "Host '%-.64s' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'"
-	greek "       .     'mysqladmin flush-hosts'"
+	greek "  '%-.64s'      .     'mysqladmin flush-hosts'"
 	hun "A '%-.64s' host blokkolodott, tul sok kapcsolodasi hiba miatt. Hasznalja a 'mysqladmin flush-hosts' parancsot"
 	ita "Sistema '%-.64s' bloccato a causa di troppi errori di connessione. Per sbloccarlo: 'mysqladmin flush-hosts'"
 	jpn "Host '%-.64s'  many connection error Τᡢݤޤ.  'mysqladmin flush-hosts' DzƤ"
@@ -3076,7 +3076,7 @@ ER_HOST_NOT_PRIVILEGED
 	est "Masinal '%-.64s' puudub ligips sellele MySQL serverile"
 	fre "Le hte '%-.64s' n'est pas authoris  se connecter  ce serveur MySQL"
 	ger "Host '%-.64s' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden"
-	greek "        MySQL server"
+	greek "  '%-.64s'       MySQL server"
 	hun "A '%-.64s' host szamara nem engedelyezett a kapcsolodas ehhez a MySQL szerverhez"
 	ita "Al sistema '%-.64s' non e` consentita la connessione a questo server MySQL"
 	jpn "Host '%-.64s'  MySQL server ³ĤƤޤ"
@@ -3288,25 +3288,25 @@ ER_MIX_OF_GROUP_FUNC_AND_FIELDS 42000
 	swe "Man fr ha bde GROUP-kolumner (MIN(),MAX(),COUNT()...) och flt i en frga om man inte har en GROUP BY-del"
 	ukr "ͦ GROUP æ (MIN(),MAX(),COUNT()...)   GROUP   ,    GROUP BY"
 ER_NONEXISTING_GRANT 42000 
-	cze "Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s'"
-	dan "Denne tilladelse findes ikke for brugeren '%-.32s' p vrt '%-.64s'"
-	nla "Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.32s' op host '%-.64s'"
-	eng "There is no such grant defined for user '%-.32s' on host '%-.64s'"
-	jps "[U[ '%-.32s' (zXg '%-.64s' ̃[U[) ͋‚Ă܂",
-	est "Sellist igust ei ole defineeritud kasutajale '%-.32s' masinast '%-.64s'"
-	fre "Un tel droit n'est pas dfini pour l'utilisateur '%-.32s' sur l'hte '%-.64s'"
-	ger "Fr Benutzer '%-.32s' auf Host '%-.64s' gibt es keine solche Berechtigung"
-	hun "A '%-.32s' felhasznalonak nincs ilyen joga a '%-.64s' host-on"
-	ita "GRANT non definita per l'utente '%-.32s' dalla macchina '%-.64s'"
-	jpn "桼 '%-.32s' (ۥ '%-.64s' Υ桼) ϵĤƤޤ"
-	kor " '%-.32s' (ȣƮ '%-.64s') Ͽ ǵ ׷  ϴ."
-	por "No existe tal permisso (grant) definida para o usurio '%-.32s' no 'host' '%-.64s'"
-	rum "Nu exista un astfel de grant definit pentru utilzatorul '%-.32s' de pe host-ul '%-.64s'"
-	rus "      '%-.32s'   '%-.64s'"
-	serbian "Ne postoji odobrenje za pristup korisniku '%-.32s' na host-u '%-.64s'"
-	spa "No existe permiso definido para usuario '%-.32s' en el servidor '%-.64s'"
-	swe "Det finns inget privilegium definierat fr anvndare '%-.32s' p '%-.64s'"
-	ukr "     '%-.32s'   '%-.64s'"
+	cze "Neexistuje odpov-Bdajc grant pro uivatele '%-.64s' na stroji '%-.64s'"
+	dan "Denne tilladelse findes ikke for brugeren '%-.64s' p vrt '%-.64s'"
+	nla "Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.64s' op host '%-.64s'"
+	eng "There is no such grant defined for user '%-.64s' on host '%-.64s'"
+	jps "[U[ '%-.64s' (zXg '%-.64s' ̃[U[) ͋‚Ă܂",
+	est "Sellist igust ei ole defineeritud kasutajale '%-.64s' masinast '%-.64s'"
+	fre "Un tel droit n'est pas dfini pour l'utilisateur '%-.64s' sur l'hte '%-.64s'"
+	ger "Fr Benutzer '%-.64s' auf Host '%-.64s' gibt es keine solche Berechtigung"
+	hun "A '%-.64s' felhasznalonak nincs ilyen joga a '%-.64s' host-on"
+	ita "GRANT non definita per l'utente '%-.64s' dalla macchina '%-.64s'"
+	jpn "桼 '%-.64s' (ۥ '%-.64s' Υ桼) ϵĤƤޤ"
+	kor " '%-.64s' (ȣƮ '%-.64s') Ͽ ǵ ׷  ϴ."
+	por "No existe tal permisso (grant) definida para o usurio '%-.64s' no 'host' '%-.64s'"
+	rum "Nu exista un astfel de grant definit pentru utilzatorul '%-.64s' de pe host-ul '%-.64s'"
+	rus "      '%-.64s'   '%-.64s'"
+	serbian "Ne postoji odobrenje za pristup korisniku '%-.64s' na host-u '%-.64s'"
+	spa "No existe permiso definido para usuario '%-.64s' en el servidor '%-.64s'"
+	swe "Det finns inget privilegium definierat fr anvndare '%-.64s' p '%-.64s'"
+	ukr "     '%-.64s'   '%-.64s'"
 ER_TABLEACCESS_DENIED_ERROR 42000 
 	cze "%-.16s p-Bkaz nepstupn pro uivatele: '%-.32s'@'%-.64s' pro tabulku '%-.64s'"
 	dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.32s'@'%-.64s' for tabellen '%-.64s'"
@@ -3390,27 +3390,27 @@ ER_GRANT_WRONG_HOST_OR_USER 42000
 	swe "Felaktigt maskinnamn eller anvndarnamn anvnt med GRANT"
 	ukr " host  user  GRANT "
 ER_NO_SUCH_TABLE 42S02 
-	cze "Tabulka '%-.64s.%s' neexistuje"
+	cze "Tabulka '%-.64s.%-.64s' neexistuje"
 	dan "Tabellen '%-.64s.%-.64s' eksisterer ikke"
-	nla "Tabel '%-.64s.%s' bestaat niet"
+	nla "Tabel '%-.64s.%-.64s' bestaat niet"
 	eng "Table '%-.64s.%-.64s' doesn't exist"
 	est "Tabelit '%-.64s.%-.64s' ei eksisteeri"
-	fre "La table '%-.64s.%s' n'existe pas"
+	fre "La table '%-.64s.%-.64s' n'existe pas"
 	ger "Tabelle '%-.64s.%-.64s' existiert nicht"
-	hun "A '%-.64s.%s' tabla nem letezik"
-	ita "La tabella '%-.64s.%s' non esiste"
-	jpn "Table '%-.64s.%s' doesn't exist"
-	kor "̺ '%-.64s.%s'   ʽϴ."
-	nor "Table '%-.64s.%s' doesn't exist"
-	norwegian-ny "Table '%-.64s.%s' doesn't exist"
-	pol "Table '%-.64s.%s' doesn't exist"
+	hun "A '%-.64s.%-.64s' tabla nem letezik"
+	ita "La tabella '%-.64s.%-.64s' non esiste"
+	jpn "Table '%-.64s.%-.64s' doesn't exist"
+	kor "̺ '%-.64s.%-.64s'   ʽϴ."
+	nor "Table '%-.64s.%-.64s' doesn't exist"
+	norwegian-ny "Table '%-.64s.%-.64s' doesn't exist"
+	pol "Table '%-.64s.%-.64s' doesn't exist"
 	por "Tabela '%-.64s.%-.64s' no existe"
 	rum "Tabela '%-.64s.%-.64s' nu exista"
 	rus " '%-.64s.%-.64s'  "
 	serbian "Tabela '%-.64s.%-.64s' ne postoji"
-	slo "Table '%-.64s.%s' doesn't exist"
-	spa "Tabla '%-.64s.%s' no existe"
-	swe "Det finns ingen tabell som heter '%-.64s.%s'"
+	slo "Table '%-.64s.%-.64s' doesn't exist"
+	spa "Tabla '%-.64s.%-.64s' no existe"
+	swe "Det finns ingen tabell som heter '%-.64s.%-.64s'"
 	ukr " '%-.64s.%-.64s'  դ"
 ER_NONEXISTING_TABLE_GRANT 42000 
 	cze "Neexistuje odpov-Bdajc grant pro uivatele '%-.32s' na stroji '%-.64s' pro tabulku '%-.64s'"
@@ -3509,27 +3509,27 @@ ER_TOO_MANY_DELAYED_THREADS
 	swe "Det finns redan 'max_delayed_threads' trdar i anvnding"
 	ukr "  Ǧ դ"
 ER_ABORTING_CONNECTION 08S01 
-	cze "Zru-Beno spojen %ld do databze: '%-.64s' uivatel: '%-.64s' (%s)"
-	dan "Afbrudt forbindelse %ld til database: '%-.64s' bruger: '%-.64s' (%-.64s)"
-	nla "Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.64s' (%s)"
+	cze "Zru-Beno spojen %ld do databze: '%-.64s' uivatel: '%-.32s' (%-.64s)"
+	dan "Afbrudt forbindelse %ld til database: '%-.64s' bruger: '%-.32s' (%-.64s)"
+	nla "Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.32s' (%-.64s)"
 	eng "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
 	est "hendus katkestatud %ld andmebaasile: '%-.64s' kasutajale: '%-.32s' (%-.64s)"
-	fre "Connection %ld avorte vers la bd: '%-.64s' utilisateur: '%-.64s' (%s)"
-	ger "Abbruch der Verbindung %ld zur Datenbank '%-.64s'. Benutzer: '%-.64s' (%-.64s)"
-	hun "Megszakitott kapcsolat %ld db: '%-.64s' adatbazishoz, felhasznalo: '%-.64s' (%s)"
-	ita "Interrotta la connessione %ld al db: '%-.64s' utente: '%-.64s' (%s)"
-	jpn "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	kor "Ÿ̽    %ld ߴܵ : '%-.64s' : '%-.64s' (%s)"
-	nor "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	norwegian-ny "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	pol "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
+	fre "Connection %ld avorte vers la bd: '%-.64s' utilisateur: '%-.32s' (%-.64s)"
+	ger "Abbruch der Verbindung %ld zur Datenbank '%-.64s'. Benutzer: '%-.32s' (%-.64s)"
+	hun "Megszakitott kapcsolat %ld db: '%-.64s' adatbazishoz, felhasznalo: '%-.32s' (%-.64s)"
+	ita "Interrotta la connessione %ld al db: '%-.64s' utente: '%-.32s' (%-.64s)"
+	jpn "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	kor "Ÿ̽    %ld ߴܵ : '%-.64s' : '%-.32s' (%-.64s)"
+	nor "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	norwegian-ny "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	pol "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
 	por "Conexo %ld abortou para o banco de dados '%-.64s' - usurio '%-.32s' (%-.64s)"
 	rum "Conectie terminata %ld la baza de date: '%-.64s' utilizator: '%-.32s' (%-.64s)"
 	rus "  %ld    '%-.64s'  '%-.32s' (%-.64s)"
 	serbian "Prekinuta konekcija broj %ld ka bazi: '%-.64s' korisnik je bio: '%-.32s' (%-.64s)"
-	slo "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	spa "Conexin abortada %ld para db: '%-.64s' usuario: '%-.64s' (%s)"
-	swe "Avbrt lnken fr trd %ld till db '%-.64s', anvndare '%-.64s' (%s)"
+	slo "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	spa "Conexin abortada %ld para db: '%-.64s' usuario: '%-.32s' (%-.64s)"
+	swe "Avbrt lnken fr trd %ld till db '%-.64s', anvndare '%-.32s' (%-.64s)"
 	ukr " ' %ld   : '%-.64s' : '%-.32s' (%-.64s)"
 ER_NET_PACKET_TOO_LARGE 08S01 
 	cze "Zji-Btn pchoz packet del ne 'max_allowed_packet'"
@@ -4008,7 +4008,7 @@ ER_CHECK_NOT_IMPLEMENTED 42000
 	por "O manipulador de tabela no suporta %s"
 	rum "The handler for the table doesn't support %s"
 	rus "    : %s"
-	serbian "Handler za ovu tabelu ne dozvoljava 'check' odnosno 'repair' komande"
+	serbian "Handler za ovu tabelu ne dozvoljava %s komande"
 	slo "The handler for the table doesn't support %s"
 	spa "El manipulador de la tabla no permite soporte para %s"
 	swe "Tabellhanteraren fr denna tabell kan inte gra %s"
@@ -5219,9 +5219,9 @@ ER_FPARSER_BAD_HEADER
 	ukr "צ    ̦ '%-.64s'"
 ER_FPARSER_EOF_IN_COMMENT  
 	eng "Unexpected end of file while parsing comment '%-.200s'"
-	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"
-	rus "     '%-.64s'"
-	ukr "Ħ ˦   Ҧ '%-.64s'"
+	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.200s'"
+	rus "     '%-.200s'"
+	ukr "Ħ ˦   Ҧ '%-.200s'"
 ER_FPARSER_ERROR_IN_PARAMETER  
 	eng "Error while parsing parameter '%-.64s' (line: '%-.64s')"
 	ger "Fehler beim Parsen des Parameters '%-.64s' (Zeile: '%-.64s')"
@@ -5306,7 +5306,7 @@ ER_TRG_ON_VIEW_OR_TEMP_TABLE
 	ger "'%-.64s' des Triggers ist View oder temporre Tabelle"
 ER_TRG_CANT_CHANGE_ROW  
 	eng "Updating of %s row is not allowed in %strigger"
-	ger "Aktualisieren einer %s-Zeile ist in einem %-Trigger nicht erlaubt"
+	ger "Aktualisieren einer %s-Zeile ist in einem %s-Trigger nicht erlaubt"
 ER_TRG_NO_SUCH_ROW_IN_TRG  
 	eng "There is no %s row in %s trigger"
 	ger "Es gibt keine %s-Zeile im %s-Trigger"
@@ -5388,7 +5388,7 @@ ER_LOGGING_PROHIBIT_CHANGING_OF
 	ger "Binrlogs und Replikation verhindern Wechsel des globalen Servers %s"
 ER_NO_FILE_MAPPING  
 	eng "Can't map file: %-.200s, errno: %d"
-	ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"
+	ger "Kann Datei nicht abbilden: %-.200s, Fehler: %d"
 ER_WRONG_MAGIC  
 	eng "Wrong magic in %-.64s"
 	ger "Falsche magische Zahlen in %-.64s"
@@ -5523,7 +5523,7 @@ ER_CONNECT_TO_FOREIGN_DATA_SOURCE
         eng "Unable to connect to foreign data source: %.64s"
 	ger "Kann nicht mit Fremddatenquelle verbinden: %.64s"
 ER_QUERY_ON_FOREIGN_DATA_SOURCE
-        eng "There was a problem processing the query on the foreign data source. Data source error: %-.64"
+        eng "There was a problem processing the query on the foreign data source. Data source error: %-.64s"
 	ger "Bei der Verarbeitung der Abfrage ist in der Fremddatenquelle ein Problem aufgetreten. Datenquellenfehlermeldung: %-.64s"
 ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST
         eng "The foreign data source you are trying to reference does not exist. Data source error:  %-.64s"