diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
| commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
| tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /config/locales/simple_form.da.yml | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
Diffstat (limited to 'config/locales/simple_form.da.yml')
| -rw-r--r-- | config/locales/simple_form.da.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 07862e8a8..9d6587776 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -25,6 +25,7 @@ da: setting_hide_network: Hvem du følger og hvem der følger dig vil ikke blive vist på din profil setting_noindex: Påvirker din offentlige profil og status sider setting_theme: Påvirker hvordan Mastodon ser ud nåt du er logget ind via en hvilken som helst enhed. + whole_word: Når nøgle ordet eller udtrykket kun er alfabetisk, vil det kun blive brugt hvis det passer hele ordet imports: data: CSV fil eksporteret fra en anden Mastodon instans sessions: @@ -77,6 +78,7 @@ da: type: Importtype username: Brugernavn username_or_email: Brugernavn eller Email + whole_word: Helt ord interactions: must_be_follower: Bloker notifikationer fra folk der ikke følger dig must_be_following: Bloker notifikationer fra folk du ikke følger |