diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
| commit | 050efbc12650feaac3e833c4dd740bf090e3dae1 (patch) | |
| tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /config/locales/ko.yml | |
| parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
| parent | 24d5b6f9e39d2ac62a9657c7d19bc8c437b0735b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
Diffstat (limited to 'config/locales/ko.yml')
| -rw-r--r-- | config/locales/ko.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 32a16f1b4..ee5d662bb 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -639,7 +639,7 @@ ko: one: 오류가 발생했습니다. 아래 오류를 확인해 주십시오 other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오 html_validator: - invalid_markup: 올바르지 않은 HTML 마크업을 포함하고 있습니다 + invalid_markup: '올바르지 않은 HTML 마크업을 포함하고 있습니다: %{error}' identity_proofs: active: 활성 authorize: 네, 인증합니다 |