summaryrefslogtreecommitdiff
path: root/sql/share/errmsg-utf8.txt
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-02 14:15:39 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-02 14:15:39 +0200
commit48e35b8cf61cbedb515787762708afe7bd75386b (patch)
tree401ce3f31fcb689fb0c0a5aa2a6031d895b0d7cd /sql/share/errmsg-utf8.txt
parent1ea5e402a89a1e3fb9ba8045e58570d23837714a (diff)
parent5ac528a91f2d8a3b84e83b434b08fa9dc428f80c (diff)
downloadmariadb-git-48e35b8cf61cbedb515787762708afe7bd75386b.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
-rw-r--r--sql/share/errmsg-utf8.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index d8154255851..bc0c1fe96d5 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7718,8 +7718,8 @@ ER_INVALID_YEAR_COLUMN_LENGTH
rus "Тип YEAR(%lu) более не поддерживается, вместо него будет создана колонка с типом YEAR(4)"
ER_NOT_VALID_PASSWORD
- chi "您的密码不满足当前的政策要求"
- eng "Your password does not satisfy the current policy requirements"
+ eng "Your password does not satisfy the current policy requirements (%s)"
+ ukr "Ваш пароль не відповідає поточним правилам (%s)"
ER_MUST_CHANGE_PASSWORD
bgn "Трябва първо да си смените паролата със SET PASSWORD за да можете да изпълните тази команда"