aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-04-29 17:08:49 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-04-29 17:08:49 +0200
commit40351fae96de34312ca960abc5048c835f50e3ef (patch)
tree83adee6a90e348142a19b20a645880f76f162f54 /phpBB/language/en/acp/common.php
parent0b6accf1acd32b08c84906276717b3bdd43335a4 (diff)
parent23b3667978bb9177c8ffb6877904e117a18693fa (diff)
downloadforums-40351fae96de34312ca960abc5048c835f50e3ef.tar
forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.gz
forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.bz2
forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.xz
forums-40351fae96de34312ca960abc5048c835f50e3ef.zip
Merge pull request #2364 from nickvergessen/ticket/12456
[ticket/12456] Missing new lines at the end of file in language files * nickvergessen/ticket/12456: [ticket/12456] Add , after the last array element [ticket/12456] Fix duplicated empty lines in language files [ticket/12456] Fix missing new lines at the end of email templates
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f16dfabd4..64bfb82fd7 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -85,7 +85,6 @@ $lang = array_merge($lang, array(
'ACP_EXTENSION_MANAGEMENT' => 'Extension management',
'ACP_EXTENSIONS' => 'Manage extensions',
-
'ACP_FORUM_BASED_PERMISSIONS' => 'Forum based permissions',
'ACP_FORUM_LOGS' => 'Forum logs',
'ACP_FORUM_MANAGEMENT' => 'Forum management',
@@ -678,7 +677,6 @@ $lang = array_merge($lang, array(
'LOG_PURGE_CACHE' => '<strong>Purged cache</strong>',
'LOG_PURGE_SESSIONS' => '<strong>Purged sessions</strong>',
-
'LOG_RANK_ADDED' => '<strong>Added new rank</strong><br />» %s',
'LOG_RANK_REMOVED' => '<strong>Removed rank</strong><br />» %s',
'LOG_RANK_UPDATED' => '<strong>Updated rank</strong><br />» %s',