mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

merge

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8776 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2008-08-21 15:50:21 +00:00
parent 76a542a03e
commit 3a3b9eb8ef
7 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/common.php
View File

@@ -169,6 +169,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',

1
phpBB/language/en/viewtopic.php
View File

@@ -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',