aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-08-13 12:14:07 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-08-13 12:14:07 +0000
commite9188d4e05eeadfd9246d9dc44160736f6fa64d6 (patch)
tree7fcdcc5cd7c7e90e2ae4f8abc309fc74101b025b /phpBB/language
parent11f05e3513f4133cce57d4177f9616c1ef32cd34 (diff)
downloadforums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar
forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.gz
forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.bz2
forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.xz
forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.zip
Some changes... non-invasive...
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php2
-rw-r--r--phpBB/language/en/acp/database.php2
-rw-r--r--phpBB/language/en/acp/users.php2
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/email/forum_notify.txt6
-rw-r--r--phpBB/language/en/email/topic_notify.txt3
6 files changed, 14 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 576b87eabd..fbc82d4c5b 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -268,7 +268,7 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/team/">official team members</a> on the support forums.',
- 'NO_PHPINFO_AVAILABLE' => 'The PHP informations are unable to be determined. Phpinfo() has been disabled for security reasons.',
+ 'NO_PHPINFO_AVAILABLE' => 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.',
));
// Logs
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 9d0e5e3cf6..700aa321cc 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
// Database Backup/Restore
$lang = array_merge($lang, array(
'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.',
- 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the <samp>store/</samp> folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.',
+ 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the <samp>store/</samp> folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.',
'BACKUP_DELETE' => 'The backup file has been deleted successfully.',
'BACKUP_INVALID' => 'The selected file to backup is invalid.',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 3a2b8170ab..48f3b29334 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
'USER_ADMIN_DEL_AVATAR' => 'Delete avatar',
'USER_ADMIN_DEL_POSTS' => 'Delete all posts',
'USER_ADMIN_DEL_SIG' => 'Delete signature',
- 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.',
+ 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options.',
'USER_ADMIN_FORCE' => 'Force reactivation',
'USER_ADMIN_MOVE_POSTS' => 'Move all posts',
'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b082a00c52..5a433af5ee 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -526,6 +526,7 @@ $lang = array_merge($lang, array(
'TOO_LONG_AIM' => 'The screenname you entered is too long.',
'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.',
+ 'TOO_LONG_DATEFORMAT' => 'The date format you entered is too long.',
'TOO_LONG_ICQ' => 'The ICQ number you entered is too long.',
'TOO_LONG_INTERESTS' => 'The interests you entered is too long.',
'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.',
@@ -545,6 +546,7 @@ $lang = array_merge($lang, array(
'TOO_SHORT_AIM' => 'The screenname you entered is too short.',
'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.',
+ 'TOO_SHORT_DATEFORMAT' => 'The date format you entered is too short.',
'TOO_SHORT_ICQ' => 'The ICQ number you entered is too short.',
'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.',
'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.',
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index f55e6dd80b..090782091e 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -6,6 +6,12 @@ You are receiving this notification because you are watching the forum, "{FORUM_
{U_NEWEST_POST}
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_TOPIC}
+
If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 3c8c38cf0a..99587b28e0 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -10,6 +10,9 @@ If you want to view the newest post made since your last visit, click the follow
If you want to view the topic, click the following link:
{U_TOPIC}
+If you want to view the forum, click the following link:
+{U_FORUM}
+
If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
{U_STOP_WATCHING_TOPIC}
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 07:05:16 +0000