diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-01 15:29:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 15:29:35 +0200 |
| commit | 20e75666b2c52be6bbc7fe3f6fbe4278f35dde15 (patch) | |
| tree | ea47c70306d15e6b187ce0d37f9dd2936ee9b29d /config/locales/simple_form.no.yml | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | a0d01119794655dc789eda94905304679de070e8 (diff) | |
Merge pull request #619 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index aba8feeb6..98c6b82fe 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -3,12 +3,12 @@ simple_form: hints: defaults: - avatar: PNG, GIF eller JPG. Maksimalt 2 MB. Vil bli nedskalert til 400x400px + avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte display_name: one: <span class="name-counter">1</span> tegn igjen other: <span class="name-counter">%{count}</span> tegn igjen - header: PNG, GIF eller JPG. Maksimalt 2MB. Vil bli nedskalert til 700x335px + header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px locked: Krever at du manuelt godkjenner følgere note: one: <span class="note-counter">1</span> tegn igjen |