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

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

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index a03dc593664f0fb84033818e1bfa6e3e8dc94142..f50460fdfa77d342526313a6cfaf01fe1a173d60 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -314,8 +314,6 @@ sh:
       confirm: Potvrdi
     location:
       location: 'Lokacija:'
       confirm: Potvrdi
     location:
       location: 'Lokacija:'

-      view: Prikaži
-      edit: Uredi

     feed:
       user:
         title: Zapisi dnevnika od korisnika %{user}
     feed:
       user:
         title: Zapisi dnevnika od korisnika %{user}


@@ -561,14 +559,12 @@ sh:
       image size hint: (kvadratne slike od barem 100x100 piksela su najbolje)
   sessions:
     new:
       image size hint: (kvadratne slike od barem 100x100 piksela su najbolje)
   sessions:
     new:

-      title: Prijava

       tab_title: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava
       tab_title: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava

-      register now: Registrirajte se sada

       with external: 'Ili koristite vanjski servis:'
       auth failure: Žao nam je, ne možemo vas prijaviti s ovim detaljima.
     suspended_flash:
       with external: 'Ili koristite vanjski servis:'
       auth failure: Žao nam je, ne možemo vas prijaviti s ovim detaljima.
     suspended_flash: