Merge remote-tracking branch 'upstream/pull/4200'

[rails.git] / config / locales / id.yml

diff --git a/config/locales/id.yml b/config/locales/id.yml
index f16032aab44026b8407a11b85af2790ec9a8f90f..d44592b693f177f1c27f46fc848e2bf3e8210393 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -381,7 +381,6 @@ id:
         way: Way/Garis
         relation: Relasi
     containing_relation:
-      entry_html: Relasi %{relation_name}
       entry_role_html: Relasi %{relation_name} (as %{relation_role})
     not_found:
       title: Tidak Ditemukan
@@ -2504,7 +2503,7 @@ id:
       upload_trace: Unggah jejak GPS
       all_traces: Semua Jejak
       my_traces: Jejak Saya
-      traces_from: Jejak Publik dari %{user}
+      traces_from_html: Jejak Publik dari %{user}
       remove_tag_filter: Hapus Filter Tag
     destroy:
       scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus