diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-08-21 15:41:12 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-08-21 15:41:12 +0000 |
| commit | f56391d5f7d2170397759e26962925635e6a8263 (patch) | |
| tree | fdbdd1c77ed85f7fcc5b7510de5c172948ff22bf /phpBB/language/en | |
| parent | 7e28be59684bf391c1cc58c480f7ed7dfba0f093 (diff) | |
| download | forums-f56391d5f7d2170397759e26962925635e6a8263.tar forums-f56391d5f7d2170397759e26962925635e6a8263.tar.gz forums-f56391d5f7d2170397759e26962925635e6a8263.tar.bz2 forums-f56391d5f7d2170397759e26962925635e6a8263.tar.xz forums-f56391d5f7d2170397759e26962925635e6a8263.zip | |
as per evil3, some more anti-CSRF
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8775 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/viewtopic.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 9b066ecdaa..c4628f3e1b 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -170,6 +170,8 @@ $lang = array_merge($lang, array( 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', + 'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.', + 'ERR_WATCHING' => 'An error occured while trying to subscribe.', 'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path specified appears to be invalid.', 'EXPAND_VIEW' => 'Expand view', 'EXTENSION' => 'Extension', diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 337a21c11f..4252fa7542 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -40,6 +40,7 @@ $lang = array_merge($lang, array( 'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'The attachments feature has been disabled.', 'BOOKMARK_ADDED' => 'Bookmarked topic successfully.', + 'BOOKMARK_ERR' => 'Bookmarking the topic failed. Please try again.', 'BOOKMARK_REMOVED' => 'Removed bookmarked topic successfully.', 'BOOKMARK_TOPIC' => 'Bookmark topic', 'BOOKMARK_TOPIC_REMOVE' => 'Remove from bookmarks', |