diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 23:19:51 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 23:19:51 -0600 |
| commit | 61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e (patch) | |
| tree | 210fe8026aecc70a45d48e52c58ef77d43b85787 /phpBB/language/en/common.php | |
| parent | 570c5ad3c08378f377385aaff7d3810ccb8db3ff (diff) | |
| parent | b453f359ff6dab58b0eaf94548c4e58110fb02ec (diff) | |
| download | forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.gz forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.bz2 forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.tar.xz forums-61aa53f91aaf11bb2fdfac3a9cdc24b074b4463e.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/config/services.yml
phpBB/index.php
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 05187d9def..ef7cc6b941 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -627,9 +627,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.', |