diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
commit | b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3 (patch) | |
tree | f63f4f3e93bad7611f4b5651171fc5122ec65455 /lib/common.php | |
parent | 3b6f738ab73b7f77dd09ac21dd9446876776fc04 (diff) | |
parent | ca489631db840e33757a71a7e4cb56b187c182d3 (diff) |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
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 0d60657a3..ca02a3e7f 100644 --- a/lib/common.php +++ b/lib/common.php @@ -33,10 +33,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>'; |