Merge remote-tracking branch 'upstream/pull/2293'

[rails.git] / config / locales / nn.yml

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 39556dcd7367817e90045c429b09b89a0725f0f5..937c8bba4dc4f0347f133c829073594878a1a654 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -355,7 +355,6 @@ nn:
       post: Post
       when: Når
       comment: Kommentar
-      ago: '%{ago} sidan'
       newer_comments: Nyare kommentarar
       older_comments: Eldre kommentarar
   geocoder:
@@ -1473,7 +1472,6 @@ nn:
     trace:
       pending: VENTAR
       count_points: '%{count} punkt'
-      ago: '%{time_in_words_ago} sidan'
       more: meir
       trace_details: Vis detaljar for spor
       view_map: Vis kart
@@ -1749,11 +1747,9 @@ nn:
       remove as friend: Fjern ven
       add as friend: Legg til ven
       mapper since: 'Brukar sidan:'
-      ago: (%{time_in_words_ago} sidan)
       ct status: 'Bidragsytarvilkår:'
       ct undecided: Usikker
       ct declined: Avslått
-      ct accepted: Akseptert %{ago} sidan
       latest edit: 'Siste redigering %{ago}:'
       email address: 'E-postadresse:'
       created from: 'Oppretta frå:'
@@ -2015,10 +2011,7 @@ nn:
     show:
       title: '%{block_on} blokkert av %{block_by}'
       heading: '%{block_on} blokkert av %{block_by}'
-      time_future: Sluttar om %{time}
-      time_past: Slutta %{time} sidan
       created: Oppretta
-      ago: '%{time} sidan'
       status: Status
       show: Vis
       edit: Rediger
@@ -2051,7 +2044,6 @@ nn:
       description: Skildring
       created_at: Oppretta den
       last_changed: Sist endra
-      ago_html: '%{when} sidan'
   javascripts:
     close: Lat att
     share: