diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
| commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
| tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/id.yml | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/id.yml')
| -rw-r--r-- | config/locales/id.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index a26156ffa..b42ded815 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -280,6 +280,7 @@ id: update_ip_block_html: "%{name} mengubah peraturan untuk IP %{target}" update_status_html: "%{name} memperbarui status %{target}" update_user_role_html: "%{name} mengubah peran %{target}" + deleted_account: akun yang dihapus empty: Log tidak ditemukan. filter_by_action: Filter berdasarkan tindakan filter_by_user: Filter berdasarkan pengguna |