diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:57:16 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:57:16 -0400 |
| commit | 19925ad059a31282467c061a76fb387d2206b357 (patch) | |
| tree | fd4669d020544b0ffd41c5696b723904cd2858e7 /phpBB/language/en/common.php | |
| parent | 6291a376445f433b8d05a77c6a0c196aecad04fd (diff) | |
| parent | b3cdd1d16981c5992d1bffb97786084f9f02cad1 (diff) | |
| download | forums-19925ad059a31282467c061a76fb387d2206b357.tar forums-19925ad059a31282467c061a76fb387d2206b357.tar.gz forums-19925ad059a31282467c061a76fb387d2206b357.tar.bz2 forums-19925ad059a31282467c061a76fb387d2206b357.tar.xz forums-19925ad059a31282467c061a76fb387d2206b357.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10237] Also display login-box on subscribing
[ticket/10237] Handle watching and unwatching the same way.
[ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
Conflicts:
phpBB/includes/functions_display.php
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1fceaaa9ba..e04a194839 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -653,6 +653,10 @@ $lang = array_merge($lang, array( 'UNREAD_PMS' => '<strong>%d</strong> unread messages', 'UNREAD_POST' => 'Unread post', 'UNREAD_POSTS' => 'Unread posts', + 'UNWATCH_FORUM_CONFIRM' => 'Are you sure you wish to unsubscribe from this forum?', + 'UNWATCH_FORUM_DETAILED' => 'Are you sure you wish to unsubscribe from the forum “%s”?', + 'UNWATCH_TOPIC_CONFIRM' => 'Are you sure you wish to unsubscribe from this topic?', + 'UNWATCH_TOPIC_DETAILED' => 'Are you sure you wish to unsubscribe from the topic “%s”?', 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.', 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.', 'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.', @@ -701,6 +705,10 @@ $lang = array_merge($lang, array( 'WARNINGS' => 'Warnings', 'WARN_USER' => 'Warn user', + 'WATCH_FORUM_CONFIRM' => 'Are you sure you wish to subscribe to this forum?', + 'WATCH_FORUM_DETAILED' => 'Are you sure you wish to subscribe to the forum “%s”?', + 'WATCH_TOPIC_CONFIRM' => 'Are you sure you wish to subscribe to this topic?', + 'WATCH_TOPIC_DETAILED' => 'Are you sure you wish to subscribe to the topic “%s”?', 'WELCOME_SUBJECT' => 'Welcome to %s forums', 'WEBSITE' => 'Website', 'WHOIS' => 'Whois', |