diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-10 15:14:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-10 15:14:25 +0000 |
| commit | 2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1 (patch) | |
| tree | 20cc92d3b1136876bccb7548dda2c27c223d23c8 /phpBB/language | |
| parent | f538d70301a38cd65ca9d2463db0420c5eb1f3e0 (diff) | |
| download | forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.gz forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.bz2 forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.xz forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.zip | |
some fixes here and there
git-svn-id: file:///svn/phpbb/trunk@7860 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 90676cf6bc..c0ed383e5b 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -58,7 +58,7 @@ $lang = array_merge($lang, array( 'ALLOW_BOOKMARKS' => 'Allow bookmarking topics', 'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks.', 'ALLOW_BBCODE' => 'Allow BBCode', - 'ALLOW_FORUM_NOTIFY' => 'Allow forum watching', + 'ALLOW_FORUM_NOTIFY' => 'Allow subscribing to forums', 'ALLOW_NAME_CHANGE' => 'Allow username changes', 'ALLOW_NO_CENSORS' => 'Allow disabling of word censoring', 'ALLOW_NO_CENSORS_EXPLAIN' => 'Users can choose to disable the automatic word censoring of posts and private messages.', @@ -71,7 +71,7 @@ $lang = array_merge($lang, array( 'ALLOW_SIG_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.', 'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures', 'ALLOW_SMILIES' => 'Allow smilies', - 'ALLOW_TOPIC_NOTIFY' => 'Allow topic watching', + 'ALLOW_TOPIC_NOTIFY' => 'Allow subscribing to topics', 'BOARD_PM' => 'Private messaging', 'BOARD_PM_EXPLAIN' => 'Enable or disable private messaging for all users.', )); @@ -376,7 +376,7 @@ $lang = array_merge($lang, array( // Email Settings $lang = array_merge($lang, array( - 'ACP_EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary), do not specify any old name here! If the server requires authentication (and only if it does) enter the necessary username and password. Please note only basic authentication is offered, different authentication implementations are not currently supported.', + 'ACP_EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.', 'ADMIN_EMAIL' => 'Return e-mail address', 'ADMIN_EMAIL_EXPLAIN' => 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in e-mails.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 9d2755667d..e6fd409073 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -590,8 +590,8 @@ $lang = array_merge($lang, array( 'UNREAD_MESSAGES' => 'Unread messages', 'UNREAD_PM' => '<strong>%d</strong> unread message', 'UNREAD_PMS' => '<strong>%d</strong> unread messages', - 'UNWATCHED_FORUMS' => 'You are no longer watching the selected forums.', - 'UNWATCHED_TOPICS' => 'You are no longer watching the selected topics.', + 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.', + 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.', 'UPDATE' => 'Update', 'UPLOAD_IN_PROGRESS' => 'The upload is currently in progress.', 'URL_REDIRECT' => 'If your browser does not support meta redirection %splease click HERE to be redirected%s.', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 8fd95bc0ae..b946de5d1a 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -446,7 +446,7 @@ $lang = array_merge($lang, array( 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', 'PERFORM_DATABASE_UPDATE' => 'Perform database update', - 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update had been performed just follow the link presented to continue the update process.', + 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update had been performed just follow the instructions to continue the update process.', 'PREVIOUS_VERSION' => 'Previous version', 'PROGRESS' => 'Progress', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 4c402d9b59..b41d43e8e5 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -304,8 +304,8 @@ $lang = array_merge($lang, array( 'NO_RULES_DEFINED' => 'No rules defined.', 'NO_SAVED_DRAFTS' => 'No drafts saved.', 'NO_TO_RECIPIENT' => 'None', - 'NO_WATCHED_FORUMS' => 'You are not watching any forums.', - 'NO_WATCHED_TOPICS' => 'You are not watching any topics.', + 'NO_WATCHED_FORUMS' => 'You are not subscribed to any forums.', + 'NO_WATCHED_TOPICS' => 'You are not subscribed to any topics.', 'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.', 'PASS_TYPE_ANY_EXPLAIN' => 'Must be between %1$d and %2$d characters.', |