aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-16 10:25:06 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-16 10:25:06 -0500
commitaf5d8b502ebf454e058794b8b082f62b4fa4cbe5 (patch)
tree18877ee8661589c560bef8f66b9a3433d7c82d3b /phpBB/language/en
parent17a7c4821aa9fb83e8addfd4f32cd8dfdc9d89fc (diff)
parent8851f9589a5295d569316e76b366f1b16f1a9a96 (diff)
downloadforums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar
forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.gz
forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.bz2
forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.xz
forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.zip
Merge PR #1074 branch 'bantu/ticket/11192' into develop-olympus
* bantu/ticket/11192: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 0184dd083b..844d5ef3ef 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -568,9 +568,11 @@ $lang = array_merge($lang, array(
'SUBJECT' => 'Subject',
'SUBMIT' => 'Submit',
+ 'TB' => 'TB',
'TERMS_USE' => 'Terms of use',
'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team',
+ 'TIB' => 'TiB',
'TIME' => 'Time',
'TOO_LARGE' => 'The value you entered is too large.',