diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/locales/vi.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'config/locales/vi.yml')
| -rw-r--r-- | config/locales/vi.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/vi.yml b/config/locales/vi.yml index b01c1ea20..ec8e853fe 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -336,9 +336,6 @@ vi: create: Thêm tên miền title: Mục nhập danh sách đen e-mail mới title: Danh sách đen e-mail - followers: - back_to_account: Quay lại tài khoản - title: Người theo dõi của %{acct} instances: by_domain: Miền delivery_available: Giao hàng tận nơi |