diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-09 11:14:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 11:14:32 +0200 |
| commit | fc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac (patch) | |
| tree | 587dde695e2d6121bb8f0495e0c988ab0d3d1e3f /config/locales/simple_form.no.yml | |
| parent | 5233e9910677c921ab93e0997964144b1df95a63 (diff) | |
| parent | 299ab28d5f1af7da5ec3688ebcbbf711f4567367 (diff) | |
Merge pull request #1533 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.no.yml')
| -rw-r--r-- | config/locales/simple_form.no.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index ccd7d9943..81913086e 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -112,12 +112,14 @@ confirm_password: Bekreft passord context: Filtersammenhenger current_password: Nåværende passord + data: Data discoverable: Før opp denne kontoen i mappen display_name: Visningsnavn email: E-postadresse expires_in: Utløper etter fields: Profilmetadata header: Overskrift + honeypot: "%{label} (ikke fyll ut)" inbox_url: URL til overgangsinnboksen irreversible: Forkast i stedet for å skjule locale: Språk @@ -173,6 +175,7 @@ text: Hvorfor vil du bli med? ip_block: comment: Kommentere + ip: IP severities: no_access: Blokker tilgang sign_up_requires_approval: Begrens påmeldinger @@ -187,6 +190,8 @@ reblog: Send e-post når noen fremhever din status report: Ny rapport er sendt inn trending_tag: En ugjennomgått emneknagg trender + rule: + text: Regler tag: listable: Tillat denne emneknaggen å vises i søk og på profilmappen name: Emneknagg @@ -195,6 +200,7 @@ 'no': Nei recommended: Anbefalt required: + mark: "*" text: obligatorisk title: sessions: |