diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /lib/common.php | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common.php b/lib/common.php index e72e938f2..34d77c3f6 100644 --- a/lib/common.php +++ b/lib/common.php @@ -151,10 +151,10 @@ try { // XXX: Throw a conniption if database not installed // XXX: Find a way to use htmlwriter for this instead of handcoded markup // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. - echo '<p>'. _('No configuration file found. ') .'</p>'; + echo '<p>'. _('No configuration file found.') .'</p>'; // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. // TRANS: Is followed by a list of directories (separated by HTML breaks). - echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> '; + echo '<p>'. _('I looked for configuration files in the following places:') .'<br /> '; echo implode($e->configFiles, '<br />'); // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>'; |