Merge branch 'master' into merge_master

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

mayan/apps/task_manager/locale/bs_BA/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-07 21:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: www.ping.ba <jomer@ping.ba>, 2017\n"
+"Last-Translator: Ilvana Dollaroviq <ilvanadollaroviq@gmail.com>, 2018\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (https://www.transifex.com/rosarior/teams/13584/bs_BA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: apps.py:24 links.py:11 permissions.py:7
 msgid "Task manager"
-msgstr ""
+msgstr "Menadzer rada"
 
 #: apps.py:30
 msgid "Label"
@@ -32,80 +32,80 @@ msgstr "Ime"
 
 #: apps.py:36
 msgid "Default queue?"
-msgstr ""
+msgstr "Default queue?"
 
 #: apps.py:42
 msgid "Is transient?"
-msgstr ""
+msgstr "Da li je prolazan?"
 
 #: apps.py:48
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #: apps.py:51
 msgid "Start time"
-msgstr ""
+msgstr "Početno vrijeme"
 
 #: apps.py:54
 msgid "Host"
-msgstr ""
+msgstr "Domaćin"
 
 #: apps.py:58
 msgid "Acknowledged"
-msgstr ""
+msgstr "Priznato"
 
 #: apps.py:64
 msgid "Arguments"
-msgstr ""
+msgstr "Argumenti"
 
 #: apps.py:68
 msgid "Keyword arguments"
-msgstr ""
+msgstr "Argumenti ključnih riječi"
 
 #: apps.py:72
 msgid "Worker process ID"
-msgstr ""
+msgstr "Id procesa rada"
 
 #: links.py:15 views.py:15
 msgid "Background task queues"
-msgstr ""
+msgstr "Rad u pozadini"
 
 #: links.py:19
 msgid "Active tasks"
-msgstr ""
+msgstr "Aktivni zadaci"
 
 #: links.py:23
 msgid "Reserved tasks"
-msgstr ""
+msgstr "Rezervisani zadaci"
 
 #: links.py:27
 msgid "Scheduled tasks"
-msgstr ""
+msgstr "Zakazani zadaci"
 
 #: permissions.py:10
 msgid "View tasks"
-msgstr ""
+msgstr "Pogledati zadatke"
 
 #: tests/literals.py:5
 msgid "Test queue"
-msgstr ""
+msgstr "Ispitni red"
 
 #: views.py:30
 #, python-format
 msgid "Active tasks in queue: %s"
-msgstr ""
+msgstr "Aktivni zadaci u redu: %s"
 
 #: views.py:42
 #, python-format
 msgid "Unable to retrieve task list; %s"
-msgstr ""
+msgstr "Nije moguće preuzeti listu zadataka; %s"
 
 #: views.py:55
 #, python-format
 msgid "Scheduled tasks in queue: %s"
-msgstr ""
+msgstr "Planirani zadaci u redu: %s"
 
 #: views.py:67
 #, python-format
 msgid "Reserved tasks in queue: %s"
-msgstr ""
+msgstr "Rezervisani zadaci u redu: %s"

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

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-07 21:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Mads L. Nielsen <sirlundgaard@gmail.com>, 2017\n"
+"Last-Translator: Rasmus Kierudsen <tebrasso@gmail.com>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/rosarior/teams/13584/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr ""
 
 #: apps.py:48
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: apps.py:51
 msgid "Start time"