diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-11 00:04:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-11 00:04:19 -0400 |
| commit | 716f514ee9717906e2d62c9c401b78cab80a2141 (patch) | |
| tree | 9ad7f74cf0e2cd6bd81bed133995501d936e217e /phpBB/language | |
| parent | 00a69b43723b89a90bc59763a1cdae9a7001a153 (diff) | |
| parent | ad81637300bfbbb4f18d80cd87326fbc90dd38f8 (diff) | |
| download | forums-716f514ee9717906e2d62c9c401b78cab80a2141.tar forums-716f514ee9717906e2d62c9c401b78cab80a2141.tar.gz forums-716f514ee9717906e2d62c9c401b78cab80a2141.tar.bz2 forums-716f514ee9717906e2d62c9c401b78cab80a2141.tar.xz forums-716f514ee9717906e2d62c9c401b78cab80a2141.zip | |
Merge branch 'ticket/nickvergessen/9684' into develop
* ticket/nickvergessen/9684:
[ticket/9684] Also display forum-name in subsilver2 template
[ticket/9684] Move currently existing GAs to a selectable forum while updating.
[ticket/9684] View origin-forumname for GAs in topic-list
[ticket/9684] Fix Forum/Topic-Tracking for global announcements
[ticket/9684] Fix a SQL-Error in the posting.php
[ticket/9684] Remove code in some more files especially includes/
[ticket/9684] Remove code for global announcement in root-files
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/install.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 021f5eccb0..35fe28d8b5 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -323,6 +323,7 @@ $lang = array_merge($lang, array( 'SERVER_CONFIG' => 'Server configuration', 'SEARCH_INDEX_UNCONVERTED' => 'Search index was not converted', 'SEARCH_INDEX_UNCONVERTED_EXPLAIN' => 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.', + 'SELECT_FORUM_GA' => 'In phpBB 3.1 the global announcements are linked to forums. Select a forum for your current global announcements (can be moved later):', 'SOFTWARE' => 'Board software', 'SPECIFY_OPTIONS' => 'Specify conversion options', 'STAGE_ADMINISTRATOR' => 'Administrator details', |