List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:January 17 2007 8:01pm
Subject:bk commit into 5.1 tree (cmiller:1.2392)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-17 15:01:28-05:00, cmiller@stripped +1 -0
  errmsg update from Stefan.

  sql/share/errmsg.txt@stripped, 2007-01-17 15:01:26-05:00, cmiller@stripped +14 -7
    errmsg update from Stefan.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.138/sql/share/errmsg.txt	2007-01-17 15:01:34 -05:00
+++ 1.139/sql/share/errmsg.txt	2007-01-17 15:01:34 -05:00
@@ -950,7 +950,7 @@ ER_CON_COUNT_ERROR 08004 
         eng "Too many connections"
-        fre "Trop de connections"
+        fre "Trop de connexions"
         ger "Zu viele Verbindungen"
         hun "Tul sok kapcsolat"
@@ -1827,7 +1827,7 @@ ER_READY  
         eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d"
         hun "%s: kapcsolatra kesz"
@@ -1950,7 +1950,7 @@ ER_IPSOCK_ERROR 08S01 
         eng "Can't create IP socket"
         est "Ei suuda luua IP socketit"
         ger "Kann IP-Socket nicht erzeugen"
         hun "Az IP socket nem hozhato letre"
@@ -3031,7 +3031,7 @@ ER_HOST_IS_BLOCKED  
         eng "Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'"
         ger "Host '%-.64s' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'"
         hun "A '%-.64s' host blokkolodott, tul sok kapcsolodasi hiba miatt. Hasznalja a 'mysqladmin flush-hosts' parancsot"
@@ -3533,7 +3533,7 @@ ER_NET_READ_ERROR_FROM_PIPE 08S01 
         nla "Kreeg leesfout van de verbindings pipe"
         eng "Got a read error from the connection pipe"
         ger "Lese-Fehler bei einer Verbindungs-Pipe"
         hun "Olvasasi hiba a kapcsolat soran"
         ita "Rilevato un errore di lettura dalla pipe di connessione"
@@ -4331,7 +4331,7 @@ ER_TOO_MANY_USER_CONNECTIONS 42000 
         nla "Gebruiker %-.64s heeft reeds meer dan 'max_user_connections' actieve verbindingen"
         eng "User %-.64s already has more than 'max_user_connections' active connections"
         ger "Benutzer '%-.64s' hat mehr als 'max_user_connections' aktive Verbindungen"
         ita "L'utente %-.64s ha gia' piu' di 'max_user_connections' connessioni attive"
@@ -6009,15 +6009,22 @@ ER_BAD_LOG_STATEMENT
 ER_NON_INSERTABLE_TABLE  
         eng "The target table %-.100s of the %s is not insertable-into"
 ER_CANT_RENAME_LOG_TABLE
         eng "Cannot rename '%s'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to '%s'"
 ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT 42000
         eng "Incorrect parameter count in the call to native function '%-.64s'"
+        ger "Falsche Anzahl von Parametern beim Aufruf der nativen Funktion '%-.64s'"
 ER_WRONG_PARAMETERS_TO_NATIVE_FCT 42000
         eng "Incorrect parameters in the call to native function '%-.64s'"
+        ger "Falscher Parameter beim Aufruf der nativen Funktion '%-.64s'"
 ER_WRONG_PARAMETERS_TO_STORED_FCT 42000  
         eng "Incorrect parameters in the call to stored function '%-.64s'"
+        ger "Falsche Parameter beim Aufruf der gespeicherten Funktion '%-.64s'"
 ER_NATIVE_FCT_NAME_COLLISION
-        eng "This function '%-.64s' has the same name as a native function."
+        eng "This function '%-.64s' has the same name as a native function"
+        ger "Die Funktion '%-.64s' hat denselben Namen wie eine native Funktion"
 ER_BINLOG_PURGE_EMFILE
         eng "Too many files opened, please execute the command again"
Thread
bk commit into 5.1 tree (cmiller:1.2392)Chad MILLER17 Jan