aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 17:03:51 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 17:03:51 +0000
commit73ed4ae8513af1cc6e795b125cc1f319a965bfb4 (patch)
tree86681c6baee8869faab58940588251be692dd9e4 /languages
parentc41553d5e532ca86070d511d50d150d97869bb84 (diff)
downloadelgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.gz
elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.bz2
Merged Cash's bugfixes from the 1.7 branch (3288:5377).
git-svn-id: http://code.elgg.org/elgg/trunk@5378 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/languages/en.php b/languages/en.php
index 7a00852ac..a84000039 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,6 +1,6 @@
<?php
/**
- * Core English Lange
+ * Core English Language
*
* @package ElggLanguage
* @subpackage Core
@@ -91,7 +91,7 @@ $english = array(
'ImportException:NotAllImported' => "Not all elements were imported.",
'InvalidParameterException:UnrecognisedFileMode' => "Unrecognised file mode '%s'",
- 'InvalidParameterException:MissingOwner' => "File %s (%d) is missing an owner!",
+ 'InvalidParameterException:MissingOwner' => "File %s (file guid:%d) (owner guid:%d) is missing an owner!",
'IOException:CouldNotMake' => "Could not make %s",
'IOException:MissingFileName' => "You must specify a name before opening a file.",
'ClassNotFoundException:NotFoundNotSavedWithFile' => "Filestore not found or class not saved with file!",
@@ -757,9 +757,9 @@ Alternatively, you can enter your database settings below and we will try and do
'installation:viewpathcache:description' => "The view filepath cache decreases the loading times of plugins by caching the location of their views.",
'installation:viewpathcache:label' => "Use view filepath cache (recommended)",
- 'upgrading' => 'Upgrading',
+ 'upgrading' => 'Upgrading...',
'upgrade:db' => 'Your database was upgraded.',
- 'upgrade:core' => 'Your elgg installation was upgraded',
+ 'upgrade:core' => 'Your elgg installation was upgraded.',
/**
* Welcome