🔀 Merge “release/v81” into “master”

[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 380059b..4376025 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -274,12 +274,6 @@ Page.DeleteAlbum.Text.AlbumWillBeGone=This will remove your album “{title}”.
 Page.DeleteAlbum.Button.Yes=Yes, delete album.
 Page.DeleteAlbum.Button.No=No, don’t delete album.
 
-Page.Trust.Title=Trust Sone - Sone
-
-Page.Distrust.Title=Distrust Sone - Sone
-
-Page.Untrust.Title=Untrust Sone - Sone
-
 Page.MarkAsKnown.Title=Mark as Known - Sone
 
 Page.Bookmark.Title=Bookmark - Sone
@@ -382,10 +376,6 @@ View.Post.ShowLess=show less
 
 View.UpdateStatus.Text.ChooseSenderIdentity=Choose the sender identity
 
-View.Trust.Tooltip.Trust=Trust this person
-View.Trust.Tooltip.Distrust=Assign negative trust to this person
-View.Trust.Tooltip.Untrust=Remove your trust assignment for this person
-
 View.CreateAlbum.Title=Create Album
 View.CreateAlbum.Label.Name=Name:
 View.CreateAlbum.Label.Description=Description:
@@ -436,9 +426,6 @@ WebInterface.DefaultText.Option.PostsPerPage=Number of posts to show on a page
 WebInterface.DefaultText.Option.ImagesPerPage=Number of images to show on a page
 WebInterface.DefaultText.Option.CharactersPerPost=Number of characters a post must have to be shortened
 WebInterface.DefaultText.Option.PostCutOffLength=Number of characters for the snippet of the shortened post
-WebInterface.DefaultText.Option.PositiveTrust=The positive trust to assign
-WebInterface.DefaultText.Option.NegativeTrust=The negative trust to assign
-WebInterface.DefaultText.Option.TrustComment=The comment to set in the web of trust
 WebInterface.Button.Comment=Comment
 WebInterface.Confirmation.DeletePostButton=Yes, delete!
 WebInterface.Confirmation.DeleteReplyButton=Yes, delete!
@@ -476,3 +463,4 @@ Notification.Mention.Text=You have been mentioned in the following posts:
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
+Notification.SoneLockedOnStartup.Text=Versions prior to v81 had a bug that resulted in empty Sones. To prevent buggy Sones from being inserted they have automatically been locked. Please check your Sones, use the Rescue Mode if necessary, and unlock your Sones once you are satisfied with the results. Locked Sones are: