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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 7faa3f1c5b33820dfde18fe379c30a961f905830..90d1490c3abb819b4c847c6505a3dcde5370ec5d 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -303,7 +303,6 @@ fur:
         way: Vie
         relation: Relazion
     containing_relation:
         way: Vie
         relation: Relazion
     containing_relation:

-      entry_html: Relazion %{relation_name}

       entry_role_html: Relazion %{relation_name} (come %{relation_role})
     not_found:
       title: No cjatât
       entry_role_html: Relazion %{relation_name} (come %{relation_role})
     not_found:
       title: No cjatât


@@ -1361,7 +1360,7 @@ fur:
       upload_trace: Cjame un percors
       all_traces: Ducj i percors
       my_traces: I miei percors
       upload_trace: Cjame un percors
       all_traces: Ducj i percors
       my_traces: I miei percors

-      traces_from: Percors publics di %{user}
+      traces_from_html: Percors publics di %{user}

     georss:
       title: Percors GPS di OpenStreetMap
     description:
     georss:
       title: Percors GPS di OpenStreetMap
     description:


@@ -1560,7 +1559,6 @@ fur:
       reason: 'Reson dal bloc:'
       revoker: 'Chel che al à revocât:'
     block:
       reason: 'Reson dal bloc:'
       revoker: 'Chel che al à revocât:'
     block:

-      not_revoked: (no revocât)

       show: Mostre
       edit: Cambie
     page:
       show: Mostre
       edit: Cambie
     page:


@@ -1568,7 +1566,6 @@ fur:
       creator_name: Creadôr
       reason: Reson dal bloc
       status: Stât
       creator_name: Creadôr
       reason: Reson dal bloc
       status: Stât

-      revoker_name: Revocât di

   user_mutes:
     index:
       table:
   user_mutes:
     index:
       table: