diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-02 15:23:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-02 15:23:33 +0000 |
| commit | a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5 (patch) | |
| tree | e13dd92e386cb98de51bd0730fdd569efe6e5f36 /phpBB/language | |
| parent | 21a002e4ac28f8e65e2c865eb171a44ac4054044 (diff) | |
| download | forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.gz forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.bz2 forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.xz forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.zip | |
some updates; and hopefully not completely breaking redirects (again). :D You know, i like breaking things.
git-svn-id: file:///svn/phpbb/trunk@6544 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index dd26ea5370..6e86da03a7 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -43,13 +43,14 @@ $lang = array_merge($lang, array( 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field.', 'CHARS_ANY' => 'Any character', 'CHECKBOX' => 'Checkbox', + 'COLUMNS' => 'Columns', 'CP_LANG_DEFAULT_VALUE' => 'Default value', 'CP_LANG_EXPLAIN' => 'Field Description', 'CP_LANG_EXPLAIN_EXPLAIN' => 'The explanation for this field presented to the user', 'CP_LANG_NAME' => 'Field name/title presented to the user', 'CP_LANG_OPTIONS' => 'Options', 'CREATE_NEW_FIELD' => 'Create new field', - 'COLUMNS' => 'Columns', + 'CUSTOM_FIELDS_NOT_TRANSLATED' => 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the "Translate" link.', 'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]', 'DEFAULT_LANGUAGE_NOT_FILLED' => 'The language entries for the default language are not filled for this profile field.', @@ -139,6 +140,7 @@ $lang = array_merge($lang, array( 'STRING_DEFAULT_VALUE_EXPLAIN' => 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.', 'TEXT_DEFAULT_VALUE_EXPLAIN' => 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.', + 'TRANSLATE' => 'Translate', 'UPDATE_PREVIEW' => 'Update preview', 'USER_FIELD_NAME' => 'Field name/title presented to the user', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index f9d5301b88..eb9298cebf 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -46,8 +46,10 @@ $lang = array_merge($lang, array( 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', + 'CANNOT_SET_FOUNDER_BOT' => 'You are not able to promote ignored users to be founders.', + 'CANNOT_SET_FOUNDER_INACTIVE' => 'You need to activate users before you promote them to founders, only activated users are able to be promoted.', 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing the users email address.', - + 'DELETE_POSTS' => 'Delete posts', 'DELETE_USER' => 'Delete user', 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered', |