🔀 Merge “release/v81” into “master”

[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 dfb49bb..9ddb54d 100644 (file)
--- a/src/main/resources/i18n/sone.no.properties
+++ b/src/main/resources/i18n/sone.no.properties
@@ -26,6 +26,8 @@ Navigation.Menu.Sone.Item.Rescue.Name=Redder
 Navigation.Menu.Sone.Item.Rescue.Tooltip=Redd Sone
 Navigation.Menu.Sone.Item.About.Name=Om
 Navigation.Menu.Sone.Item.About.Tooltip=Informasjon om Sone
+Navigation.Menu.Sone.Item.Metrics.Name=Metrics
+Navigation.Menu.Sone.Item.Metrics.Tooltip=Metrics collected by Sone
 
 Page.About.Title=Om - Sone
 Page.About.Page.Title=Om
@@ -88,10 +90,10 @@ Page.Login.CreateSone.Title=Lag Sone
 Page.CreateSone.Title=Lag sone - Sone
 
 Page.DeleteSone.Title=Slett Sonen - Sone
-Page.DeleteSone.Button.No=Nei, ikke slett.
-Page.DeleteSone.Button.Yes=Ja, slett.
-Page.DeleteSone.Page.Description=Dette vil ikke slette Sonen fra Freenet (Fordi det er umulig), det vil bare koble fra ditt 'Web Of Trust'-pseudonym fra Sone.
 Page.DeleteSone.Page.Title=Slette Sonen «{sone}»?
+Page.DeleteSone.Page.Description=Dette vil ikke slette Sonen fra Freenet (Fordi det er umulig), det vil bare koble fra ditt 'Web Of Trust'-pseudonym fra Sone.
+Page.DeleteSone.Button.Yes=Ja, slett.
+Page.DeleteSone.Button.No=Nei, ikke slett.
 
 Page.Index.Title=Din Sone - Sone
 Page.Index.Label.Text=Innleggstekst:
@@ -379,9 +381,9 @@ View.CreateAlbum.Label.Name=Navn:
 View.CreateAlbum.Label.Description=Beskrivelse:
 
 View.UploadImage.Title=Last opp bilde
-View.UploadImage.Button.UploadImage=Last opp bilde
-View.UploadImage.Label.Description=Beskrivelse:
 View.UploadImage.Label.Title=Tittel:
+View.UploadImage.Label.Description=Beskrivelse:
+View.UploadImage.Button.UploadImage=Last opp bilde
 
 View.Time.InTheFuture=i framtiden
 View.Time.AFewSecondsAgo=noen få sekunder siden
@@ -416,10 +418,10 @@ WebInterface.DefaultText.CreateAlbum.Name=Album tittel
 WebInterface.DefaultText.CreateAlbum.Description=Album beskrivelse
 WebInterface.DefaultText.EditAlbum.Title=Albumtittel
 WebInterface.DefaultText.EditAlbum.Description=Albumbeskrivelse
-WebInterface.DefaultText.UploadImage.Description=Bildebeskrivelse
 WebInterface.DefaultText.UploadImage.Title=Bildetittel
-WebInterface.DefaultText.EditImage.Description=Bildebeskrivelse
+WebInterface.DefaultText.UploadImage.Description=Bildebeskrivelse
 WebInterface.DefaultText.EditImage.Title=Bildetittel
+WebInterface.DefaultText.EditImage.Description=Bildebeskrivelse
 WebInterface.DefaultText.Option.PostsPerPage=Antall innlegg å vise på en side
 WebInterface.DefaultText.Option.ImagesPerPage=Antall bilder å vise per side
 WebInterface.DefaultText.Option.CharactersPerPost=Antall tegn et innlegg må ha for å bli skjult.
@@ -461,5 +463,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.
-Notification.SoneLockedOnStartup.Text=Some Sones were locked on startup because they don’t contain anything. Versions prior to v81 had a bug that resulted in empty Sones. To prevent buggy Sones from being inserted they have been automatically 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:
-# 55-61, 67, 103, 123-124, 305-307, 309-311, 324–328, 360, 455, 461-464
+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: