diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-11-09 14:42:26 -0800 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-11-09 14:42:26 -0800 |
commit | 50dc39751358b32837011aa938f481233fd781f4 (patch) | |
tree | 9201aab8326329b6f739cb6a66e40ceb3faf28c8 /i18n/ko.json | |
parent | 10c5a927cb619f1aa2a599cbe3667820f4766bda (diff) | |
parent | 120fbed0f7715506cee8d2ba90f445eefcb072d7 (diff) | |
download | chat-50dc39751358b32837011aa938f481233fd781f4.tar.gz chat-50dc39751358b32837011aa938f481233fd781f4.tar.bz2 chat-50dc39751358b32837011aa938f481233fd781f4.zip |
Merge branch 'release-4.4'
Diffstat (limited to 'i18n/ko.json')
-rw-r--r-- | i18n/ko.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/i18n/ko.json b/i18n/ko.json index 7e16baffc..f6bb947da 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -2164,6 +2164,10 @@ "translation": "요청의 'file' 항목에 파일이 없습니다." }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Malformed request: importFrom field is not present." + }, + { "id": "api.team.import_team.open.app_error", "translation": "파일을 열 수 없습니다." }, @@ -2800,7 +2804,7 @@ "translation": "가입 환영 메일을 발송하지 못하였습니다." }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "You can not modify the activation status of LDAP accounts. Please modify through the LDAP server." }, { |