diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-17 18:41:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-17 18:41:49 +0000 |
| commit | a841fe70a8234bf158165105339e32aa5ceb75a2 (patch) | |
| tree | a3e85eb75ec6bb59b331bd830667532d4511a868 /phpBB/language | |
| parent | 708113b790368fffbf57eb5b96c8132eda00ba9c (diff) | |
| download | forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.gz forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.bz2 forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.xz forums-a841fe70a8234bf158165105339e32aa5ceb75a2.zip | |
ok, handled some bugs... the most important being validate_username (the variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o
git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 8ac4602dd9..09f6ddcc35 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -451,6 +451,9 @@ $lang = array_merge($lang, array( 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s', 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s', 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %s', + 'LOG_SPLIT_DESTINATION' => '<strong>Moved splitted posts</strong><br />» to %s', + 'LOG_SPLIT_SOURCE' => '<strong>Splitted posts</strong><br />» from %s', + 'LOG_TOPIC_DELETED' => '<strong>Deleted topic</strong><br />» %s', 'LOG_TOPIC_RESYNC' => '<strong>Resynchronised topic counters</strong><br />» %s', 'LOG_TOPIC_TYPE_CHANGED' => '<strong>Changed topic type</strong><br />» %s', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index dcdb5bec18..f690f6fdb7 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -62,7 +62,7 @@ $lang = array_merge($lang, array( 'DISPLAY_AT_REGISTER' => 'Display at registration screen', 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.', 'DISPLAY_PROFILE_FIELD' => 'Display profile field', - 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on viewtopic/viewprofile/memberlist/etc.', + 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on viewtopic/viewprofile/memberlist. if this is enabled within the load settings. Only showing within the users profile is enabled by default.', 'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line', 'EDIT_DROPDOWN_LANG_EXPLAIN' => 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 6b8935334c..2424a88e2b 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -119,8 +119,6 @@ $lang = array_merge($lang, array( 'USER_RANK_UPDATED' => 'User rank updated.', 'USER_SIG_UPDATED' => 'User signature successfully updated.', 'USER_TOOLS' => 'Basic tools', - - 'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.', )); ?>
\ No newline at end of file diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index c650b2b388..fbeaa3e699 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -124,6 +124,7 @@ $lang = array_merge($lang, array( 'NOTIFY_REPLY' => 'Send me an email when a reply is posted', 'NOT_UPLOADED' => 'File could not be uploaded.', 'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options', + 'NO_PM_ICON' => 'No PM icon', 'NO_POLL_TITLE' => 'You have to enter a poll title', 'NO_POST' => 'The requested post does not exist.', 'NO_POST_MODE' => 'No post mode specified', |