diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 19:19:57 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 19:19:57 -0600 |
| commit | 8e6f9b38fb14cc81ba428fd8a74d23077bb63863 (patch) | |
| tree | a04a860a04bbfbbed6692dce7bd59468522f311e /phpBB/language | |
| parent | 249f3c8885d461ae3981dfd7b62093c2175175e3 (diff) | |
| parent | ffd531e4fd31fee31c6fbd8c94cb6077cd21a82d (diff) | |
| download | forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.gz forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.bz2 forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.xz forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.zip | |
Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103
# By Oleg Pudeyev (42) and others
# Via David King (2) and others
* 'ticket/11103' of github.com:EXreaction/phpbb3: (58 commits)
[ticket/11103] Revert changes to constants.php from my IDE
[ticket/11243] Show download all link on all pages of topic with attachments
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Pass arguments in correct order.
[ticket/10972] Drop user deletion.
[ticket/10972] Tweak user addition.
[ticket/10972] Add destroy method to mock cache.
[ticket/10972] Add mock null cache.
[ticket/10972] Backport get_db from develop.
[ticket/10972] Added explicit checks for creating duplicate users.
[ticket/10972] Moved tests into appropriate places and added comments
[ticket/10972] Added methods for creating and deleting basic users
[feature/template-events] Order extensions in mock extension manager.
[feature/template-events] Changes per imkingdavid's review.
[feature/template-events] Make style names private on template.
[feature/template-events] Test for event that is defined in parent style only.
[feature/template-events] Specify style names, add inheritance tests.
[feature/template-events] Normalize expected directory trees.
[feature/template-events] Allow dataset to be correctly selectable.
[feature/template-events] Dataset for template event testing with inheritance.
...
Diffstat (limited to 'phpBB/language')
| -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 2040fd2951..36ad925a98 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -186,6 +186,8 @@ $lang = array_merge($lang, array( 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', + 'ERR_TEMPLATE_EVENT_LOCATION' => 'The specified template event location <em>[%s]</em> is improperly formatted.', + 'ERR_TEMPLATE_COMPILATION' => 'The file could not be compiled: %s', 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', 'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.', 'ERR_WATCHING' => 'An error occured while trying to subscribe.', |