mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/nickvergessen/9684' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2011-04-11 00:04:19 -04:00
parent 00a69b4372 ad81637300
commit 716f514ee9
26 changed files with 395 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/install.php
View File

@@ -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',