diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
| commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
| tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /config/locales/id.yml | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'config/locales/id.yml')
| -rw-r--r-- | config/locales/id.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index 896ea402b..a91f459a4 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -204,8 +204,6 @@ id: closed_message: desc_html: Ditampilkan pada halaman depan saat pendaftaran ditutup<br>Anda bisa menggunakan tag HTML title: Pesan penutupan pendaftaran - open: - title: Pendaftaran terbuka site_description: desc_html: Ditampilkan sebagai sebuah paragraf di halaman depan dan digunakan sebagai tag meta.<br>Anda bisa menggunakan tag HTML, khususnya <code><a></code> dan <code><em></code>. title: Deskripsi situs |