diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-01 21:48:02 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-01 21:48:02 +0000 |
| commit | f9a451cce21686c19e0c725efc2edbfadabc4d3a (patch) | |
| tree | 97179308cbf8b09fff4a94a860692e060650ba47 /phpBB/language/en/common.php | |
| parent | cbfe138cdc505511f0f91288afe8da548b93c3bd (diff) | |
| download | forums-f9a451cce21686c19e0c725efc2edbfadabc4d3a.tar forums-f9a451cce21686c19e0c725efc2edbfadabc4d3a.tar.gz forums-f9a451cce21686c19e0c725efc2edbfadabc4d3a.tar.bz2 forums-f9a451cce21686c19e0c725efc2edbfadabc4d3a.tar.xz forums-f9a451cce21686c19e0c725efc2edbfadabc4d3a.zip | |
- some bugfixes
- 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
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ac6c36d08c..efd2ff57e1 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -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', |