Combine last_updated_by and last_updated_at columns on issues index

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

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 89836f63b0a0c9bc1b2fa218cf2bf265662afdef..f5ca8e9d4df8631d1cf18cb8151402b4a3d08929 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -6,6 +6,7 @@
 # Author: Milicevic01
 # Author: Nemo bis
 # Author: Rancher
+# Author: Сербијана
 ---
 sr-Latn:
   html:
@@ -75,7 +76,7 @@ sr-Latn:
         body: Tekst
         recipient: Primalac
       user:
-        email: E-pošta
+        email: Imejl
         active: Aktivan
         display_name: Ime prikaza
         description: Opis
@@ -269,7 +270,6 @@ sr-Latn:
     search:
       title:
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>
-        us_postcode: Rezultati iz <a href="http://geocoder.us/">Geokodera</a>
         uk_postcode: Rezultati iz <a href="http://www.npemap.org.uk/">NPEMap-a</a>
         ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geokodera</a>
         osm_nominatim: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
@@ -312,30 +312,23 @@ sr-Latn:
           crematorium: Krematorijum
           dentist: Zubar
           doctors: Doktor
-          dormitory: Studentski dom
           drinking_water: Pijaća voda
           driving_school: Auto-škola
           embassy: Ambasada
-          emergency_phone: Telefon za hitne slučajeve
           fast_food: Brza hrana
           ferry_terminal: Skela
-          fire_hydrant: Hidrant
           fire_station: Vatrogasna stanica
           food_court: Štandovi za brzu hranu
           fountain: Fontana
           fuel: Benzinska pumpa
           grave_yard: Groblje
-          gym: Fitnes centar
-          health_centre: Dom zdravlja
           hospital: Bolnica
           hunting_stand: Lovački dom
           ice_cream: Prodavnica sladoleda
           kindergarten: Obdanište
           library: Biblioteka
-          market: Pijaca
           marketplace: Pijaca
           nightclub: Noćni klub
-          nursery: Jaslice
           nursing_home: Starački dom
           office: Poslovnica
           parking: Parking
@@ -348,7 +341,6 @@ sr-Latn:
           prison: Zatvor
           pub: Pab
           public_building: Ustanova
-          reception_area: Prijemno područje
           recycling: Mesto za reciklažu
           restaurant: Restoran
           retirement_home: Starački dom
@@ -421,7 +413,6 @@ sr-Latn:
           trunk: Magistralni put
           trunk_link: Magistralni put
           unclassified: Nekategorisani put
-          unsurfaced: Neasfaltirani put
         historic:
           archaeological_site: Arheološko nalazište
           battlefield: Bojište
@@ -549,7 +540,6 @@ sr-Latn:
           travel_agent: Turistička agencija
           "yes": Kancelarija
         place:
-          airport: Aerodrom
           city: Grad
           country: Zemlja
           county: Okrug
@@ -561,7 +551,6 @@ sr-Latn:
           islet: Hrid
           isolated_dwelling: Udaljeno prebivalište
           locality: Lokalitet
-          moor: Močvara
           municipality: Opština
           postcode: Poštanski broj
           region: Područje
@@ -576,10 +565,8 @@ sr-Latn:
           abandoned: Napuštena železnica
           construction: Železnička pruga u izgradnji
           disused: Napuštena železnica
-          disused_station: Napuštena železnička stanica
           funicular: Žičana železnica
           halt: Železničko stajalište
-          historic_station: Istorijska železnička stanica
           junction: Železnički čvor
           level_crossing: Pružni prelaz
           light_rail: Laka železnica
@@ -639,7 +626,6 @@ sr-Latn:
           hairdresser: Frizerski salon
           hardware: Gvožđara
           hifi: Muzička oprema
-          insurance: Osiguranje
           jewelry: Zlatara
           kiosk: Kiosk
           laundry: Perionica rublja
@@ -654,9 +640,7 @@ sr-Latn:
           outdoor: Štand
           pet: Prodavnica kućnih ljubimaca
           photo: Fotografska radnja
-          salon: Salon
           shoes: Prodavnica obuće
-          shopping_centre: Tržni centar
           sports: Sportska oprema
           stationery: Papirnica
           supermarket: Supermarket
@@ -1285,7 +1269,7 @@ sr-Latn:
     login:
       title: Prijava
       heading: Prijava
-      email or username: 'E-adresa ili korisničko ime:'
+      email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       openid: '%{logo} OpenID:'
       remember: 'Zapamti me:'
@@ -1335,7 +1319,7 @@ sr-Latn:
       license_agreement: Nakon što potvrdite nalog, moraćete da prihvatite <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">uslove
         uređivanja</a>.
       email address: 'E-adresa:'
-      confirm email address: 'Potvrdite e-adresu:'
+      confirm email address: 'Potvrdite imejl adresu:'
       not displayed publicly: Ne prikazuje se javno (pogledajte <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
         title="wiki privacy policy including section on email addresses">politiku
         privatnosti</a>)
@@ -1445,7 +1429,7 @@ sr-Latn:
       title: Uredi nalog
       my settings: Postavke
       current email address: 'Trenutna e-adresa:'
-      new email address: 'Nova e-adresa:'
+      new email address: 'Nova imejl adresa:'
       email never displayed publicly: (nikada se ne prikazuje javno)
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID