diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-10 23:01:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 23:01:56 +0200 |
| commit | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch) | |
| tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /config/locales/simple_form.no.yml | |
| parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
| parent | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff) | |
Merge pull request #1102 from ThibG/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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index fc339c3f2..e35bdabcc 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -8,7 +8,6 @@ header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px locked: Krever at du manuelt godkjenner følgere setting_noindex: Påvirker din offentlige profil og statussider - setting_theme: Påvirker hvordan Mastodon ser ut når du er logget inn fra uansett enhet. imports: data: CSV-fil eksportert fra en annen Mastodon-instans sessions: |