diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:44:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:44:11 +0100 |
| commit | 03be94c1f7ca62adf59700584c944966560a31bd (patch) | |
| tree | 1b2701186552f6ed8445a1c6e1937943c7e24a44 /phpBB/language/en/common.php | |
| parent | 0da910df949a1e9404a19ec22a7f7a2af48e69f7 (diff) | |
| parent | 3d93fd40edb627dafeede3b5ae3780885e2264fe (diff) | |
| download | forums-03be94c1f7ca62adf59700584c944966560a31bd.tar forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.gz forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.bz2 forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.xz forums-03be94c1f7ca62adf59700584c944966560a31bd.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index c66f728c06..0cc4decb40 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -341,6 +341,7 @@ $lang = array_merge($lang, array( 'INTERESTS' => 'Interests', 'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge.', 'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?', + 'INVALID_FEED_ATTACHMENTS' => 'The selected feed tried fetching attachments with invalid constraints.', 'INVALID_PLURAL_RULE' => 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.', 'IP' => 'IP', 'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.', |