Resolved conflicts

operez-ddgi · operez-ddgi · commit a58adad84feb · 2019-01-15T16:30:42.000+01:00
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -8,7 +8,9 @@ en:
   decidim:
     authorization_handlers:
       file_authorization_handler:
-        explanation: Authorize your user account against the Municipality Census
+        name: Organization's Census
+        explanation: Authorize your user account against Organization's Census
+        type: CSV
         fields:
           birthdate: Birthdate
         name: Municipality Census
