diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
| commit | 82236a37039043d134efb3ddbdd2a3e04e714e2c (patch) | |
| tree | c00cd712a172ac3d5865e94bc505590fa211ecd5 /config/locales/en.yml | |
| parent | 65d083338debc256360fd6052ec43b98c442320c (diff) | |
| parent | 72314d26aeef0b225401d3f0ad97ea948c66f423 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 12284403c..b283f94f0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -116,6 +116,7 @@ en: roles: admin: Administrator moderator: Moderator + staff: Staff user: User salmon_url: Salmon URL search: Search @@ -160,6 +161,7 @@ en: update_status: "%{name} updated status by %{target}" title: Audit log custom_emojis: + by_domain: Domain copied_msg: Successfully created local copy of the emoji copy: Copy copy_failed_msg: Could not make a local copy of that emoji @@ -599,7 +601,7 @@ en: notifications: Notifications preferences: Preferences settings: Settings - two_factor_authentication: Two-factor Authentication + two_factor_authentication: Two-factor Auth your_apps: Your applications statuses: open_in_web: Open in web |