aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2010-01-25 15:57:10 +0000
committerJoas Schilling <nickvergessen@gmx.de>2010-01-25 15:57:10 +0000
commit7a1b507fa65bc7554ee4d65fae687a80bb8aea66 (patch)
tree7991e9a7257c1c2081202c0fca55a49ec64e2d46 /phpBB/language
parentc5e01c9508068a19948ef17826290a68ab75bde6 (diff)
downloadforums-7a1b507fa65bc7554ee4d65fae687a80bb8aea66.tar
forums-7a1b507fa65bc7554ee4d65fae687a80bb8aea66.tar.gz
forums-7a1b507fa65bc7554ee4d65fae687a80bb8aea66.tar.bz2
forums-7a1b507fa65bc7554ee4d65fae687a80bb8aea66.tar.xz
forums-7a1b507fa65bc7554ee4d65fae687a80bb8aea66.zip
Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.
Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php1
-rw-r--r--phpBB/language/en/common.php1
2 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 94188f4b1b..77f388c8a4 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -267,7 +267,6 @@ $lang = array_merge($lang, array(
'PARSE_URLS' => 'Parse links',
'PERMISSIONS_TRANSFERRED' => 'Permissions transferred',
'PERMISSIONS_TRANSFERRED_EXPLAIN' => 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
- 'PIXEL' => 'px',
'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
'REMIND' => 'Remind',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 75aeb90855..821896f32a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -417,6 +417,7 @@ $lang = array_merge($lang, array(
'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
'PASSWORD' => 'Password',
+ 'PIXEL' => 'px',
'PLAY_QUICKTIME_FILE' => 'Play Quicktime file',
'PM' => 'PM',
'POSTING_MESSAGE' => 'Posting message in %s',