diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 15:44:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 15:44:17 +0200 |
| commit | 38f05750b73d04b5093e2a7898e5ec576f0d2f30 (patch) | |
| tree | 791dcae56107a50be08d928bda73ea047c1b08af /phpBB/language | |
| parent | cec060bb9b74d5c832fe5c3b0570b76197079c15 (diff) | |
| download | forums-38f05750b73d04b5093e2a7898e5ec576f0d2f30.tar forums-38f05750b73d04b5093e2a7898e5ec576f0d2f30.tar.gz forums-38f05750b73d04b5093e2a7898e5ec576f0d2f30.tar.bz2 forums-38f05750b73d04b5093e2a7898e5ec576f0d2f30.tar.xz forums-38f05750b73d04b5093e2a7898e5ec576f0d2f30.zip | |
[ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/extensions.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
5 files changed, 0 insertions, 7 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', diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index baa7d01763..39881668c4 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -33,7 +33,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine - $lang = array_merge($lang, array( 'EXTENSION' => 'Extension', 'EXTENSIONS' => 'Extensions', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 6e3ba6876a..36af461f87 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -182,7 +182,6 @@ $lang = array_merge($lang, array( 'ROLE_USER_STANDARD' => 'Standard Features', 'ROLE_USER_NEW_MEMBER' => 'Newly Registered User Features', - 'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.', 'ROLE_DESCRIPTION_ADMIN_FULL' => 'Has access to all administrative functions of this board.<br />Not recommended.', 'ROLE_DESCRIPTION_ADMIN_STANDARD' => 'Has access to most administrative features but is not allowed to use server or system related tools.', diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index ea3eadb0dd..b65b6695a6 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -109,8 +109,6 @@ $lang = array_merge($lang, array( 'DISPLAY_POSTING' => 'On posting page', 'DISPLAY_POSTING_NO' => 'Not on posting page', - - 'EDIT_ICONS' => 'Edit icons', 'EDIT_SMILIES' => 'Edit smilies', 'EMOTION' => 'Emotion', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5148589471..535bf78706 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -629,7 +629,6 @@ $lang = array_merge($lang, array( 'TO_ME' => 'to me' ), - 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.', 'GROUP_LEADER' => 'Leaderships', 'GROUP_MEMBER' => 'Memberships', |