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

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

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 50fbe0294cd1bff38d5f0202dbbcb1fb4fd0d59d..d7f7696087f4b1de55ef36506e4c048f74ed3011 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -30,7 +30,7 @@ ms:
         create: Kirim
       client_application:
         create: Daftar
-        update: Sunting
+        update: Kemas kini
       redaction:
         create: Cipta redaksi
         update: Simpan redaksi
@@ -82,6 +82,7 @@ ms:
       way_tag: Tag Jalan
     attributes:
       client_application:
+        name: Nama (Diperlukan)
         callback_url: URL Panggil Balik
         support_url: URL Sokongan
       diary_comment:
@@ -547,15 +548,16 @@ ms:
           viaduct: Jejambat
           "yes": Jambatan
         building:
-          apartments: Blok Rumah Pangsa
+          apartment: Pangsapuri
+          apartments: Pangsapuri
           chapel: Gereja Kecil
-          church: Gereja
+          church: Bangunan Gereja
           commercial: Bangunan Perdagangan
           dormitory: Asrama
-          farm: Bangunan Ladang
+          farm: Rumah Ladang
           garage: Garaj
           hospital: Bangunan Hospital
-          hotel: Hotel
+          hotel: Bangunan Hotel
           house: Rumah
           industrial: Bangunan Industri
           office: Bangunan Pejabat
@@ -563,8 +565,8 @@ ms:
           residential: Bangunan Perumahan
           retail: Bangunan Peruncitan
           school: Bangunan Sekolah
-          terrace: Teres
-          train_station: Stesen Keretapi
+          terrace: Bangunan Teres
+          train_station: Bangunan Stesen Kereta Api
           university: Bangunan Universiti
           "yes": Bangunan
         craft:
@@ -580,6 +582,7 @@ ms:
         emergency:
           ambulance_station: Stesen Ambulan
           defibrillator: Defibrilator
+          fire_xtinguisher: Alat Pemadam Api
           landing_site: Tapak pendaratan kecemasan
           phone: Telefon Kecemasan
           "yes": Kecemasan
@@ -729,6 +732,7 @@ ms:
           silo: Silo
           storage_tank: Tangki Simpanan
           surveillance: Pengawasan
+          telescope: Teleskop
           tower: Menara
           watermill: Kincir Air
           water_tower: Menara Air
@@ -863,7 +867,9 @@ ms:
           carpet: Kedai Permaidani
           charity: Kedai Amal
           chemist: Farmasi
+          chocolate: Coklat
           clothes: Kedai Pakaian
+          coffee: Kedai Kopi
           computer: Kedai Komputer
           confectionery: Kedai Konfeksi
           convenience: Kedai Mudah Beli
@@ -1889,8 +1895,6 @@ ms:
     reset_password:
       title: Set semula kata laluan
       heading: Set Semula Kata Laluan untuk %{user}
-      password: 'Kata laluan:'
-      confirm password: 'Sahkan Kata Laluan:'
       reset: Set Semula Kata Laluan
       flash changed: Kata laluan anda telah ditukar.
       flash token bad: Token itu tidak dijumpai; sila semak URL-nya.