diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
| commit | 7d6b289671c51694f17dd5f9849abf2534b55e59 (patch) | |
| tree | 5a7a841cdacae65ea59ab965dd9d718e9e62085e /phpBB/language/en | |
| parent | 714fafe106a1b30d299f2e29588c0d73d6ec44b5 (diff) | |
| parent | 21639d5d5481ac5457e3b38bb848671f8be7b07b (diff) | |
| download | forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.gz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.bz2 forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.xz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10607] Added 'Powered by' translation string.
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
Diffstat (limited to 'phpBB/language/en')
| -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 b92b915623..1d489df403 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -482,6 +482,7 @@ $lang = array_merge($lang, array( 'POST_TIME' => 'Post time', 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED' => 'Post awaiting approval:', + 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination 'PREVIOUS_STEP' => 'Previous', |