Merge branch 'master' into user-recomendations

config/i18n-tasks.yml

@@ -21,7 +21,7 @@ data:
     # - config/locales/**/*.%{locale}.yml
     ## Another gem (replace %#= with %=):
     # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
-    - config/locales/custom/%{locale}/custom.yml
+    - config/locales/custom/%{locale}/*.yml
     - config/locales/%{locale}/general.yml
     - config/locales/%{locale}/activerecord.yml
     - config/locales/%{locale}/activemodel.yml

config/locales/en/general.yml

@@ -441,6 +441,7 @@ en:
       embed_video_title: "Video on %{proposal}"
       title_external_url: "Additional documentation"
       title_video_url: "External video"
+      author: Author
     update:
       form:
         submit_button: Save changes

config/locales/es/general.yml

@@ -441,6 +441,7 @@ es:
       embed_video_title: "Vídeo en %{proposal}"
       title_external_url: "Documentación adicional"
       title_video_url: "Vídeo externo"
+      author: Autor
     update:
       form:
         submit_button: Guardar cambios