Merge remote-tracking branch 'upstream/main' into newstate/firebase

2021-06-19 20:41:25 -04:00
parent a85729b4cf bd3cec18d8
commit 7c2becd3a4
41 changed files with 1568 additions and 3022 deletions
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -336,5 +336,7 @@
  "we_sent_magic_link": "We sent you a magic link!",
  "we_sent_magic_link_description": "We sent an email to {email}. It contains a magic link that’ll log you in.",
  "hide_sidebar": "Hide sidebar",
-  "show_sidebar": "Show sidebar"
+  "show_sidebar": "Show sidebar",
+  "protocols": "Protocols",
+  "protocol_count": "protocol {count}"
 }