diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:36:49 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:41:43 +0200 |
commit | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (patch) | |
tree | 96a939def53ee44f19d28c66f1d1f2195806ccc2 /config/locales/id.yml | |
parent | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (diff) | |
parent | 82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
Diffstat (limited to 'config/locales/id.yml')
-rw-r--r-- | config/locales/id.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/locales/id.yml b/config/locales/id.yml index 3da3583f6..8595fad99 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -204,9 +204,7 @@ id: generic: changes_saved_msg: Perubahan berhasil disimpan! save_changes: Simpan perubahan - validation_errors: - one: Ada yang tidak beres! Mohon tinjau error dibawah ini - other: Ada yang tidak beres! Mohon tinjau error dibawah ini + validation_errors: Ada yang tidak beres! Mohon tinjau error dibawah ini imports: preface: Anda bisa mengimpor data tertentu seperti orang-orang yang anda ikuti atau anda blokir di server ini, dari file yang dibuat oleh fitur expor di server lain. success: Data anda berhasil diupload dan akan diproses sesegera mungkin @@ -221,7 +219,7 @@ id: too_many: Tidak dapat melampirkan lebih dari 4 file notification_mailer: digest: - body: 'Ini adalah ringkasan singkat yang anda lewatkan pada %{instance} sejak kunjungan terakhir anda pada %{since}:' + body: 'Ini adalah ringkasan singkat yang anda lewatkan pada sejak kunjungan terakhir anda pada %{since}:' mention: "%{name} menyebut anda di:" new_followers_summary: one: Anda mendapatkan satu pengikut baru! Hore! |