From ed867eca9dbd7d798bc7179dbc13c4f1edc238ad Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 15 Jan 2018 04:34:28 +0100
Subject: Move e-mail digest task to sidekiq, reduce workload, improve hint
 (#6252)

---
 config/locales/simple_form.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/locales')

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index ff1a40ccd..143daaa29 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
-- 
cgit 


From dcc614f869b9484fc3aa601405d7e1988e166403 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Mon, 15 Jan 2018 14:50:29 +0900
Subject: Add some browsers (#6246)

Related: #6165
---
 config/locales/en.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config/locales')

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e4425b424..23dce73e9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -552,12 +552,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
-- 
cgit