diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-08 19:04:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-08 19:04:49 +0000 |
| commit | 0b2aaae28bb341a38864eda320e135826a0568e4 (patch) | |
| tree | 3eb7fb1c71612582f5dfa3bbeb062e6d26cb12aa /phpBB/language | |
| parent | f8be2a133bccc6860dd5531dbbfc068a5a3fa699 (diff) | |
| download | forums-0b2aaae28bb341a38864eda320e135826a0568e4.tar forums-0b2aaae28bb341a38864eda320e135826a0568e4.tar.gz forums-0b2aaae28bb341a38864eda320e135826a0568e4.tar.bz2 forums-0b2aaae28bb341a38864eda320e135826a0568e4.tar.xz forums-0b2aaae28bb341a38864eda320e135826a0568e4.zip | |
- forum image being an additional image instead of replacing forum indicators
- reasons fixes
git-svn-id: file:///svn/phpbb/trunk@6470 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 28 |
2 files changed, 17 insertions, 13 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 86ede116bd..21ddc34558 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -73,7 +73,7 @@ $lang = array_merge($lang, array( 'FORUM_DESC_EXPLAIN' => 'Any markup entered here will displayed as is.', 'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.', 'FORUM_IMAGE' => 'Forum Image', - 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an image to associate with this forum.', + 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.', 'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, for example <samp>http://</samp>) to location clicking this forum will take the user.', 'FORUM_LINK_TRACK' => 'Track link redirects', 'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.', diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 6d23fd231d..a1feb2acac 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -212,25 +212,29 @@ $lang = array_merge($lang, array( // Reasons $lang = array_merge($lang, array( 'ACP_REASONS_EXPLAIN' => 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.', - 'ADD_NEW_REASON' => 'Add new reason', + 'AVAILABLE_TITLES' => 'Available localized reason titles', - 'IS_NOT_TRANSLATED' => 'Reason has not been localised', - 'IS_TRANSLATED' => 'Reason has been localised', + 'IS_NOT_TRANSLATED' => 'Reason has <samp>not</samp> been localised.', + 'IS_NOT_TRANSLATED_EXPLAIN' => 'Reason has <samp>not</samp> been localised. If you want to provide the localized form, specify the correct key from the language files report reasons section.', + 'IS_TRANSLATED' => 'Reason has been localised.', + 'IS_TRANSLATED_EXPLAIN' => 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localized form of the title and description will be used.', 'NO_REASON' => 'Reason could not be found.', 'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.', 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".', - 'REASON_ADD' => 'Add report/denial reason', - 'REASON_ADDED' => 'Report/denial reason successfully added.', - 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.', - 'REASON_DESCRIPTION' => 'Reason description', - 'REASON_EDIT' => 'Edit report/denial reason', - 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.', - 'REASON_REMOVED' => 'Report/denial reason successfully removed.', - 'REASON_TITLE' => 'Reason Title', - 'REASON_UPDATED' => 'Report/denial reason successfully updated.', + 'REASON_ADD' => 'Add report/denial reason', + 'REASON_ADDED' => 'Report/denial reason successfully added.', + 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.', + 'REASON_DESCRIPTION' => 'Reason description', + 'REASON_DESC_TRANSLATED' => 'Displayed reason description', + 'REASON_EDIT' => 'Edit report/denial reason', + 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.', + 'REASON_REMOVED' => 'Report/denial reason successfully removed.', + 'REASON_TITLE' => 'Reason title', + 'REASON_TITLE_TRANSLATED' => 'Displayed reason title', + 'REASON_UPDATED' => 'Report/denial reason successfully updated.', 'USED_IN_REPORTS' => 'Used in reports', )); |