diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 51ee7f56a..cea6cca16 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -19,8 +19,11 @@ class DocumentsController < ApplicationController
   end
 
   def destroy
-    @document.destroy
-    flash[:notice] = t "documents.actions.destroy.notice"
+    if @document.destroy
+      flash[:notice] = t "documents.actions.destroy.notice"
+    else
+      flash[:alert] = t "documents.actions.destroy.alert"
+    end
     redirect_to params[:from]
   end
 
diff --git a/app/models/document.rb b/app/models/document.rb
index ea978da21..d4938dbbe 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -28,7 +28,7 @@ class Document < ActiveRecord::Base
   def validate_attachment_content_type
     if documentable.present? &&
        !documentable.class.accepted_content_types.include?(attachment_content_type)
-      errors[:attachment] = I18n.t("documents.errors.messages.content_type",
+      errors[:attachment] = I18n.t("documents.errors.messages.wrong_content_type",
                                     content_type: attachment_content_type,
                                     accepted_content_types: documentable.class.accepted_content_types.join(", "))
     end
diff --git a/app/views/documents/_document.html.erb b/app/views/documents/_document.html.erb
index a33de3bb0..6a910385b 100644
--- a/app/views/documents/_document.html.erb
+++ b/app/views/documents/_document.html.erb
@@ -9,7 +9,7 @@
     <% if can? :destroy, Document %>
       <%= link_to t('documents.buttons.destroy_document'),
                     document_path(document, from: request.url), method: :delete,
-                    data: { confirm: "¿Está segurto de que desea eliminar el documento?. Esta acción no se puede deshacer." },
+                    data: { confirm: t('documents.actions.destroy.alert') },
                     class: 'button hollow alert' %>
     <% end %>
   </td>
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index ee992ca2b..05a8abf6c 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -37,6 +37,7 @@ data:
     - config/locales/%{locale}/officing.yml
     - config/locales/%{locale}/budgets.yml
     - config/locales/%{locale}/legislation.yml
+    - config/locales/%{locale}/documents.yml
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules