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

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

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 10fe1d757a0f96743babc4de9ba4a819b6fe34f6..cfacf3ddaa363348f227854548da741e68eeec66 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -115,13 +115,17 @@ ms:
         body: Isi
         recipient: Penerima
       redaction:
         body: Isi
         recipient: Penerima
       redaction:

+        title: Tajuk

         description: Keterangan
         description: Keterangan

+      report:
+        category: Pilih sebab untuk laporan anda

       user:
         email: E-mel
       user:
         email: E-mel

-        new_email: 'Alamat E-mel Baru:'
+        email_confirmation: Pengesahan E-mel
+        new_email: Alamat E-mel Baru

         active: Aktif
         display_name: Nama Paparan
         active: Aktif
         display_name: Nama Paparan

-        description: Keterangan
+        description: Keterangan Profil

         home_lat: 'Garis Lintang:'
         home_lon: 'Garis Bujur:'
         languages: Bahasa
         home_lat: 'Garis Lintang:'
         home_lon: 'Garis Bujur:'
         languages: Bahasa


@@ -467,6 +471,7 @@ ms:
           bicycle_parking: Letak Basikal
           bicycle_rental: Sewa Basikal
           biergarten: Taman Bir
           bicycle_parking: Letak Basikal
           bicycle_rental: Sewa Basikal
           biergarten: Taman Bir

+          blood_bank: Tabung Darah

           boat_rental: Bot Sewa
           brothel: Rumah Pelacuran
           bureau_de_change: Pengurup Wang
           boat_rental: Bot Sewa
           brothel: Rumah Pelacuran
           bureau_de_change: Pengurup Wang


@@ -557,12 +562,14 @@ ms:
         building:
           apartment: Pangsapuri
           apartments: Pangsapuri
         building:
           apartment: Pangsapuri
           apartments: Pangsapuri

+          bungalow: Banglo

           chapel: Gereja Kecil
           church: Bangunan Gereja
           commercial: Bangunan Perdagangan
           dormitory: Asrama
           farm: Rumah Ladang
           garage: Garaj
           chapel: Gereja Kecil
           church: Bangunan Gereja
           commercial: Bangunan Perdagangan
           dormitory: Asrama
           farm: Rumah Ladang
           garage: Garaj

+          garages: Garaj

           hospital: Bangunan Hospital
           hotel: Bangunan Hotel
           house: Rumah
           hospital: Bangunan Hospital
           hotel: Bangunan Hotel
           house: Rumah


@@ -1582,23 +1589,6 @@ ms:
           bicycle_shop: Kedai Basikal
           bicycle_parking: Tempat letak basikal
           toilets: Tandas
           bicycle_shop: Kedai Basikal
           bicycle_parking: Tempat letak basikal
           toilets: Tandas

-    richtext_area:
-      edit: Sunting
-      preview: Pralihat
-    markdown_help:
-      title_html: Dihuraikan dengan <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
-      headings: Judul
-      heading: Judul
-      subheading: Judul kecil
-      unordered: Senarai tak tertib
-      ordered: Senarai tertib
-      first: Perkara pertama
-      second: Perkara kedua
-      link: Pautan
-      text: Teks
-      image: Gambar
-      alt: Teks alt
-      url: URL

     welcome:
       title: Selamat datang!
       introduction_html: Selamat datang ke OpenStreetMap, peta dunia yang bebas disunting
     welcome:
       title: Selamat datang!
       introduction_html: Selamat datang ke OpenStreetMap, peta dunia yang bebas disunting