about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/no.json
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-28 00:30:47 +0100
committerGitHub <noreply@github.com>2019-03-28 00:30:47 +0100
commit683013756e9c57dd1944856dd154dba1be4097b9 (patch)
treeba202f5f1b9050bbe0a8e7ff146e0a47ff5a2482 /app/javascript/mastodon/locales/no.json
parente86663b1da9c31b57baf244effb94c063e10a424 (diff)
Revert locales touched by automated translations (#10399)
* Revert ruined translations

Regression from #10362

* yarn manage:translations
Diffstat (limited to 'app/javascript/mastodon/locales/no.json')
-rw-r--r--app/javascript/mastodon/locales/no.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 8b6fbd018..9556c5ad8 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -5,7 +5,6 @@
   "account.block_domain": "Skjul alt fra {domain}",
   "account.blocked": "Blocked",
   "account.direct": "Direct Message @{name}",
-  "account.disclaimer_full": "Informasjonen nedenfor kan gi et ufullstendig bilde av brukerens profil.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Rediger profil",
   "account.endorse": "Feature on profile",
@@ -36,7 +35,6 @@
   "account.unfollow": "Avfølg",
   "account.unmute": "Avdemp @{name}",
   "account.unmute_notifications": "Vis varsler fra @{name}",
-  "account.view_full_profile": "Vis hele profilen",
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
@@ -85,6 +83,7 @@
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Innholdsadvarsel",
   "confirmation_modal.cancel": "Avbryt",
+  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Blokkèr",
   "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
   "confirmations.delete.confirm": "Slett",