diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
| commit | dae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch) | |
| tree | 33a76386b1e8bc9c968bfc49409f72000b7ec410 /config/locales/id.yml | |
| parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
| parent | 57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'config/locales/id.yml')
| -rw-r--r-- | config/locales/id.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index 6ef16c8ed..ca222946c 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -743,8 +743,10 @@ id: add_new: Tambah baru errors: limit: Anda sudah menampilkan tagar unggulan dengan jumlah maksimum + hint_html: "<strong>Apa itu tagar yang diunggulkan?</strong> Mereka ditampilkan secara mencolok di profil publik Anda dan mengizinkan orang-orang untuk menjelajahi kiriman publik khususnya yang ada di bawah tagar tersebut. Mereka adalah alat yang bagus untuk melacak pekerjaan kreatif atau proyek jangka panjang." filters: contexts: + account: Profil home: Beranda notifications: Notifikasi public: Linimasa publik @@ -768,6 +770,8 @@ id: all: Semua changes_saved_msg: Perubahan berhasil disimpan! copy: Salin + delete: Hapus + no_batch_actions_available: Tindakan batch tidak tersedia di halaman ini order_by: Urut berdasarkan save_changes: Simpan perubahan validation_errors: |