diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
tree | 2476b65436959dda09871ee96edca53b53201b96 /config/locales/da.yml | |
parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'config/locales/da.yml')
-rw-r--r-- | config/locales/da.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/da.yml b/config/locales/da.yml index 0cd3e78f7..d9ce9d55d 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -48,6 +48,7 @@ da: other: Følgere following: Følger joined: Tilmeldt den %{date} + link_verified_on: Ejerskabet af dette link blev tjekket den %{date} media: Medier moved_html: "%{name} er flyttet til %{new_profile_link}:" network_hidden: Denne information er ikke tilgængelig @@ -126,7 +127,7 @@ da: most_recent: Seneste title: Rækkefølge outbox_url: Link til udgående - perform_full_suspension: Udfør fuld udelukkelse + perform_full_suspension: Udeluk profile_url: Link til profil promote: Forfrem protocol: Protokol @@ -155,8 +156,10 @@ da: report: anmeld targeted_reports: Anmeldelser fra denne konto silence: Dæmp + silenced: Dæmpet statuses: Statusser subscribe: Abonner + suspended: Udelukket title: Konti unconfirmed_email: Ikke-bekræftet email undo_silenced: Fortryd dæmpning @@ -258,6 +261,7 @@ da: title: Ny domæne blokering reject_media: Afvis medie filer reject_media_hint: Fjerner lokalt lagrede multimedie filer og nægter at hente nogen i fremtiden. Irrelevant for udelukkelser + reject_reports: Afvis anmeldelser severities: noop: Ingen silence: Dæmp |