diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
| commit | d14415e37072dbe16077efd700aee5bd33707b54 (patch) | |
| tree | 062c3c190039ac9490f56598b0ee116de18c2480 /lib/plugins/acl/lang/ko | |
| parent | 2ed38036a53a489d2fcadc46ce601f8c876fca31 (diff) | |
| parent | 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 (diff) | |
| download | rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.gz rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.bz2 | |
Merge branch 'master' into subscription
* master: (175 commits)
some coding style improvements
added .idea project folder to gitignore
use correct setUp method and parent calls.
Correct German plugin manager translation (download != install)
correct return in sendDigest()
Fix case-insensitive match in ACL checking
GeSHi update to 1.0.8.11
ignore empty header on mail sending
remove empty BCC/CC mail headers
Galician language update
some welcome page changes
Combine subsequent calls to strtr into a single transformation
changed semicolon to colon in link to welcome page to make it less confusing
fixed wrong sidebar showing in namespaces when sidebar is disabled
Typo fix for TL;DR
removed a bunch of outdated and irrelevant networking acronyms
added another place to look for logo to make it more consistent (FS#2656)
French language update
Czech language update
compat js findPosX/y more closely mimic historical function
...
Conflicts:
inc/auth.php
inc/common.php
inc/subscription.php
lib/exe/indexer.php
Diffstat (limited to 'lib/plugins/acl/lang/ko')
| -rw-r--r-- | lib/plugins/acl/lang/ko/help.txt | 2 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/ko/lang.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index 377636682..6a15b7a2e 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -1,4 +1,4 @@ -=== 도움말: === +=== 빠른 도움말: === 현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index c8e1ce5cc..5d2662ef8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -41,4 +41,4 @@ $lang['acl_perm4'] = '만들기'; $lang['acl_perm8'] = '올리기'; $lang['acl_perm16'] = '삭제'; $lang['acl_new'] = '새 항목 추가'; -$lang['acl_mod'] = '선택 항목 변경'; +$lang['acl_mod'] = '선택 항목 수정'; |