diff options
author | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:21:39 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:21:39 +0100 |
commit | ba56222349781fd8e3938ab18127d46f3c1e0061 (patch) | |
tree | 1e39e4e2960462ea06ae55a993512bf18ce4aa25 /inc/lang/ko | |
parent | 1285aa3a44c9fdf49bfd8992f33bac068bae8226 (diff) | |
parent | c38b7fab9eeb9456aaf5fe8e4481c3b8569e5644 (diff) | |
download | rpg-ba56222349781fd8e3938ab18127d46f3c1e0061.tar.gz rpg-ba56222349781fd8e3938ab18127d46f3c1e0061.tar.bz2 |
Merge branch 'subscription' Pull Request #125
* subscription: (25 commits)
link directly to subscription management in mails
only use mailfromnobody for bulk mails
added missing context for list mails
readded mailfromnobody to subscription sending
correctly escape diffs in HTML mails
fixed lists in HTML mails
simplified subscription->add() code a bit
comment adjusted
removed unused vars
removed data parameter in subscription_handle_post()
fixed tests
some reformatting
added compatibility function
moved registration notification to subscription class
fixed merge error in inc/auth.php
consolidate more notification code in subscription class
minor cleanup
initialize new subscriptions with current time
fixed subscription management
correctly check if subscriptions are enabled
...
Diffstat (limited to 'inc/lang/ko')
-rw-r--r-- | inc/lang/ko/subscr_single.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lang/ko/subscr_single.txt b/inc/lang/ko/subscr_single.txt index 6bd1885e6..2679db393 100644 --- a/inc/lang/ko/subscr_single.txt +++ b/inc/lang/ko/subscr_single.txt @@ -14,7 +14,7 @@ 새 버전 : @NEWPAGE@ 이 문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤 -@NEWPAGE@ 문서를 방문하여 문서나 이름공간의 구독을 취소하세요. +@SUBSCRIBE@ 문서를 방문하여 문서나 이름공간의 구독을 취소하세요. -- @DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
\ No newline at end of file |