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

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

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 365c9b01a9c6ef6e8c0d1f2d284c1ccb9ff80bf9..6c95a901abf41f1989a9760f88e24ffb2a48186a 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -29,6 +29,7 @@
 # Author: Oyvind
 # Author: SuperPotato
 # Author: The real emj
 # Author: Oyvind
 # Author: SuperPotato
 # Author: The real emj

+# Author: Yupik

 # Author: 6400
 ---
 nb:
 # Author: 6400
 ---
 nb:


@@ -1744,6 +1745,7 @@ nb:
         contributors_cz_czechia: Tsjekkia
         contributors_fi_finland: Finland
         contributors_fr_france: Frankrike
         contributors_cz_czechia: Tsjekkia
         contributors_fi_finland: Finland
         contributors_fr_france: Frankrike

+        contributors_hr_croatia: Kroatia

         contributors_nl_netherlands: Nederland
         contributors_nz_new_zealand: New Zealand
         contributors_rs_serbia: Serbia
         contributors_nl_netherlands: Nederland
         contributors_nz_new_zealand: New Zealand
         contributors_rs_serbia: Serbia


@@ -2369,7 +2371,6 @@ nb:
       revoke: Tilbakekall!
       confirm: Er du sikker?
       reason: 'Årsak for blokkering:'
       revoke: Tilbakekall!
       confirm: Er du sikker?
       reason: 'Årsak for blokkering:'

-      back: Vis alle blokkeringer

       revoker: 'Tilbakekaller:'
       needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
     block:
       revoker: 'Tilbakekaller:'
       needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
     block: