Merge branch 'master' into merge_master

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

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

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Atdhe Tabaku <Atdhe617@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-07 21:04-0400\n"
-"PO-Revision-Date: 2015-08-20 19:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-08-09 10:44+0000\n"
+"Last-Translator: Atdhe Tabaku <Atdhe617@gmail.com>\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: apps.py:10 settings.py:10
 msgid "Lock manager"
-msgstr ""
+msgstr "Upravitelj brave"
 
 #: models.py:14
 msgid "Creation datetime"
-msgstr ""
+msgstr "Vrijeme kreiranja"
 
 #: models.py:17
 msgid "Timeout"
-msgstr ""
+msgstr "Timeout"
 
 #: models.py:20
 msgid "Name"
@@ -35,8 +36,8 @@ msgstr "Ime"
 
 #: models.py:26
 msgid "Lock"
-msgstr ""
+msgstr "Zaključano"
 
 #: models.py:27
 msgid "Locks"
-msgstr ""
+msgstr "Brave"