Merge pull request #3825 from aaronraimist/lock

Emoji verification: Change name of 🔒 to lock
2020-01-13 21:32:58 +00:00 · 2020-01-13 21:32:58 +00:00 · 9cedfeb007
parent 19777cfafc 6cf5b3f1a2
commit 9cedfeb007
2 changed files with 2 additions and 2 deletions
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@ -140,7 +140,7 @@ _td("Book");
 _td("Pencil");
 _td("Paperclip");
 _td("Scissors");
-_td("Padlock");
+_td("Lock");
 _td("Key");
 _td("Hammer");
 _td("Telephone");
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@ -481,7 +481,7 @@
    "Pencil": "Pencil",
    "Paperclip": "Paperclip",
    "Scissors": "Scissors",
-    "Padlock": "Padlock",
+    "Lock": "Lock",
    "Key": "Key",
    "Hammer": "Hammer",
    "Telephone": "Telephone",