aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-04-18 19:54:17 -0400
committerBrett Profitt <brett.profitt@gmail.com>2011-04-18 19:54:17 -0400
commit0d9c5c1ccd66018a819b4ca327ab203f473e35dc (patch)
treef55e5caa8bf8036b02fc553eecd2b615791d2ce5 /languages
parentca63a6b81eee1dfbee99a393a790402475a4612c (diff)
parentd928588805375e7190ab393e2def555b39701a27 (diff)
downloadelgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.gz
elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php
index 86fa9c7e7..6e24edb2d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -78,7 +78,7 @@ $english = array(
'ElggPluginPackage:InvalidPlugin:InvalidProvides' => 'Invalid provides type "%s"',
'ElggPluginPackage:InvalidPlugin:CircularDep' => 'Invalid %s dependency "%s" in plugin %s. Plugins cannot conflict with or require something they provide!',
- 'ElggPlugin:Exception:CannotIncludeStart' => 'Cannot include start.php for plugin %s (guid: %s) at %s. Check permissions!',
+ 'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s. Check permissions!',
'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s. Check permissions!',
'ElggPlugin:Exception:CannotRegisterLanguages' => 'Cannot register languages for plugin %s (guid: %s) at %s. Check permissions!',
'ElggPlugin:Exception:CannotRegisterClasses' => 'Cannot register classes for plugin %s (guid: %s) at %s. Check permissions!',
@@ -579,7 +579,7 @@ $english = array(
'This page is the Admin Dashboard and provides a quick overview of your system. '
. "You can <a class=\"elgg-toggler\" href=\"#widgets-add-panel\">add</a>"
. " and rearrange widgets to show the information you care about. The menu to the right is oranganized into"
-. " three areas:
+. " three areas:
<ul>
<li>Administer - Everyday tasks like monitoring reported content, checking online users, and viewing logs.</li>
<li>Configure - Configuration settings likes the site name, the active plugins, and plugin settings.</li>
@@ -597,7 +597,7 @@ $english = array(
. " <a href=\"http://docs.elgg.org/wiki/Category:Administration_FAQ\">FAQs</a>, <a href=\"http://docs.elgg.org/wiki/Administration_Manual\">"
. "manuals</a>, <a href=\"http://blog.elgg.org/\">Elgg news</a>, and <a href=\"http://community.elgg.org/pg/groups/world/\">support forums</a>"
. " at the <a href=\"http://community.elgg.org/\">Elgg Community</a>.",
-
+
'admin:widget:admin_welcome:outro' => 'Thank you for using Elgg!',
'admin:footer:faq' => 'Administration FAQ',