diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-13 15:01:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-13 15:01:15 +0000 |
| commit | 685282c2cbe8a6d8c7abd77d3801d7242d0ae693 (patch) | |
| tree | 0533a1ca066f5c78882782b1a9fcbcb4e2f768f5 /phpBB/language | |
| parent | e503216834c466de1eb5746d1b2998a8db5de086 (diff) | |
| download | forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.gz forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.bz2 forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.xz forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.zip | |
- some language tweaks suggested by John
- some bug fixes
- finally adding db_tools...
git-svn-id: file:///svn/phpbb/trunk@8088 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/email/forum_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_reactivate_account.txt | 2 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index b3e79e17a9..fae5a83885 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt index 444933b633..260e69c380 100644 --- a/phpBB/language/en/email/user_reactivate_account.txt +++ b/phpBB/language/en/email/user_reactivate_account.txt @@ -1,6 +1,6 @@ Subject: Reactivate your account on "{SITENAME}" - {U_BOARD} -A board administrator forced your account to be reactivated. Your account is currently inactive. +A board administrator requested that your account be reactivated. Your account is currently inactive. Please follow the steps listed here to reactivate your account. Please keep this e-mail for your records. Your account information is as follows: diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 36e4d0e799..945e25297c 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -294,7 +294,7 @@ $lang = array_merge($lang, array( 'POST_ID' => 'Post ID', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', - 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually adjust several things. After conversion, especially check the permissions assigned, rebuild your search index if necessary and also make sure files got copied correctly, for example avatars and smilies.', + 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.', 'PROCESS_LAST' => 'Processing last statements', 'REFRESH_PAGE' => 'Refresh page to continue conversion', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 35514443a6..e896d72e37 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -207,6 +207,7 @@ $lang = array_merge($lang, array( 'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.', 'VIEW_MESSAGE' => '%sView your submitted message%s', + 'VIEW_PRIVATE_MESSAGE' => '%sView your submitted private message%s', 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.', 'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.', |