diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
| commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
| tree | 2476b65436959dda09871ee96edca53b53201b96 /config/locales/id.yml | |
| parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
| parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'config/locales/id.yml')
| -rw-r--r-- | config/locales/id.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index 8595fad99..38b08a257 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -18,7 +18,9 @@ id: nothing_here: Tidak ada apapun disini! people_followed_by: Orang yang diikuti %{name} people_who_follow: Orang-orang yang mengikuti %{name} - posts: Postingan + posts: + one: Toot + other: Toots unfollow: Berhenti mengikuti admin: accounts: @@ -182,7 +184,7 @@ id: '410': Halaman yang anda cari sudah tidak dapat ditemukan lagi. '422': content: Verifikasi keamanan gagal. Apa anda memblokir cookie? - title: Verifikasi keamanan gagal. + title: Verifikasi keamanan gagal exports: blocks: Anda blokir csv: CSV |