diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
| commit | c56db535b4f0c943777ab159c14729d724f5d232 (patch) | |
| tree | 56a63ae78f97a990d3ca1512c5333aebd467895a /phpBB/language/en/common.php | |
| parent | 11aff559d4fcde5c2935aa6ebdfcfbe162d91f64 (diff) | |
| parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
| download | forums-c56db535b4f0c943777ab159c14729d724f5d232.tar forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.gz forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.bz2 forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.xz forums-c56db535b4f0c943777ab159c14729d724f5d232.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f064dd43ac..6c723a5060 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -119,6 +119,17 @@ $lang = array_merge($lang, array( 1 => 'Users browsing this forum: %2$s and %1$d guest', 2 => 'Users browsing this forum: %2$s and %1$d guests', ), + 'BUTTON_EDIT' => 'Edit', + 'BUTTON_FORUM_LOCKED' => 'Locked', + 'BUTTON_NEW_TOPIC' => 'New Topic', + 'BUTTON_PM' => 'PM', + 'BUTTON_PM_FORWARD' => 'Forward', + 'BUTTON_PM_NEW' => 'New PM', + 'BUTTON_PM_REPLY' => 'Send Reply', + 'BUTTON_PM_REPLY_ALL' => 'Reply All', + 'BUTTON_POST_REPLY' => 'Post Reply', + 'BUTTON_QUOTE' => 'Quote', + 'BUTTON_TOPIC_LOCKED' => 'Locked', 'BYTES' => 'Bytes', 'CANCEL' => 'Cancel', |