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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 7faa3f1c5b33820dfde18fe379c30a961f905830..2d99074c6e36f98e26e1b30a7b6fa37d547bf7e2 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -303,7 +303,6 @@ fur:
         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
@@ -1361,7 +1360,7 @@ fur:
       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:
@@ -1511,14 +1510,16 @@ fur:
     go_public:
       flash success: Ducj i tiei cambiaments a son cumò publics e tu puedis za scomençâ
         a lavorâ.
-    index:
-      title: Utents
-      heading: Utents
-      summary_html: '%{name} creât di %{ip_address} ai %{date}'
-      summary_no_ip_html: '%{name} creât ai %{date}'
-    page:
-      confirm: Conferme i utents selezionâts
-      hide: Plate i utents selezionâts
+    lists:
+      show:
+        title: Utents
+        heading: Utents
+      page:
+        confirm: Conferme i utents selezionâts
+        hide: Plate i utents selezionâts
+      user:
+        summary_html: '%{name} creât di %{ip_address} ai %{date}'
+        summary_no_ip_html: '%{name} creât ai %{date}'
     suspended:
       support: assistence
     auth_failure:
@@ -1560,7 +1561,6 @@ fur:
       reason: 'Reson dal bloc:'
       revoker: 'Chel che al à revocât:'
     block:
-      not_revoked: (no revocât)
       show: Mostre
       edit: Cambie
     page:
@@ -1568,7 +1568,6 @@ fur:
       creator_name: Creadôr
       reason: Reson dal bloc
       status: Stât
-      revoker_name: Revocât di
   user_mutes:
     index:
       table: