aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/languages/en.php b/languages/en.php
index cbe229c26..7649bcbc3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -344,8 +344,6 @@ $english = array(
'friends:collections:members' => "Collection members",
'friends:collections:edit' => "Edit collection",
- 'river:friend:user:default' => "%s is now a friend with %s",
-
'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
'avatar' => 'Avatar',
@@ -377,7 +375,7 @@ $english = array(
'profile:twitter' => "Twitter username",
'profile:saved' => "Your profile was successfully saved.",
- 'admin:appearance:profile_fields' => 'Edit profile fields',
+ 'admin:appearance:profile_fields' => 'Edit Profile Fields',
'profile:edit:default' => 'Edit profile fields',
'profile:label' => "Profile label",
'profile:type' => "Profile type",
@@ -385,7 +383,7 @@ $english = array(
'profile:editdefault:delete:success' => 'Default profile item deleted!',
'profile:defaultprofile:reset' => 'Default system profile reset',
'profile:resetdefault' => 'Reset default profile',
- 'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will loose any information already entered into custom fields on profile pages.",
+ 'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will lose any information already entered into custom fields on profile pages.",
'profile:editdefault:success' => 'Item successfully added to default profile',
'profile:editdefault:fail' => 'Default profile could not be saved',
@@ -406,6 +404,8 @@ $english = array(
*/
'river' => "River",
'river:relationship:friend' => 'is now friends with',
+ 'friends:river:add' => "is now a friend with %s",
+ 'profile:river:iconupdate' => 'updated their profile icon',
'river:noaccess' => 'You do not have permission to view this item.',
'river:posted:generic' => '%s posted',
'riveritem:single:user' => 'a user',
@@ -594,6 +594,8 @@ $english = array(
'admin:footer:blog' => 'Elgg Blog',
'admin:plugins:category:all' => 'All plugins',
+ 'admin:plugins:category:active' => 'Active plugins',
+ 'admin:plugins:category:inactive' => 'Inactive plugins',
'admin:plugins:category:admin' => 'Admin',
'admin:plugins:category:bundled' => 'Bundled',
'admin:plugins:category:content' => 'Content',
@@ -607,6 +609,10 @@ $english = array(
'admin:plugins:category:theme' => 'Themes',
'admin:plugins:category:widget' => 'Widgets',
+ 'admin:plugins:sort:priority' => 'Priority',
+ 'admin:plugins:sort:alpha' => 'Alphabetical',
+ 'admin:plugins:sort:date' => 'Newest',
+
'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
'admin:plugins:markdown:unknown_file' => 'Unknown file.',
@@ -715,7 +721,7 @@ $english = array(
'admin:appearance:default_widgets' => 'Default Widgets',
'admin:default_widgets:unknown_type' => 'Unknown widget type',
'admin:default_widgets:instructions' => 'Add, remove, position, and configure default widgets for the selected widget page.'
- . ' These changes will apply only to new content on the site.',
+ . ' These changes will only affect new users on the site.',
/**
* User settings
@@ -769,6 +775,7 @@ $english = array(
'cancel' => "Cancel",
'saving' => "Saving ...",
'update' => "Update",
+ 'preview' => "Preview",
'edit' => "Edit",
'delete' => "Delete",
'accept' => "Accept",