summaryrefslogtreecommitdiff
path: root/sql/share/errmsg-utf8.txt
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-05-24 10:56:25 +1000
committerDaniel Black <daniel@mariadb.org>2022-05-24 10:56:25 +1000
commita2bdd528358418608e5bacf17a0d70da83b763d5 (patch)
tree9fd30c8b627c5630c3a83b98dcbd8d3209d2c188 /sql/share/errmsg-utf8.txt
parent0d9aba05ec6dd87fadbbca31aa1c0f3f4ee2b468 (diff)
parent443590406caf2b547e5697708c216ee52011b890 (diff)
downloadmariadb-git-a2bdd528358418608e5bacf17a0d70da83b763d5.tar.gz
Merge branch 10.5 into 10.6
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
-rw-r--r--sql/share/errmsg-utf8.txt19
1 files changed, 15 insertions, 4 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 7c339eb1ec8..8ca33df033a 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6450,10 +6450,21 @@ ER_AMBIGUOUS_FIELD_TERM
ger "Das erste Zeichen der Zeichenkette FIELDS TERMINATED ist mehrdeutig; bitte benutzen Sie nicht optionale und nicht leere FIELDS ENCLOSED BY"
spa "El primer carácter de la cadena de los FIELDS TERMINATED es ambiguo; por favor, use FIELDS ENCLOSED BY no opcionales y no vacíos"
ER_FOREIGN_SERVER_EXISTS
- chi "您正在尝试创建的外来服务器%s已存在"
- eng "The foreign server, %s, you are trying to create already exists"
- ger "Der entfernte Server %s, den Sie versuchen zu erzeugen, existiert schon"
- spa "El servidor foráneo %s que intenta crear ya existe"
+ chi "无法创建外部服务器'%s',因为它已经存在"
+ eng "Cannot create foreign server '%s' as it already exists"
+ fin "Vieraata palvelinta '%s' ei voida luoda, koska se on jo olemassa"
+ fre "Impossible de créer le serveur étranger '%s' car il existe déjà"
+ ger "Der auswärtige Server '%s' kann nicht erstellt werden, da er bereits vorhanden ist"
+ greek "Δεν είναι δυνατή η δημιουργία ξένου διακομιστή '%s' επειδή υπάρχει ήδη"
+ ita "Impossibile creare il server esterno '%s' poiché esiste già"
+ jpn "外部サーバー '%s'は既に存在するため、作成できません"
+ nla "Kan geen externe server '%s' maken omdat deze al bestaat"
+ nor "Kan ikke opprette utenlandsk server '%s' fordi den allerede eksisterer"
+ pol "Nie można utworzyć obcego serwera '%s', ponieważ już istnieje"
+ por "Não foi possível criar o servidor externo '%s' porque ele já existe"
+ rus "Невозможно создать сторонний сервер '%s', так как он уже существует"
+ spa "No se puede crear el servidor externo '%s' porque ya existe"
+ swe "Det gick inte att skapa främmande server '%s' eftersom den redan finns"
ER_FOREIGN_SERVER_DOESNT_EXIST
chi "您尝试引用的外部服务器名称不存在。数据源错误:%-.64s"
eng "The foreign server name you are trying to reference does not exist. Data source error: %-.64s"