Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
This commit is contained in:
Joas Schilling 2014-03-28 19:31:46 +01:00
commit e361896d07

View file

@ -360,7 +360,7 @@ $lang = array_merge($lang, array(
'GZIP_COMPRESSION' => 'GZip compression',
'NO_SEARCH_INDEX' => 'The selected search backend does not have a search index.<br >Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
'NO_SEARCH_INDEX' => 'The selected search backend does not have a search index.<br />Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
'NOT_AVAILABLE' => 'Not available',
'NUMBER_FILES' => 'Number of attachments',
'NUMBER_POSTS' => 'Number of posts',