diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-16 10:29:22 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-16 10:29:22 -0500 |
| commit | 1a2dfa6d4c74a769212aab64f74b0be40dcbc60a (patch) | |
| tree | 1990087a553e52ae07606fdf9eb0629fc80afb64 /phpBB/language/en/common.php | |
| parent | 9c86f70b4a5b34cbd9c2c58fe3d1614671765e15 (diff) | |
| parent | af5d8b502ebf454e058794b8b082f62b4fa4cbe5 (diff) | |
| download | forums-1a2dfa6d4c74a769212aab64f74b0be40dcbc60a.tar forums-1a2dfa6d4c74a769212aab64f74b0be40dcbc60a.tar.gz forums-1a2dfa6d4c74a769212aab64f74b0be40dcbc60a.tar.bz2 forums-1a2dfa6d4c74a769212aab64f74b0be40dcbc60a.tar.xz forums-1a2dfa6d4c74a769212aab64f74b0be40dcbc60a.zip | |
Merge PR #1074 branch 'develop-olympus' into develop
* develop-olympus:
[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/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4300ef431a..7ce3b5d2e6 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -605,9 +605,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', 'TIMEOUT_PROCESSING_REQ' => 'Request timed out.', |