diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-13 11:34:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-13 11:34:34 +0000 |
| commit | 4804c05bca3e49a62a3fb91a988364024e745a5c (patch) | |
| tree | 38f8f7223716114703145b7dfac447f214aad1fc /phpBB | |
| parent | 01d79f2200d8895f1224ee06b3b583b90f4eb169 (diff) | |
| download | forums-4804c05bca3e49a62a3fb91a988364024e745a5c.tar forums-4804c05bca3e49a62a3fb91a988364024e745a5c.tar.gz forums-4804c05bca3e49a62a3fb91a988364024e745a5c.tar.bz2 forums-4804c05bca3e49a62a3fb91a988364024e745a5c.tar.xz forums-4804c05bca3e49a62a3fb91a988364024e745a5c.zip | |
language updates
git-svn-id: file:///svn/phpbb/trunk@5000 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/common.php | 27 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_activate_inactive.txt | 8 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/viewforum.php | 2 |
4 files changed, 30 insertions, 12 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 80620d238b..1477a207ab 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -43,6 +43,7 @@ $lang += array( '6_MONTHS' => '6 Months', '7_DAYS' => '7 Days', + 'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet', 'ACP' => 'Administration Control Panel', 'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.', 'ALLOWED' => 'Allowed', @@ -280,6 +281,7 @@ $lang += array( 'PROFILE' => 'User Control Panel', 'READING_FORUM' => 'Viewing topics in %s', + 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', 'READING_TOPIC' => 'Reading topic in %s', 'READ_PROFILE' => 'Profile', 'REASON' => 'Reason', @@ -297,6 +299,7 @@ $lang += array( 'REMOVE_INSTALL' => 'Please delete, move or rename the install directory.', 'REPLIES' => 'Replies', 'REPLY_WITH_QUOTE' => 'Reply with quote', + 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'REPLYING_MESSAGE' => 'Replying to message in %s', 'RESET' => 'Reset', 'RETURN_INDEX' => 'Click %sHere%s to return to the index', @@ -330,6 +333,7 @@ $lang += array( 'SELECT' => 'Select', 'SELECT_FORUM' => 'Select a forum', 'SIGNATURE' => 'Signature', + 'SORRY_AUTH_READ' => 'You are not authorized to read this forum', 'SORT_BY' => 'Sort by', 'SORT_JOINED' => 'Joined Date', 'SORT_LOCATION' => 'Location', @@ -349,11 +353,16 @@ $lang += array( 'TERMS_USE' => 'Terms of Use', 'TIME' => 'Time', - 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', - 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', - 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', - 'TOO_SHORT_PASSWORD_CONFIRM'=> 'The password confirmation you entered is too short.', - 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', + + 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', + 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', + 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', + 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', + 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', + 'TOO_SHORT_USERNAME' => 'The username you entered is too short.', + 'TOO_SHORT_EMAIL' => 'The email address you entered is too short.', + 'TOO_SHORT_EMAIL_CONFIRM' => 'The email address confirmation you entered is too short.', + 'TOPIC' => 'Topic', 'TOPICS' => 'Topics', 'TOPIC_ICON' => 'Topic icon', @@ -377,6 +386,8 @@ $lang += array( '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', @@ -403,6 +414,7 @@ $lang += array( 'VIEW_TOPIC_POLL' => 'Poll: ', 'VIEW_TOPIC_STICKY' => 'Sticky: ', + 'WELCOME_SUBJECT' => 'Welcome to %s Forums', 'WEBSITE' => 'Website', 'WHOIS' => 'Whois', 'WHO_IS_ONLINE' => 'Who is Online', @@ -575,8 +587,6 @@ $unused = array( 'Pending_members' => 'Pending Members', 'Pending_this_group' => 'Your membership of this group is pending', 'RATING' => 'Rating', - 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', - 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'RESULT_DIR' => 'Order results', 'RETURN_GROUP' => 'Click %sHere%s to return to the Group Control Panel', 'RETURN_LOGIN' => 'Click %sHere%s to try again', @@ -604,9 +614,6 @@ $unused = array( 'This_open_group' => 'This is an open group, click to request membership', 'To_long_subject' => 'The subject is too long it must be 60 characters or less.', 'UNREAD_NO_PM' => 'You have no unread private messages', - 'UNWATCHED_FORUMS' => 'You are no longer watching the selected forums.', - 'UNWATCHED_FORUMS_TOPICS' => 'You are no longer watching the selected forums or topics.', - 'UNWATCHED_TOPICS' => 'You are no longer watching the selected topics.', 'UPDATE' => 'Update', 'USER_OFFLINE' => 'Offline', 'Unsub_success' => 'You have been un-subscribed from this group.', diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt new file mode 100644 index 0000000000..439437940f --- /dev/null +++ b/phpBB/language/en/email/user_activate_inactive.txt @@ -0,0 +1,8 @@ +Subject: Your account has been deactivated +Charset: iso-8859-1 + +Hello {USERNAME}, + +Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another email when this has occured. + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index f107e4ac0e..3b59ef86bd 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -124,6 +124,7 @@ $lang += array( 'DRAFT_UPDATED' => 'Draft successfully updated.', 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft.', + 'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the email address you supplied when registering.', 'EMAIL_PM' => 'Email PM', 'EMPTY_DRAFT' => 'You must enter a message to submit your changes', @@ -225,11 +226,14 @@ $lang += array( 'NO_AUTH_REPLY_MESSAGE' => 'You are not authorized to reply to private messages.', 'NO_AUTH_SEND_MESSAGE' => 'You are not authorized sending private messages.', + 'NO_BOOKMARKS' => 'You have no bookmarks', 'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks', + 'NO_EMAIL_USER' => 'The email/username information submitted could not be found', 'NO_FOES' => 'No foes currently defined', 'NO_FRIENDS' => 'No friends currently defined', 'NO_FRIENDS_OFFLINE' => 'No friends offline', 'NO_FRIENDS_ONLINE' => 'No friends online', + 'NO_IMPORTANT_NEWS' => 'No important announcements present', 'NO_MESSAGE' => 'Private Message could not be found', 'NO_NEW_FOLDER_NAME' => 'You have to specify a new folder name', 'NO_NEWER_PM' => 'No newer messages', @@ -337,6 +341,7 @@ $lang += array( 'UCP_PROFILE_PROFILE_INFO' => 'Your Profile', 'UCP_PROFILE_REG_DETAILS' => 'Registration details', 'UCP_PROFILE_SIGNATURE' => 'Your signature', + 'UCP_REMIND' => 'Send password', 'UCP_WATCHED' => 'Watched items', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', 'UCP_YIM' => 'Yahoo Messenger', diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index ff8f4d1e40..0769970918 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -47,8 +47,6 @@ $lang += array( 'POST_FORUM_LOCKED' => 'Forum is locked', 'POST_NEW_TOPIC' => 'Post new topic', - 'SORRY_AUTH_READ' => 'You are not authorized to read this forum', - 'TOPICS_MARKED' => 'The topics for this forum have now been marked read', 'VIEW_FORUM' => 'View Forum', |