diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/simple_form.da.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/simple_form.da.yml')
| -rw-r--r-- | config/locales/simple_form.da.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 48a0a6883..738d4070b 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -53,6 +53,7 @@ da: confirm_password: Bekræft adgangskode context: Filtrer sammenhænge current_password: Nuværende adgangskode + data: Data display_name: Visningsnavn email: E-mail adresse expires_in: Udløber efter @@ -84,6 +85,7 @@ da: setting_reduce_motion: Reducer animationers bevægelse setting_system_font_ui: Brug systemets standard font setting_theme: Tema for side + setting_trends: Vis dagens tendenser setting_unfollow_modal: Vis bekræftelses dialog før du stopper med at følge nogen setting_use_pending_items: Langsom tilstand severity: Omfang @@ -91,6 +93,8 @@ da: username: Brugernavn username_or_email: Brugernavn eller Email whole_word: Helt ord + featured_tag: + name: Hashtag interactions: must_be_follower: Bloker notifikationer fra folk der ikke følger dig must_be_following: Bloker notifikationer fra folk du ikke følger @@ -107,6 +111,7 @@ da: report: Send email når en ny anmeldelse bliver indsendt tag: name: Hashtag + usable: Tillad toots at benytte dette hashtag 'no': Nej recommended: Anbefalet required: |