diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-21 23:42:48 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-21 23:42:48 -0400 |
| commit | 3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7 (patch) | |
| tree | 2bf15639450d275ce8f318dbd11b314355989f84 /phpBB/language | |
| parent | 3c5eca4aed405afd425b165f7b6fd21fb3fe1095 (diff) | |
| parent | e2d286d9f133ffb5128262fc88bfd86766f7b50f (diff) | |
| download | forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.gz forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.bz2 forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.xz forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.zip | |
Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
[ticket/10650] Subject is cleared if no permissions exist
[ticket/10650] Changed apostrophe to utf8 single quote
[ticket/10650] Moving censoring to before truncation
[ticket/10650] Added apostrophe in explanation in language file
[ticket/10650] Inserted correct utf ELLIPSIS character
[ticket/10650] Added space after if and comment
[ticket/10650] Added ellipsis to language file
[ticket/10650] Added href title to subject link
[ticket/10650] Made use of truncate_string() function
[ticket/10650] Removed changes from acp_forums.php
[ticket/10650]Removed incorrect newline
[ticket/10650] Changed acp option from per forum to global
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
[ticket/10650] Changed language files and forumlist
[ticket/10650] Added static sql files
[ticket/10650] Displaying last topic on forum list
Conflicts:
phpBB/install/database_update.php
phpBB/language/en/common.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 7e3c227893..6e5557d9be 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -44,6 +44,8 @@ $lang = array_merge($lang, array( 'DEFAULT_STYLE' => 'Default style', 'DISABLE_BOARD' => 'Disable board', 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.', + 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list', + 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.', 'OVERRIDE_STYLE' => 'Override user style', 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'SITE_DESC' => 'Site description', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 615f5711d0..a6da52d4ef 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -169,6 +169,7 @@ $lang = array_merge($lang, array( ), 'EDIT_POST' => 'Edit post', + 'ELLIPSIS' => '…', 'EMAIL' => 'Email', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'Email address', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending email at <strong>Line %1$s</strong>. Response: %2$s.', |