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

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

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1a17de400f9a8e44ada4c9f2a67422a685994fd4..c5bada9ae40e3f298fa61446a9d00ccbf73086c8 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -412,7 +412,6 @@ sl:
         way: Pot
         relation: Relacija
     containing_relation:
         way: Pot
         relation: Relacija
     containing_relation:

-      entry_html: Relacija %{relation_name}

       entry_role_html: Relacija %{relation_name} (kot %{relation_role})
     not_found:
       title: Ni najdeno
       entry_role_html: Relacija %{relation_name} (kot %{relation_role})
     not_found:
       title: Ni najdeno


@@ -1518,7 +1517,6 @@ sl:
         other: '%{count} poročil'
       reported_item: Prijavljeni predmet
     show:
         other: '%{count} poročil'
       reported_item: Prijavljeni predmet
     show:

-      title: '%{status} Težava #%{issue_id}'

       reports:
         one: '%{count} prijava'
         two: '%{count} prijavi'
       reports:
         one: '%{count} prijava'
         two: '%{count} prijavi'


@@ -2580,7 +2578,7 @@ sl:
       upload_trace: Naloži sled GPS
       all_traces: Vse sledi
       my_traces: Moje sledi
       upload_trace: Naloži sled GPS
       all_traces: Vse sledi
       my_traces: Moje sledi

-      traces_from: Javne sledi uporabnika %{user}
+      traces_from_html: Javne sledi uporabnika %{user}

       remove_tag_filter: Odstrani filter oznak
     destroy:
       scheduled_for_deletion: Sled bo izbrisana
       remove_tag_filter: Odstrani filter oznak
     destroy:
       scheduled_for_deletion: Sled bo izbrisana


@@ -2970,7 +2968,6 @@ sl:
       reason: 'Razlog za blokiranje:'
       revoker: 'Preklical:'
     block:
       reason: 'Razlog za blokiranje:'
       revoker: 'Preklical:'
     block:

-      not_revoked: (ni preklicano)

       show: Prikaži
       edit: Uredi
     page:
       show: Prikaži
       edit: Uredi
     page:


@@ -2978,7 +2975,6 @@ sl:
       creator_name: Ustvarjalec
       reason: Razlog za blokiranje
       status: Stanje
       creator_name: Ustvarjalec
       reason: Razlog za blokiranje
       status: Stanje

-      revoker_name: Preklical

     navigation:
       block: 'Blokiraj #%{id}'
   user_mutes:
     navigation:
       block: 'Blokiraj #%{id}'
   user_mutes: