Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

1 files changed, 16 insertions, 2 deletions

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 465049e9d..d4320859f 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -110,10 +110,8 @@ br:
       enabled: Gweredekaet
       list: Listenn
     dashboard:
-      config: Kefluniadur
       software: Meziant
       title: Taolenn labour
-      trends: Luskadoù
     domain_blocks:
       domain: Domani
       new:
@@ -272,7 +270,23 @@ br:
   sessions:
     browser: Merdeer
     browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Merdeer dianav
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Merdeer Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
     description: "%{browser} war %{platform}"
     platforms:
       other: savenn dianav