diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-15 06:17:15 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-15 06:17:15 +0000 |
| commit | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (patch) | |
| tree | d599071d84f545e16a8ebaddf6e215cadc89247d /config/locales | |
| parent | 8ee6ed358ff5706e3d0c402a9b23846b51f6d451 (diff) | |
| parent | 74c1c9ec01addc7474d74712f76fb6d6d5eecdf7 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2691b9ed9..4fc392434 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -561,12 +561,14 @@ en: blackberry: Blackberry chrome: Chrome edge: Microsoft Edge + electron: Electron firefox: Firefox generic: Unknown browser ie: Internet Explorer micro_messenger: MicroMessenger nokia: Nokia S40 Ovi Browser opera: Opera + otter: Otter phantom_js: PhantomJS qq: QQ Browser safari: Safari diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index aa6940e91..ceb015282 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -4,7 +4,7 @@ en: hints: defaults: avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px - digest: Sent after a long period of inactivity with a summary of mentions you've received in your absence + digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence display_name: one: <span class="name-counter">1</span> character left other: <span class="name-counter">%{count}</span> characters left |