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

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

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 1e6d91e3d74ac748df64ce8e9de602f73afd9be5..557ac5bc739e369bda83d1e2851a708ec629ee13 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -731,21 +731,21 @@ sh:
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: rulna staza
           taxiway: rulna staza

-          apron_only: Parking za avione
+          apron: Parking za avione

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šuma
+          forest: Šuma

           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park
           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park

-          common_only: Travnjaci
+          common: Travnjaci

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

-          lake_only: Jezero
+          lake: Jezero

           reservoir: rezervoar
           farm: Farma
           brownfield: Gradilište
           reservoir: rezervoar
           farm: Farma
           brownfield: Gradilište


@@ -755,11 +755,11 @@ sh:
           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: Željeznička stanica
           university: univerzitet
           building: Značajna zgrada
           station: Željeznička stanica

-          summit_only: Vrh
+          summit: Vrh

           peak: vrh
     welcome:
       title: Dobrodošli!
           peak: vrh
     welcome:
       title: Dobrodošli!