Merge branch 'master' into merge_master

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

mayan/apps/smart_settings/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:05-0400\n"
-"PO-Revision-Date: 2017-09-22 13:31+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"PO-Revision-Date: 2018-08-09 10:42+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,11 +20,11 @@ msgstr ""
 
 #: apps.py:18 permissions.py:7
 msgid "Smart settings"
-msgstr ""
+msgstr "Pametne postavke"
 
 #: apps.py:26
 msgid "Setting count"
-msgstr ""
+msgstr "Podešavanje brojanja"
 
 #: apps.py:30
 msgid "Name"
@@ -39,18 +40,18 @@ msgstr "Postavke"
 
 #: permissions.py:10
 msgid "View settings"
-msgstr ""
+msgstr "Pogledajte postavke"
 
 #: views.py:15
 msgid "Setting namespaces"
-msgstr ""
+msgstr "Postavljanje prostornih imena"
 
 #: views.py:29
 #, python-format
 msgid "Settings in namespace: %s"
-msgstr ""
+msgstr "Postavke u prostoru imena: %s"
 
 #: views.py:37
 #, python-format
 msgid "Namespace: %s, not found"
-msgstr ""
+msgstr "Prostor imena: %s, nije pronađen"