Correct merge issues in the last merge from master

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

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 5a0be1c3c95e08f9aebea4871597c8a78b3c85da..7a878ff43e9bcd2cb1c9e7b87c49b4e4abec5a1f 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -246,7 +246,7 @@ sl:
       reply_link: Odgovori na ta vnos
     edit: 
       body: "Besedilo:"
       reply_link: Odgovori na ta vnos
     edit: 
       body: "Besedilo:"

-      language: "Jezki:"
+      language: "Jezik:"

       latitude: "Z. širina:"
       location: "Lokacija:"
       longitude: "Z. dolžina:"
       latitude: "Z. širina:"
       location: "Lokacija:"
       longitude: "Z. dolžina:"