aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-12-26 22:10:41 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-12-26 22:10:41 +0100
commit0efbb78afa210becfc855fb99c879d7e308f9d3c (patch)
treecc182f2f56825eb2de77258a839e5dd2724fbb7e
parentfc97c7137d96a11985e9d404f6b716072dd369d9 (diff)
parent296243f34f32e1e811c9cc93d967e774ba2dd2e3 (diff)
downloadforums-0efbb78afa210becfc855fb99c879d7e308f9d3c.tar
forums-0efbb78afa210becfc855fb99c879d7e308f9d3c.tar.gz
forums-0efbb78afa210becfc855fb99c879d7e308f9d3c.tar.bz2
forums-0efbb78afa210becfc855fb99c879d7e308f9d3c.tar.xz
forums-0efbb78afa210becfc855fb99c879d7e308f9d3c.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/language/en/app.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2da0f098c1..39c4065ebd 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -44,5 +44,5 @@ $lang = array_merge($lang, array(
'CONTROLLER_ARGUMENT_VALUE_MISSING' => 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
'CONTROLLER_NOT_SPECIFIED' => 'No controller has been specified.',
'CONTROLLER_METHOD_NOT_SPECIFIED' => 'No method was specified for the controller.',
- 'CONTROLLER_SERVICE_UNDEFINED' => 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
+ 'CONTROLLER_SERVICE_UNDEFINED' => 'The service for controller “<strong>%s</strong>” is not defined in ./config/services.yml.',
));