Refs #2680: First pass at porting the 1.7 bookmarks to 1.8. Functional, but code is still messy.

git-svn-id: http://code.elgg.org/elgg/trunk@7998 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 29 insertions, 40 deletions

diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 6e0ebc8f1..91f07d69b 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -5,69 +5,60 @@ $english = array(
 	/**
 	 * Menu items and titles
 	 */
-
 	'bookmarks' => "Bookmarks",
-	'bookmarks:add' => "Bookmark something",
-	'bookmarks:read' => "Bookmark list",
+	'bookmarks:add' => "Add bookmark",
+	'bookmarks:owner' => "%s's bookmarks",
 	'bookmarks:friends' => "Friends' bookmarks",
-	'bookmarks:all' => "All site bookmarks",
-	'bookmarks:user' => "%s's bookmarks",
-	'bookmarks:group' => "Group bookmarks",
+	'bookmarks:everyone' => "All site bookmarks",
 	'bookmarks:this' => "Bookmark this",
-	'bookmarks:ingroup' => "in the group",
 	'bookmarks:this:group' => "Bookmark in %s",
 	'bookmarks:bookmarklet' => "Get bookmarklet",
-	'bookmarks:bookmarklet:group' => "Get community bookmarklet",
-	'bookmarks:browser_bookmarklet' => 'Browser Bookmarklet',
+	'bookmarks:bookmarklet:group' => "Get group bookmarklet",
 	'bookmarks:inbox' => "Bookmarks inbox",
-	'bookmarks:more' => "View note",
-	'bookmarks:yours' => "My bookmarks",
+	'bookmarks:morebookmarks' => "More bookmarks",
+	'bookmarks:more' => "More",
 	'bookmarks:shareditem' => "Bookmarked item",
 	'bookmarks:with' => "Share with",
-	'bookmarks:new' => "Add a Bookmark",
+	'bookmarks:new' => "A new bookmarked item",
 	'bookmarks:via' => "via bookmarks",
 	'bookmarks:address' => "Address of the resource to bookmark",
-	'bookmarks:addnote' => "Add a note",
+	'bookmarks:none' => 'No bookmarks',
+
 	'bookmarks:delete:confirm' => "Are you sure you want to delete this resource?",
-	'bookmarks:url' => 'URL',
+
 	'bookmarks:numbertodisplay' => 'Number of bookmarked items to display',
-	'bookmarks:edit:success' => "Bookmark successfully edited",
-	'bookmarks:edit:fail' => "There was a problem editing that bookmark, please try again.",
+
 	'bookmarks:shared' => "Bookmarked",
 	'bookmarks:visit' => "Visit resource",
 	'bookmarks:recent' => "Recent bookmarks",
-	'bookmarks:stats' => "Bookmark stats",
-	'bookmarks:resources' => "resources bookmarked",
-	'bookmarks:river:create' => 'bookmarked',
+
+	'bookmarks:river:created' => '%s bookmarked',
+	'bookmarks:river:annotate' => 'a comment on this bookmarked item',
+	'bookmarks:river:item' => 'an item',
 
 	'item:object:bookmarks' => 'Bookmarked items',
 
-	'bookmarks:enablebookmarks' => 'Enable group bookmarks',
-	'bookmarks:referenceadded' => 'You have added that bookmark as a reference',
-	'bookmarks:referenceerror' => 'There was a problem adding that bookmark as a reference',
-	'bookmarks:none' => 'You don\'t have any bookmarks',
-	'bookmarks:addref' => 'Add a reference',
-	'bookmarks:removed' => 'You have now removed that reference',
-	'bookmarks:removederror' => ' There was a problem removing that reference',
-	'bookmarks:remove:confirm' => 'Are you sure you want to remove this reference?',
+	'bookmarks:group' => 'Group bookmarks',
+	'groups:enablebookmarks' => 'Enable group bookmarks',
+	'bookmarks:nogroup' => 'This group does not have any bookmarks yet',
+	'bookmarks:more' => 'More bookmarks',
+
+	'bookmarks:no_title' => 'No title',
 
 	/**
-	 * More text
+	 * Widget and bookmarklet
 	 */
-
 	'bookmarks:widget:description' =>
-		"This widget displays your latest bookmarks.",
+			"This widget displays your latest bookmarks.",
 
 	'bookmarks:bookmarklet:description' =>
-		"The bookmarklet allows you to share a url with your friends, or just bookmark it for yourself. To use it, simply drag the button above to your browser's links bar.",
+			"The bookmarks bookmarklet allows you to share any resource you find on the web with your friends, or just bookmark it for yourself. To use it, simply drag the following button to your browser's links bar:",
 
-		'bookmarks:bookmarklet:descriptionie' =>
-		"If you are using Internet Explorer, you will need to right click on the bookmarklet icon, and select 'add to favorites', and then the Links bar.",
+	'bookmarks:bookmarklet:descriptionie' =>
+			"If you are using Internet Explorer, you will need to right click on the bookmarklet icon, select 'add to favorites', and then the Links bar.",
 
 	'bookmarks:bookmarklet:description:conclusion' =>
-		"You can then bookmark any webpage you visit by clicking the button in your browsers toolbar.",
-
-	'bookmarks:no_title' => 'No title',
+			"You can then save any page you visit by clicking it at any time.",
 
 	/**
 	 * Status messages
@@ -81,9 +72,7 @@ $english = array(
 	 */
 
 	'bookmarks:save:failed' => "Your bookmarked item could not be saved. Make sure you've entered a title and address and then try again.",
-	'bookmarks:delete:failed' => "Your bookmarked item could not be deleted.",
-
-
+	'bookmarks:delete:failed' => "Your bookmarked item could not be deleted. Please try again.",
 );
 
-add_translation("en", $english);
\ No newline at end of file
+add_translation('en', $english);
\ No newline at end of file