Merge branch 'master' into notes

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

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 22dc3c3a4585cf60dc9c9cd4e4f6e4c39913f456..46368a85ecb108724bcf014727e4fdf567e2a5fe 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -243,7 +243,10 @@ id:
       view_history: Lihat riwayat
       way: Garis
       way_title: "Garis: %{way_name}"
-    way_details:
+    way_details: 
+      also_part_of: 
+        one: also part of way %{related_ways}
+        other: also part of ways %{related_ways}
       nodes: "Nodes/Titik:"
       part_of: "Bagian dari:"
     way_history: 
@@ -944,7 +947,6 @@ id:
     user_diaries_tooltip: Lihat catatan harian pengguna
     view: Tampilkan
     view_tooltip: Tampilkan peta
-    welcome_user: Selamat Datang, %{user_link}
     welcome_user_link_tooltip: Halaman Anda
     wiki: Wiki
     wiki_title: Situs wiki untuk proyek
@@ -1023,8 +1025,6 @@ id:
       back_to_outbox: Kembali ke kotak keluar
       date: Tanggal
       from: Dari
-      reading_your_messages: Membaca pesan Anda
-      reading_your_sent_messages: Membaca pesan terkirim Anda
       reply_button: Balas
       subject: Subjek
       title: Baca pesan