Merge branch 'next' into wot-integration

[Sone.git] / src / main / resources / i18n / sone.en.properties

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 7d9d401..53e69e2 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -20,6 +20,16 @@ Navigation.Menu.Item.Options.Name=Options
 Navigation.Menu.Item.Options.Tooltip=Options for the Sone plugin
 Navigation.Menu.Item.About.Name=About
 Navigation.Menu.Item.About.Tooltip=Information about Sone
+Navigation.Menu.Item.Help.Name=Help
+Navigation.Menu.Item.Help.Tooltip=The Sone User Manual
+
+Page.Help.Title=Help - Sone
+Page.Help.Page.Title=The Sone User Manual
+Page.Help.Text.Introduction=Though Sone aims to be very easy to use there probably are a couple of functions that need to be explained.
+Page.Help.Topic.Blocking.Title=What is “blocking?”
+Page.Help.Topic.Blocking.Text=“Blocking a Sone” means to exclude it from the current Sone distribution method. Every time your Sone is updated, a list of all Sones you know is distributed as well—unless you block or blacklist a Sone.
+Page.Help.Topic.Blacklisting.Title=What is the difference between “blocking” and “blacklisting?”
+Page.Help.Topic.Blacklisting.Text=Blocking a Sone is only possible when you are logged in to a Sone so you can choose to not distribute somebody else’s Sone per Sone. Blacklisting works globally—a blacklisted Sone will not be distributed by any Sone on your node, starting with the next update of each Sone. A blacklisted Sone will also not appear in your “Known Sones” anymore, it will only be shown on the “Blacklist” page.
 
 Page.About.Title=About - Sone
 Page.About.Page.Title=About
@@ -135,10 +145,6 @@ Page.ViewSone.FollowSone.Text=Follow this Sone
 Page.ViewSone.Following.Title=This Sone follows
 Page.ViewSone.Following.FollowingNone.Text=Apparently, this Sone does not yet follow any other Sone.
 
-Page.BlockSone.Title=Block Sone - Sone
-
-Page.UnblockSone.Title=Block Sone - Sone
-
 Page.ViewPost.Title=View Post - Sone
 Page.ViewPost.Page.Title=View Post by {sone}
 Page.ViewPost.Button.PostReply=Post Reply!
@@ -172,8 +178,6 @@ Page.Tail.Text.KeyOfSone=Key of this Sone (give this to other people):
 View.Sone.Label.LastUpdate=Last update:
 View.Sone.Button.UnfollowSone=unfollow
 View.Sone.Button.FollowSone=follow
-View.Sone.Button.UnblockSone=unblock
-View.Sone.Button.BlockSone=block
 View.Sone.Status.Modified=This Sone was modified and waits to be inserted.
 View.Sone.Status.Unknown=This Sone has not yet been retrieved.
 View.Sone.Status.Idle=This Sone is idle, i.e. not being inserted or downloaded.