mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- some bugfixes

Browse Source 
- committed coding guidelines as they are at area51
- removed script_path (needs a close inspection later)
- removed the need for server_name and server_port
- able to define server port/name/protocol and force the user-defined server vars (very handy for proxy setups)


git-svn-id: file:///svn/phpbb/trunk@5595 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-01 21:48:02 +00:00
parent cbfe138cdc
commit f9a451cce2
21 changed files with 419 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/language/en/acp/board.php
View File

@@ -119,13 +119,18 @@ $lang = array_merge($lang, array(
// Server settings
$lang = array_merge($lang, array(
'ACP_SERVER_SETTINGS_EXPLAIN' => 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
'FORCE_SERVER_VARS' => 'Force server url settings',
'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favor of the automatically determined values',
'PATH_SETTINGS' => 'Path Settings',
'SERVER_NAME' => 'Domain Name',
'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from',
'SCRIPT_PATH' => 'Script path',
'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB2 is located relative to the domain name',
'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: www.foo.bar)',
// 'SCRIPT_PATH' => 'Script path',
// 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB2 is located relative to the domain name',
'SERVER_PORT' => 'Server Port',
'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different',
'SERVER_PROTOCOL' => 'Server Protocol',
'SERVER_PROTOCOL_EXPLAIN' => 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (http:// or https://)',
'SERVER_URL_SETTINGS' => 'Server URL Settings',
'IP_VALID' => 'Session IP validation',
'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.',
'ALL' => 'All',

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

@@ -113,6 +113,7 @@ $lang = array_merge($lang, array(
'DISPLAY_POSTS' => 'Display posts from previous',
'DISPLAY_TOPICS' => 'Display topics from previous',
'DOWNLOADED' => 'Downloaded',
'DOWNLOADING_FILE' => 'Downloading file',
'DOWNLOAD_COUNT' => '%d Time',
'DOWNLOAD_COUNTS' => '%d Times',
'DOWNLOAD_NONE' => '0 Times',
@@ -346,6 +347,7 @@ $lang = array_merge($lang, array(
'REPLYING_MESSAGE' => 'Replying to message in %s',
'REPORT_BY' => 'Report by',
'REPORT_POST' => 'Report this post',
'REPORTING_POST' => 'Reporting post',
'RESEND_ACTIVATION' => 'Resend activation email',
'RESET' => 'Reset',
'RETURN_INDEX' => 'Click %sHere%s to return to the index',
@@ -442,25 +444,27 @@ $lang = array_merge($lang, array(
'TOTAL_USERS_OTHER' => 'Total members <b>%d</b>',
'TOTAL_USERS_ZERO' => 'Total members <b>0</b>',
'UNKNOWN_BROWSER' => 'Unknown Browser',
'UNMARK_ALL' => 'Unmark all',
'UNREAD_MESSAGES' => 'Unread Messages',
'UNREAD_PM' => '<b>%d</b> unread message',
'UNREAD_PMS' => '<b>%d</b> unread messages',
'UNWATCHED_FORUMS' => 'You are no longer watching the selected forums.',
'UNWATCHED_TOPICS' => 'You are no longer watching the selected topics.',
'URL_REDIRECT' => 'If your browser does not support meta redirection please click %sHERE%s to be redirected.',
'USERGROUPS' => 'Groups',
'USERNAME' => 'Username',
'USERNAMES' => 'Usernames',
'USER_POST' => '%d Post',
'USER_POSTS' => '%d Posts',
'USERS' => 'Users',
'UNKNOWN_BROWSER' => 'Unknown Browser',
'UNMARK_ALL' => 'Unmark all',
'UNREAD_MESSAGES' => 'Unread Messages',
'UNREAD_PM' => '<b>%d</b> unread message',
'UNREAD_PMS' => '<b>%d</b> unread messages',
'UNWATCHED_FORUMS' => 'You are no longer watching the selected forums.',
'UNWATCHED_TOPICS' => 'You are no longer watching the selected topics.',
'UPLOAD_IN_PROGRESS' => 'The upload is currently in progress',
'URL_REDIRECT' => 'If your browser does not support meta redirection please click %sHERE%s to be redirected.',
'USERGROUPS' => 'Groups',
'USERNAME' => 'Username',
'USERNAMES' => 'Usernames',
'USER_POST' => '%d Post',
'USER_POSTS' => '%d Posts',
'USERS' => 'Users',
'VIEWED' => 'Viewed',
'VIEWING_FAQ' => 'Viewing FAQ',
'VIEWING_MEMBERS' => 'Viewing member details',
'VIEWING_ONLINE' => 'Viewing who is online',
'VIEWING_PROFILE' => 'Viewing member profile',
'VIEWING_UCP' => 'Viewing user control panel',
'VIEWS' => 'Views',
'VIEW_BOOKMARKS' => 'View bookmarks',