5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-01 00:54:03 +01:00
commit 59d9d08e2b
304 changed files with 12471 additions and 940 deletions

View file

@ -1777,31 +1777,8 @@ ER_WRONG_AUTO_KEY 42000 S1009
spa "Puede ser solamente un campo automatico y este debe ser definido como una clave"
swe "Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel"
ukr "Невірне визначення таблиці; Може бути лише один автоматичний стовбець, що повинен бути визначений як ключ"
ER_READY
cze "%s: p-Břipraven 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: 準備完了¥nVersion: '%s' socket: '%s' port: %d"",
est "%s: ootab ühendusi\nVersion: '%s' socket: '%s' port: %d""
fre "%s: Prêt pour des connexions\nVersion: '%s' socket: '%s' port: %d""
ger "%s: Bereit für 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 conexões\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_UNUSED_2
eng "You should never see it"
ER_NORMAL_SHUTDOWN
cze "%s: norm-Bální ukončení\n"
dan "%s: Normal nedlukning\n"
@ -4989,17 +4966,17 @@ ER_UNSUPPORTED_PS
eng "This command is not supported in the prepared statement protocol yet"
ger "Dieser Befehl wird im Protokoll für vorbereitete Anweisungen noch nicht unterstützt"
ER_GET_ERRMSG
dan "Modtog fejl %d '%-.100s' fra %s"
eng "Got error %d '%-.100s' from %s"
ger "Fehler %d '%-.100s' von %s"
nor "Mottok feil %d '%-.100s' fa %s"
norwegian-ny "Mottok feil %d '%-.100s' fra %s"
dan "Modtog fejl %d '%-.200s' fra %s"
eng "Got error %d '%-.200s' from %s"
ger "Fehler %d '%-.200s' von %s"
nor "Mottok feil %d '%-.200s' fa %s"
norwegian-ny "Mottok feil %d '%-.200s' fra %s"
ER_GET_TEMPORARY_ERRMSG
dan "Modtog temporary fejl %d '%-.100s' fra %s"
eng "Got temporary error %d '%-.100s' from %s"
ger "Temporärer Fehler %d '%-.100s' von %s"
nor "Mottok temporary feil %d '%-.100s' fra %s"
norwegian-ny "Mottok temporary feil %d '%-.100s' fra %s"
dan "Modtog temporary fejl %d '%-.200s' fra %s"
eng "Got temporary error %d '%-.200s' from %s"
ger "Temporärer Fehler %d '%-.200s' von %s"
nor "Mottok temporary feil %d '%-.200s' fra %s"
norwegian-ny "Mottok temporary feil %d '%-.200s' fra %s"
ER_UNKNOWN_TIME_ZONE
eng "Unknown or incorrect time zone: '%-.64s'"
ger "Unbekannte oder falsche Zeitzone: '%-.64s'"