Merge branch 'release-0.9.7'

[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 ae57376..7b62cf1 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -52,6 +52,13 @@ Page.Options.Option.ShowAvatars.Followed.Description=Only show avatars for Sones
 Page.Options.Option.ShowAvatars.ManuallyTrusted.Description=Only show avatars for Sones that you have manually assigned a trust value larger than 0 to.
 Page.Options.Option.ShowAvatars.Trusted.Description=Only show avatars for Sones that have a trust value larger than 0.
 Page.Options.Option.ShowAvatars.Always.Description=Always show custom avatars. Be warned: some avatars might contain disturbing or offensive imagery.
+Page.Options.Section.LoadLinkedImagesOptions.Title=Load Linked Images
+Page.Options.Option.LoadLinkedImages.Description=Sone can automatically try to load images that are linked to in posts and replies. This will only ever load images from Freenet, never from the internet!
+Page.Options.Option.LoadLinkedImages.Never.Description=Never load linked images.
+Page.Options.Option.LoadLinkedImages.Followed.Description=Only load images linked from Sones that you follow.
+Page.Options.Option.LoadLinkedImages.ManuallyTrusted.Description=Only load images linked from Sones that you have manually assigned a trust value larger than 0 to.
+Page.Options.Option.LoadLinkedImages.Trusted.Description=Only load images linked from Sones that have a trust value larger than 0.
+Page.Options.Option.LoadLinkedImages.Always.Description=Always load linked images. Be warned: some images might be disturbing or considered offensive.
 Page.Options.Section.RuntimeOptions.Title=Runtime Behaviour
 Page.Options.Option.InsertionDelay.Description=The number of seconds the Sone inserter waits after a modification of a Sone before it is being inserted.
 Page.Options.Option.PostsPerPage.Description=The number of posts to display on a page before pagination controls are being shown.
@@ -387,18 +394,18 @@ View.Time.InTheFuture=in the future
 View.Time.AFewSecondsAgo=a few seconds ago
 View.Time.HalfAMinuteAgo=about half a minute ago
 View.Time.AMinuteAgo=about a minute ago
-View.Time.XMinutesAgo=${min} minutes ago
+View.Time.XMinutesAgo={0} minutes ago
 View.Time.HalfAnHourAgo=half an hour ago
 View.Time.AnHourAgo=about an hour ago
-View.Time.XHoursAgo=${hour} hours ago
+View.Time.XHoursAgo={0} hours ago
 View.Time.ADayAgo=about a day ago
-View.Time.XDaysAgo=${day} days ago
+View.Time.XDaysAgo={0} days ago
 View.Time.AWeekAgo=about a week ago
-View.Time.XWeeksAgo=${week} weeks ago
+View.Time.XWeeksAgo={0} weeks ago
 View.Time.AMonthAgo=about a month ago
-View.Time.XMonthsAgo=${month} months ago
+View.Time.XMonthsAgo={0} months ago
 View.Time.AYearAgo=about a year ago
-View.Time.XYearsAgo=${year} years ago
+View.Time.XYearsAgo={0} years ago
 
 WebInterface.DefaultText.StatusUpdate=What’s on your mind?
 WebInterface.DefaultText.Message=Write a Message…