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

[rails.git] / config / locales / sr-Latn.yml

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index a0cb37ae5be5ba30c8f407170106b030eecf25a5..3125108f284fd414a0e7d1a2b53b5a93e549d022 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1032,30 +1032,24 @@ sr-Latn:
           footway: Pešačka staza
           rail: Železnička pruga
           subway: Podzemna železnica
-          cable:
-          - Žičara
-          - sedišnica
-          runway:
-          - Aerodromska pista
-          - rulne staze
+          cable_car: Žičara
+          chair_lift: sedišnica
+          runway_only: Aerodromska pista
+          taxiway: rulne staze
           apron_only: Aerodromski peron
           admin: Administrativna granica
-          forest:
-          - Šuma
-          - Šuma
+          forest_only: Šuma
+          wood: Šuma
           golf: Golf teren
           park: Park
-          common:
-          - Poljana
-          - livada
+          common_only: Poljana
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Pustoš
-          lake:
-          - Jezero
-          - rezervoar
+          lake_only: Jezero
+          reservoir: rezervoar
           farm: Farma
           brownfield: Građevinsko zemljište
           cemetery: Groblje
@@ -1064,14 +1058,12 @@ sr-Latn:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
-          school:
-          - Škola
-          - univerzitet
+          school_only: Škola
+          university: univerzitet
           building: Značajna zgrada
           station: Železnička stanica
-          summit:
-          - Uzvišenje
-          - vrh
+          summit_only: Uzvišenje
+          peak: vrh
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           private: Privatni posed