partially synced

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f1f08b9c3f69cec9967ee28f676c9ac32b192d70..6397ed597cc61adb95b4c0632780b51fb90a0743 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -120,6 +120,10 @@ sl:
       view_history: "poglej zgodovino"
     not_found:
       sorry: "Oprostite, {{type}} z ID-jem {{id}} ni bilo mogoče najti."
+      type:
+        node: vozlišče
+        way: pot
+        relation: relacija
     paging_nav:
       showing_page: "Prikazana stran"
       of: "od"
@@ -155,6 +159,25 @@ sl:
       details: "Podrobnosti"
       private_user: "anonimni uporabnik"
       edited_by_user_at_timestamp: "Uredil [[user]] ob [[timestamp]]"
+      object_list:
+        heading: "Seznam predmetov"
+        back: "Prikaži seznam predmetov"
+        type:
+          node: "Vozlišče"
+          way: "Pot"
+          # There's no 'relation' type because it isn't represented in OpenLayers
+        api: "Pridobi področje iz programskega vmesnika (API)"
+        details: "Podrobnosti"
+        selected:
+          type:
+            node: "Vozlišče [[id]]"
+            way: "Pot [[id]]"
+            # There's no 'relation' type because it isn't represented in OpenLayers
+        history:
+          type:
+            node: "Vozlišče [[id]]"
+            way: "Pot [[id]]"
+            # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Oznake:"
     way_details:
@@ -242,12 +265,16 @@ sl:
       title: "Dnevnik uporabnika {{user}}" 
       user_title: "Dnavnik uporabnika {{user}}"
       leave_a_comment: "Napiši komentar" 
+      login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
+      login: "Prijavite se"
       save_button: "Shrani"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "Oprostite, vnosa v dnevnik št. {{id}} ni.  Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     no_such_user:
-      body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
+      title: "Ni tega uporabnika"
+      heading: "Uporabnik {{user}} ne obstaja"
+      body: "Oprostite, uporabnika z imenom {{user}} ni.  Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     diary_entry:
       posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language}}"
       comment_link: Komentiraj ta vnos
@@ -301,11 +328,17 @@ sl:
     log_in: prijava
     sign_up: vpis
     view: Zemljevid
+    view_tooltip: Prikaz zemljevida
     edit: Uredi
+    edit_tooltip: Uredite zemljevid
     history: Zgodovina
+    history_tooltip: Zgodovina sprememb
     export: Izvoz
+    export_tooltip: Izvozite podatke zemljevida
     gps_traces: GPS sledi
-    user_diaries: Dnevniki uporabnikov
+    gps_traces_tooltip: Upravljanje z GPS sledmi
+    user_diaries: Dnevniki
+    user_diaries_tooltip: Pregled dnevnikov uporabnikov
     tag_line: Prost wiki zemljevid sveta
     intro_1: "OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi."
     intro_2: "OpenStreetMap vam omogoča ogled, urejanje in souporabo geografskih podatkov kjerkoli na Zemlji."
@@ -315,12 +348,15 @@ sl:
     donate: "Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme."
     donate_link_text: donacijo
     help_wiki: "Pomoč in Wiki"
+    help_wiki_url: "http://wiki.openstreetmap.org/wiki/Sl:Main_Page"
     news_blog: "Novice"
     shop: Trgovina
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Udeležite se letošnje OpenStreetMap konference, The State of the Map, ki bo od 10 do 12 Julija v Amsterdamu!'
     alt_donation: Prispevajte finančna sredstva
   notifier:
     diary_comment_notification:
+      subject: "[OpenStreetMap] {{user}} je komentiral vaš vnos v dnevnik"
       banner1: "*                    Ne odgovarjajte na to sporočilo.                     *"
       banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
       hi: "Pozdravljen, {{to_user}}!"
@@ -357,30 +393,65 @@ sl:
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+    email_confirm:
+      subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
+    email_confirm_plain:
+      greeting: "Pozdravljeni,"
+      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poštnega naslova v"
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
+    email_confirm_html:
+      greeting: "Pozdravljeni,"
+      hopefully_you: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poštnega naslova v {{server_url}} na {{new_address}}."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
+    lost_password:
+      subject: "[OpenStreetMap] Zahteva za ponastavitev gesla"
+    lost_password_plain:
+      greeting: "Pozdravljeni,"
+      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org"
+      hopefully_you_2: "uporabniškega računa s tem naslovom e-pošte."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
+    lost_password_html:
+      greeting: "Pozdravljeni,"
+      hopefully_you: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org uporabniškega računa s tem naslovom e-pošte."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
+    reset_password:
+      subject: "[OpenStreetMap] Ponastavitev gesla"
+    reset_password_plain:
+      greeting: "Pozdravljeni,"
+      reset: "Vaše geslo je bilo nastavljeno na {{new_password}}"
+    reset_password_html:
+      greeting: "Pozdravljeni,"
+      reset: "Vaše geslo je bilo nastavljeno na {{new_password}}"
   message:
     inbox:
+      title: "Prejeta pošta"
       my_inbox: "Moja prejeta"
       outbox: "poslana pošta"
       you_have: "Imate {{new_count}} novih, neprebranih in {{old_count}} starih, že prebranih sporočil"
       from: "Od"
       subject: "Zadeva"
       date: "Datum"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      no_messages_yet: "Prejeli niste še nobenih sporočil. Zakaj ne bo stopili v stik z {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas" 
     message_summary:
       unread_button: "Označi kot neprebrano"
       read_button: "Označi kot prebrano"
       reply_button: "Odgovori"
     new:
+      title: "Pošiljanje sporočila"
       send_message_to: "Pošlji novo sporočilo uporabniku {{name}}"
       subject: "Zadeva"
       body: "Besedilo"
       send_button: "Pošlji"
       back_to_inbox: "Nazaj na prejeto pošto"
+      message_sent: "Sporočilo poslano"
     no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
+      title: "Ni ustreznega uporabnika ali sporočila"
+      heading: "Ni ustreznega uporabnika ali sporočila"
+      body: "Oprostite, uporabnika s tem imenom ali sporočila s tem ID-jem ni"
     outbox: 
+      title: "Poslana pošta"
       my_inbox: "Moja {{inbox_link}}"
       inbox: "prejeta"
       outbox: "poslana pošta"
@@ -388,9 +459,10 @@ sl:
       to: "Za"
       subject: "Zadeva"
       date: "Datum"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
+      no_sent_messages: "Poslali niste še nobenih sporočil. Zakaj ne bo stopili v stik z {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas"
     read:
+      title: "Branje sporočila"
       reading_your_messages: "Prebiranje vaših sporočil"
       from: "Od"
       subject: "Zadeva"
@@ -401,6 +473,9 @@ sl:
       reading_your_sent_messages: "Prebiranje vaših poslanih sporočil"
       to: "Za"
       back_to_outbox: "Nazaj na poslano pošto"
+    mark:
+      as_read: "Sporočilo označeno kot prebrano"
+      as_unread: "Sporočilo označeno kot neprebrano"
   site:
     index:
       home: "domov" 
@@ -538,7 +613,9 @@ sl:
       signup: "Želim se vpisati"
       flash create success message: "Uporabniški račun narejen. Preverite vaš poštni predal s sporočilom za potrditev, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:
-      body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
+      title: "Ni tega uporabnika"
+      heading: "Uporabnik {{user}} ne obstaja"
+      body: "Oprostite, uporabnika z imenom {{user}} ni.  Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     view:
       my diary: moj dnevnik
       new diary entry: nov vnos v dnevnik