diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-18 10:33:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-18 10:33:05 +0200 |
| commit | b17fc9804391760e369eda7893ccba2b522ddef8 (patch) | |
| tree | 6eac3dff6854f073bf4fe1a1afbb18cf34e6282e /phpBB/language/en/common.php | |
| parent | 9781a55711016b320a7a18c3de0c3a049702cdfb (diff) | |
| parent | 9ccb596a06f72a6e172d6d421754b636cbbb41d5 (diff) | |
| download | forums-b17fc9804391760e369eda7893ccba2b522ddef8.tar forums-b17fc9804391760e369eda7893ccba2b522ddef8.tar.gz forums-b17fc9804391760e369eda7893ccba2b522ddef8.tar.bz2 forums-b17fc9804391760e369eda7893ccba2b522ddef8.tar.xz forums-b17fc9804391760e369eda7893ccba2b522ddef8.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/memberlist_body.html
phpBB/styles/subsilver2/template/memberlist_team.html
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 20458dd3c1..f6b9bce58b 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -333,6 +333,7 @@ $lang = array_merge($lang, array( 'IMAGE_FILETYPE_INVALID' => 'Image file type %d for mimetype %s not supported.', 'IMAGE_FILETYPE_MISMATCH' => 'Image file type mismatch: expected extension %1$s but extension %2$s given.', 'IN' => 'in', + 'INACTIVE' => 'Inactive', 'INDEX' => 'Index page', 'INFORMATION' => 'Information', 'INSECURE_REDIRECT' => 'Tried to redirect to potentially insecure url.', |