diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 17:09:29 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 17:09:29 +0100 |
| commit | 3275c5d6feb683bf4151f7d4867b10431b254d1e (patch) | |
| tree | 4fd5e9ecf9165eb1b7cddd3d2bb1ae1330db92ab /inc/lang/ko | |
| parent | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (diff) | |
| parent | 1359eacbdbff842b241a85ea274a00982fec9267 (diff) | |
| download | rpg-3275c5d6feb683bf4151f7d4867b10431b254d1e.tar.gz rpg-3275c5d6feb683bf4151f7d4867b10431b254d1e.tar.bz2 | |
Merge branch 'master' into diff_navigation
* master: (103 commits)
Add a basic test case for the cache
Events: Trigger a warning if the default action is not callable
Fix caching (make the event callback public again)
translation update
translation update
translation update
translation update
translation update
translation update
translation update
avoid HTTP image screenshot urls. closes #595
translation update
Extension manager: Fix cache extension to be .repo
adjusted the office type color again
another instance of empty() where an array key might not exist
remove placeholder van denied.txt
updated file icons once more
removed 'not logged in' text, loginform is shown already
Revert "added stripped bit to language file"
fixed index file
...
Conflicts:
inc/html.php
Diffstat (limited to 'inc/lang/ko')
| -rw-r--r-- | inc/lang/ko/denied.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/lang/ko/denied.txt b/inc/lang/ko/denied.txt index cf0b294a4..a4b94be65 100644 --- a/inc/lang/ko/denied.txt +++ b/inc/lang/ko/denied.txt @@ -1,3 +1,4 @@ ====== 권한 거절 ====== -죄송하지만 계속할 수 있는 권한이 없습니다. 로그인을 잊으셨나요?
\ No newline at end of file +죄송하지만 계속할 수 있는 권한이 없습니다. + |