Merge branch 'master' into merge_master

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/sources/locale/da/LC_MESSAGES/django.po

@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-07 21:05-0400\n"
-"PO-Revision-Date: 2018-06-08 01:09+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"PO-Revision-Date: 2018-07-30 08:52+0000\n"
+"Last-Translator: Rasmus Kierudsen <tebrasso@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/rosarior/mayan-edms/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,7 +103,7 @@ msgstr ""
 
 #: links.py:86 links.py:100
 msgid "Delete"
-msgstr ""
+msgstr "Slet"
 
 #: links.py:90
 msgid "Edit"
@@ -604,7 +604,7 @@ msgstr ""
 
 #: views.py:570
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: wizards.py:86
 msgid "Select document type"

mayan/apps/sources/views.py

@@ -280,7 +280,7 @@ class UploadInteractiveView(UploadBaseView):
                 messages.success(
                     self.request,
                     _(
-                        'New document queued for uploaded and will be available '
+                        'New document queued for upload and will be available '
                         'shortly.'
                     )
                 )
@@ -415,7 +415,7 @@ class UploadInteractiveVersionView(UploadBaseView):
             messages.success(
                 self.request,
                 _(
-                    'New document version queued for uploaded and will be '
+                    'New document version queued for upload and will be '
                     'available shortly.'
                 )
             )