makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-02-14 07:32:24 +01:00
commit 218d5dd75f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/common.php
View file

@ -206,6 +206,7 @@ $lang = array_merge($lang, array(
'DISPLAY_MESSAGES' => 'Display messages from previous', 'DISPLAY_MESSAGES' => 'Display messages from previous',
'DISPLAY_POSTS' => 'Display posts from previous', 'DISPLAY_POSTS' => 'Display posts from previous',
'DISPLAY_TOPICS' => 'Display topics from previous', 'DISPLAY_TOPICS' => 'Display topics from previous',
'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
'DOWNLOADED' => 'Downloaded', 'DOWNLOADED' => 'Downloaded',
'DOWNLOADING_FILE' => 'Downloading file', 'DOWNLOADING_FILE' => 'Downloading file',
'DOWNLOAD_COUNTS' => array( 'DOWNLOAD_COUNTS' => array(

1
phpBB/language/en/ucp.php
View file

@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
'DEMOTE_SELECTED' => 'Demote selected', 'DEMOTE_SELECTED' => 'Demote selected',
'DISABLE_CENSORS' => 'Enable word censoring', 'DISABLE_CENSORS' => 'Enable word censoring',
'DISPLAY_GALLERY' => 'Display gallery', 'DISPLAY_GALLERY' => 'Display gallery',
'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
'DOWNLOADS' => 'Downloads', 'DOWNLOADS' => 'Downloads',
'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.', 'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.',
'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.', 'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.',