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

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

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 3125108f284fd414a0e7d1a2b53b5a93e549d022..5e8182c0d0e9e4023d1b7c4ceea116c16a052ad7 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1034,21 +1034,21 @@ sr-Latn:
           subway: Podzemna železnica
           cable_car: Žičara
           chair_lift: sedišnica
           subway: Podzemna železnica
           cable_car: Žičara
           chair_lift: sedišnica

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: rulne staze
           taxiway: rulne staze

-          apron_only: Aerodromski peron
+          apron: Aerodromski peron

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šuma
+          forest: Šuma

           wood: Šuma
           golf: Golf teren
           park: Park
           wood: Šuma
           golf: Golf teren
           park: Park

-          common_only: Poljana
+          common: Poljana

           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Pustoš
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Pustoš

-          lake_only: Jezero
+          lake: Jezero

           reservoir: rezervoar
           farm: Farma
           brownfield: Građevinsko zemljište
           reservoir: rezervoar
           farm: Farma
           brownfield: Građevinsko zemljište


@@ -1058,11 +1058,11 @@ sr-Latn:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school_only: Škola
+          school: Škola

           university: univerzitet
           building: Značajna zgrada
           station: Železnička stanica
           university: univerzitet
           building: Značajna zgrada
           station: Železnička stanica

-          summit_only: Uzvišenje
+          summit: Uzvišenje

           peak: vrh
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           peak: vrh
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most