diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/locales/id.yml | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'config/locales/id.yml')
| -rw-r--r-- | config/locales/id.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index d55abce59..1c648e28f 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -23,7 +23,7 @@ id: hosted_on: Mastodon dihosting di %{domain} instance_actor_flash: 'Akun ini adalah aktor virtual yang dipakai untuk merepresentasikan server, bukan pengguna individu. Ini dipakai untuk tujuan federasi dan jangan diblokir kecuali Anda ingin memblokir seluruh instansi, yang seharusnya Anda pakai blokir domain. -' + ' learn_more: Pelajari selengkapnya privacy_policy: Kebijakan Privasi see_whats_happening: Lihat apa yang sedang terjadi |