Merge branch 'release-0.9.7'

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

diff --git a/src/main/resources/i18n/sone.no.properties b/src/main/resources/i18n/sone.no.properties
index 99a950f..5a13696 100644 (file)
--- a/src/main/resources/i18n/sone.no.properties
+++ b/src/main/resources/i18n/sone.no.properties
@@ -52,6 +52,13 @@ Page.Options.Option.ShowAvatars.Followed.Description=Bare vis avatar for Soner d
 Page.Options.Option.ShowAvatars.ManuallyTrusted.Description=Bare vis avatar for Soner du manuelt har gitt en tillit større en 0.
 Page.Options.Option.ShowAvatars.Trusted.Description=Bare vis avatar for Soner som har en tillit større enn 0.
 Page.Options.Option.ShowAvatars.Always.Description=Alltid vis egendefinerte avatarer. Advarsel: Noen avatarer kan inneholde forstyrrende eller provoserende bilder.
+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=Oppførsel ved kjøretid
 Page.Options.Option.InsertionDelay.Description=Antall sekunder Sone-innsetteren skal vente etter en endring av en Sone før den blir innsatt.
 Page.Options.Option.PostsPerPage.Description=Antallet innlegg å vise pr side før side-kontroller blir vist.
@@ -387,18 +394,18 @@ View.Time.InTheFuture=i framtiden
 View.Time.AFewSecondsAgo=noen få sekunder siden
 View.Time.HalfAMinuteAgo=omtrent et halvt minutt siden
 View.Time.AMinuteAgo=omtrent et minutt siden
-View.Time.XMinutesAgo=${min} minutter siden
+View.Time.XMinutesAgo={0} minutter siden
 View.Time.HalfAnHourAgo=en halvtime siden
 View.Time.AnHourAgo=omtrent en time siden
-View.Time.XHoursAgo=${hour} timer siden
+View.Time.XHoursAgo={0} timer siden
 View.Time.ADayAgo=omtrent en dag siden
-View.Time.XDaysAgo=${day} dager siden
+View.Time.XDaysAgo={0} dager siden
 View.Time.AWeekAgo=omtrent en uke siden
-View.Time.XWeeksAgo=${week} uker siden
+View.Time.XWeeksAgo={0} uker siden
 View.Time.AMonthAgo=omtrent en måned siden
-View.Time.XMonthsAgo=${month} måneder siden
+View.Time.XMonthsAgo={0} måneder siden
 View.Time.AYearAgo=omtrent et år siden
-View.Time.XYearsAgo=${year} år siden
+View.Time.XYearsAgo={0} år siden
 
 WebInterface.DefaultText.StatusUpdate=Hva tenker du på?
 WebInterface.DefaultText.Message=Skriv et innlegg…
@@ -464,4 +471,4 @@ Notification.Mention.Text=Du har blitt nevnt i følgende innlegg:
 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.
-# 60, 100, 120-121, 308-310, 312-314, 458, 463-465
+# 55-61, 67, 107, 127-128, 315-317, 319-321, 465, 471-473