aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-08-26 18:56:09 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-08-26 18:56:09 +0200
commitd0ce637251da211b2e969f7a173d3bde97b0894b (patch)
treefcb6c80b5b1c7c21d212bd5f51b7eb93d71cc092 /phpBB/language/en
parent18039cfa6af73d6582145023b6a3e67788d7a948 (diff)
parente1a4aa3ea255874660d31e13c0b4cadc8993ef4f (diff)
downloadforums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar
forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.gz
forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.bz2
forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.xz
forums-d0ce637251da211b2e969f7a173d3bde97b0894b.zip
Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits) [feature/attach-dl] Removed the use of some abbreviations [feature/attach-dl] Changed $files_added checks [feature/attach-dl] Renamed $post_id to $post_msg_id [feature/attach-dl] Fixed a comment [feature/attach-dl] Optimised an sql query [feature/attach-dl] Fixed the logic in an sql statement [feature/attch-dl] $forum_id cast to int [feature/attach-dl] Fixed $file_added to $files_added [feature/attach-dl] Moved definition of $archive_name [feature/attach-dl] Swapped the order of an if statement [feature/attach-dl] Cast variables to int [feature/attach-dl] Added $archive_path [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma [feature/attach-dl] Renamed $count to $files_added [feature/attach-dl] Removed sprintf() use [feature/attach-dl] Removed need for array_keys() [feature/attach-dl] Added multiple attachment downloads to PMs [feature/attach-dl] Removed reliance on current($row) [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth [feature/attach-dl] Moved PM authentication handling into own function ...
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 33d39c3e99..e6022e3b79 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -161,6 +161,8 @@ $lang = array_merge($lang, array(
'DISPLAY_MESSAGES' => 'Display messages from previous',
'DISPLAY_POSTS' => 'Display posts from previous',
'DISPLAY_TOPICS' => 'Display topics from previous',
+ 'DOWNLOAD_ALL' => 'Download all',
+ 'DOWNLOAD_ALL_ATTACHMENTS' => 'Download all attachments',
'DOWNLOADED' => 'Downloaded',
'DOWNLOADING_FILE' => 'Downloading file',
'DOWNLOAD_COUNTS' => array(