merge 19601:19888 of rails_port into the openID branch

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

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index b3957609c2036f062e99b93eeb5b6727e45c9c20..1ac24f1956eadf2928138bfa8572f7fd5d61d806 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -3,7 +3,6 @@
 # Export driver: syck
 # Author: Mnalis
 # Author: Mvrban
-# Author: Suradnik13
 hr: 
   activerecord: 
     attributes: 
@@ -478,6 +477,7 @@ hr:
           prison: Zatvor
           pub: Pub
           public_building: Ustanova
+          public_market: Javna tržnica
           reception_area: Recepcija
           recycling: Reciklažna točka
           restaurant: Restoran
@@ -498,12 +498,15 @@ hr:
           university: Sveučilište
           vending_machine: Automat
           veterinary: Veterinar
+          village_hall: Seoski Dom
           waste_basket: Kanta za otpatke
           wifi: WiFi pristupna točka
           youth_centre: Centar za mladež
         boundary: 
           administrative: Administrativna granica
         building: 
+          apartments: Stambeni blok
+          block: Blok zgrada
           bunker: Bunker
           chapel: Kapelica
           church: Crkva
@@ -512,14 +515,18 @@ hr:
           dormitory: Studentski dom
           entrance: Ulaz
           faculty: Zgrada fakulteta
+          farm: Farma (zgrada)
           flats: Stanovi
           garage: Garaža
           hall: Dvorana
           hospital: Bolnica
           hotel: Hotel
           house: Kuća
+          industrial: Industrijska zgrada
           office: Uredska zgrada
+          public: Javna zgrada
           residential: Stambena zgrada
+          retail: Maloprodajna zgrada
           school: Školska zgrada
           shop: Trgovina
           stadium: Stadion
@@ -575,6 +582,7 @@ hr:
           castle: Dvorac
           church: Crkva
           house: Kuća
+          icon: Ikona
           manor: Zamak
           memorial: Spomen dom
           mine: Rudnik
@@ -582,18 +590,23 @@ hr:
           museum: Muzej
           ruins: Ruševine
           tower: Toranj
+          wayside_cross: Krajputaš
+          wayside_shrine: Usputno svetište
           wreck: Olupina
         landuse: 
           allotments: Vrtovi
           basin: Bazen
+          brownfield: Zemljište za prenamjenu
           cemetery: Groblje
           commercial: Poslovno područje
+          conservation: Zaštićeno područje
           construction: Gradilište
           farm: Farma
           farmland: Polje
           farmyard: Farma
           forest: Šuma
           grass: Trava
+          greenfield: Greenfield zemljište
           industrial: Industrijsko područje
           landfill: Deponija
           meadow: Livada
@@ -610,6 +623,7 @@ hr:
           reservoir: Rezervoar
           residential: Stambeno područje
           retail: Trgovina
+          village_green: Seoski travnjak
           vineyard: Vinograd
           wetland: Močvara
           wood: Šuma
@@ -696,23 +710,31 @@ hr:
           unincorporated_area: Slobodna zemlja
           village: Selo
         railway: 
+          abandoned: Napuštena pruga
           construction: Pruga u izgradnji
           disused: Napuštena pruga
           disused_station: Željeznička stanica (nije u upotrebi)
+          funicular: Uspinjača
           halt: Željeznička stanica
           historic_station: Povijesna željeznička stanica
           junction: Željeznički čvor
           level_crossing: Pružni prijelaz
           light_rail: Laka željeznica
           monorail: Jednotračna pruga
+          narrow_gauge: Uskotračna pruga
+          platform: Željeznička platforma
+          preserved: Sačuvana pruga
+          spur: Pruga
           station: Željeznički kolodvor
           subway: Podzemna - stanica
           subway_entrance: Podzemna - ulaz
+          switch: Skretnica
           tram: Tramvaj
           tram_stop: Tramvajska stanica
           yard: Ranžirni kolodvor
         shop: 
           alcohol: Trgovina pićem
+          apparel: Trgovina odjećom
           art: Atelje
           bakery: Pekara
           beauty: Parfumerija
@@ -725,6 +747,7 @@ hr:
           car_parts: Autodijelovi
           car_repair: Autoservis
           carpet: Trgovina tepisima
+          charity: Dobrotvorna trgovina
           chemist: Ljekarna
           clothes: Butik
           computer: Computer Shop
@@ -740,6 +763,7 @@ hr:
           electronics: Trgovina elektronikom
           estate_agent: Agencija za nekretnine
           farm: Poljo-apoteka
+          fashion: Modna trgovina
           fish: Ribarnica
           florist: Cvjećarnica
           food: Trgovina prehranom
@@ -747,6 +771,7 @@ hr:
           furniture: Namještaj
           gallery: Galerija
           garden_centre: Vrtni centar
+          general: Trgovina mješovitom robom
           gift: Poklon trgovina
           greengrocer: Voćarna
           grocery: Trgovina prehranom
@@ -759,9 +784,12 @@ hr:
           laundry: Praonica rublja
           mall: Trgovački centar
           market: Tržnica
+          mobile_phone: Trgovina mobitelima
+          motorcycle: Moto Shop
           music: Trgovina glazbom
           newsagent: Novinar
           optician: Optičar
+          organic: Trgovina zdrave hrane
           outdoor: Trgovina za slobodno vrijeme
           pet: Trgovina za kućne ljubimce
           photo: Fotograf
@@ -797,15 +825,26 @@ hr:
           viewpoint: Vidikovac
           zoo: Zoo
         waterway: 
+          boatyard: Brodogradilište
           canal: Kanal
+          connector: Spoj vodnih puteva
           dam: Brana
+          derelict_canal: Zanemaren kanal
+          ditch: Jarak
           dock: Dok
+          drain: Odvod
+          lock: Ustava
+          lock_gate: Ustava
           mineral_spring: Mineralni izvor
           mooring: Sidrište
+          rapids: Brzaci
           river: Rijeka
           riverbank: Riječna obala
           stream: Potok
+          wadi: Suho korito rijeke
+          water_point: Točka vodotoka
           waterfall: Vodopad
+          weir: Brana
   javascripts: 
     map: 
       base: