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

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

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 4996351be77388b7c572e0febc884b8eed0a5dbf..1679ce930482f219b30e3ac54155dc786d2e4fc3 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -501,7 +501,6 @@ ms:
           motorcycle_parking: Tempatletak motorsikal
           nightclub: Kelab Malam
           nursing_home: Rumah Penjagaan
-          office: Pejabat
           parking: Letak Kereta
           parking_entrance: Laluan masuk tempat letak kenderaan
           parking_space: Tempat Parkir
@@ -510,20 +509,15 @@ ms:
           police: Polis
           post_box: Peti Surat
           post_office: Pejabat Pos
-          preschool: Prasekolah
           prison: Penjara
           pub: Pab
           public_building: Bangunan Awam
           recycling: Kitar Semula
           restaurant: Kedai Makan
-          retirement_home: Rumah Persaraan
-          sauna: Sauna
           school: Sekolah
           shelter: Perteduhan
-          shop: Kedai
           shower: Pancuran
           social_centre: Pusat Sosial
-          social_club: Kelab Sosial
           social_facility: Kemudahan Sosial
           studio: Studio
           swimming_pool: Kolam Renang
@@ -538,7 +532,6 @@ ms:
           village_hall: Balai Raya
           waste_basket: Bakul Sampah
           waste_disposal: Pusat Pembuagan
-          youth_centre: Pusat Belia
         boundary:
           administrative: Sempadan Pentadbiran
           census: Sempadan Banci
@@ -551,6 +544,25 @@ ms:
           viaduct: Jejambat
           "yes": Jambatan
         building:
+          apartments: Blok Rumah Pangsa
+          chapel: Gereja Kecil
+          church: Gereja
+          commercial: Bangunan Perdagangan
+          dormitory: Asrama
+          farm: Bangunan Ladang
+          garage: Garaj
+          hospital: Bangunan Hospital
+          hotel: Hotel
+          house: Rumah
+          industrial: Bangunan Industri
+          office: Bangunan Pejabat
+          public: Bangunan Awam
+          residential: Bangunan Perumahan
+          retail: Bangunan Peruncitan
+          school: Bangunan Sekolah
+          terrace: Teres
+          train_station: Stesen Keretapi
+          university: Bangunan Universiti
           "yes": Bangunan
         craft:
           carpenter: Tukang Kayu
@@ -607,7 +619,6 @@ ms:
           tertiary_link: Jalan Tertier
           track: Laluan
           traffic_signals: Isyarat Trafik
-          trail: Denai
           trunk: Jalan Utama
           trunk_link: Jalan Utama
           unclassified: Jalan Tidak Terkelas
@@ -625,7 +636,6 @@ ms:
           fort: Kubu
           heritage: Tapak Bersejarah
           house: Rumah
-          icon: Patung
           manor: Manor
           memorial: Peringatan
           mine: Lombong
@@ -670,7 +680,6 @@ ms:
           reservoir_watershed: Kawasan Tadahan Air Takungan
           residential: Kawasan Perumahan
           retail: Peruncitan
-          road: Kawasan Jalan Raya
           village_green: Padang Kampung
           vineyard: Ladang Anggur
         leisure:
@@ -808,7 +817,6 @@ ms:
           subdivision: Subbahagian
           suburb: Subbandar
           town: Pekan
-          unincorporated_area: Kawasan Tak Terperbadan
           village: Desa
           "yes": Tempat
         railway:
@@ -834,6 +842,7 @@ ms:
           switch: Titik Landasan Keretapi
           tram: Landasan Trem
           tram_stop: Perhentian Trem
+          yard: Laman Keretapi
         shop:
           alcohol: Kedai Arak Tanpa Lesen
           antiques: Kedai Antik
@@ -866,12 +875,10 @@ ms:
           estate_agent: Ejen Hartanah
           farm: Kedai Ladang
           fashion: Kedai Fesyen
-          fish: Kedai Ikan
           florist: Kedai Bunga
           food: Kedai Makanan
           funeral_directors: Kedai Urus Mayat
           furniture: Perabot
-          gallery: Balai Seni
           garden_centre: Pusat Kebun
           general: Kedai Am
           gift: Kedai Hadiah
@@ -886,7 +893,6 @@ ms:
           laundry: Dobi
           lottery: Tempat Perjudian
           mall: Medan Beli-Belah
-          market: Pasar
           massage: Urut
           mobile_phone: Kedai Telefon Bimbit
           motorcycle: Kedai Motosikal
@@ -897,7 +903,6 @@ ms:
           outdoor: Kedai Luaran
           paint: Kedai Cat
           pet: Kedai Haiwan
-          pharmacy: Farmasi
           photo: Kedai Foto
           seafood: Makanan Laut
           second_hand: Kedai Barangan Terpakai