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

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

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 379c97d2b04159baf2f459e61dd6f64b6bba84d2..ef71c3333893042e57c723110808493bc23877cb 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1134,8 +1134,8 @@ tl:
       reports:
         one: 1 ulat
         other: '%{count} mga ulat'
-      report_created_at: Unang naiulat noong %{datetime}
-      last_resolved_at: Huling nalutas noong %{datetime}
+      report_created_at_html: Unang naiulat noong %{datetime}
+      last_resolved_at_html: Huling nalutas noong %{datetime}
       resolve: Lutasin
       ignore: Huwag pansinin
       reopen: Muling Buksan
@@ -1690,21 +1690,21 @@ tl:
           subway: Daanang pang-ilalim
           cable_car: Kotse ng kable
           chair_lift: upuang inaangat
-          runway_only: Rampa ng Paliparan
+          runway: Rampa ng Paliparan
           taxiway: daanan ng taksi
-          apron_only: Tapis ng paliparan
+          apron: Tapis ng paliparan
           admin: Hangganang pampangangasiwa
-          forest_only: Gubat
+          forest: Gubat
           wood: Kahoy
           golf: Kurso ng golp
           park: Liwasan
-          common_only: Karaniwan
+          common: Karaniwan
           resident: Pook na panuluyan
           retail: Lugar na tingian
           industrial: Pook na pang-industriya
           commercial: Pook na pangkalakalan
           heathland: Lupain ng halamang erika
-          lake_only: Lawa
+          lake: Lawa
           reservoir: tinggalan ng tubig
           farm: Bukid
           brownfield: Pook ng kayumangging bukirin
@@ -1714,11 +1714,11 @@ tl:
           centre: Lunduyang pampalakasan
           reserve: Lupaing laan sa kalikasan
           military: Pook ng militar
-          school_only: Paaralan
+          school: Paaralan
           university: pamantasan
           building: Makabuluhang gusali
           station: Himpilan ng daambakal
-          summit_only: Taluktok
+          summit: Taluktok
           peak: tugatog
           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay