Merge branch 'master' into feature/merge_master

Conflicts: docs/releases/index.rst mayan/__init__.py mayan/apps/acls/south_migrations/0001_initial.py mayan/apps/acls/south_migrations/0002_auto__del_field_creatorsingleton_lock_id.py mayan/apps/checkouts/south_migrations/0001_initial.py mayan/apps/checkouts/south_migrations/0002_auto__add_field_documentcheckout_user_content_type__add_field_document.py mayan/apps/checkouts/south_migrations/0003_auto__chg_field_documentcheckout_checkout_datetime.py mayan/apps/checkouts/urls.py mayan/apps/common/forms.py mayan/apps/common/locale/ar/LC_MESSAGES/django.po mayan/apps/common/locale/bg/LC_MESSAGES/django.po mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po mayan/apps/common/locale/da/LC_MESSAGES/django.po mayan/apps/common/locale/de_CH/LC_MESSAGES/django.po mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po mayan/apps/common/locale/en/LC_MESSAGES/django.po mayan/apps/common/locale/es/LC_MESSAGES/django.po mayan/apps/common/locale/fa/LC_MESSAGES/django.po mayan/apps/common/locale/fr/LC_MESSAGES/django.po mayan/apps/common/locale/hr_HR/LC_MESSAGES/django.po mayan/apps/common/locale/hu/LC_MESSAGES/django.po mayan/apps/common/locale/id/LC_MESSAGES/django.po mayan/apps/common/locale/it/LC_MESSAGES/django.po mayan/apps/common/locale/lv/LC_MESSAGES/django.po mayan/apps/common/locale/nb/LC_MESSAGES/django.po mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po mayan/apps/common/locale/pl/LC_MESSAGES/django.po mayan/apps/common/locale/pt/LC_MESSAGES/django.po mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po mayan/apps/common/locale/ru/LC_MESSAGES/django.po mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po mayan/apps/common/locale/sq/LC_MESSAGES/django.po mayan/apps/common/locale/tr_TR/LC_MESSAGES/django.po mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po mayan/apps/common/locale/zh_CN/LC_MESSAGES/django.po mayan/apps/common/locale/zh_TW/LC_MESSAGES/django.po mayan/apps/common/south_migrations/0001_initial.py mayan/apps/common/south_migrations/0002_auto__add_autoadminsingleton.py mayan/apps/common/south_migrations/0003_auto__del_field_autoadminsingleton_original_auto_admin_password__del_f.py mayan/apps/common/south_migrations/0004_auto__del_field_autoadminsingleton_auto_admin_password__del_field_auto.py mayan/apps/common/south_migrations/0005_auto__del_field_autoadminsingleton_lock_id__del_field_anonymoususersin.py mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py mayan/apps/common/south_migrations/0010_create_locale_profiles.py mayan/apps/common/urls.py mayan/apps/common/views.py mayan/apps/converter/models.py mayan/apps/document_comments/models.py mayan/apps/document_indexing/south_migrations/0004_auto__add_documentrenamecount.py mayan/apps/document_indexing/south_migrations/0005_auto__add_unique_index_name__add_unique_index_title.py mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py mayan/apps/document_signatures/south_migrations/0001_initial.py mayan/apps/document_signatures/south_migrations/0002_move_signatures_to_new_app.py mayan/apps/document_signatures/south_migrations/0003_auto__add_field_documentversionsignature_has_embedded_signature.py mayan/apps/document_signatures/south_migrations/0004_embedded_signature_state_copy.py mayan/apps/document_signatures/south_migrations/0005_auto__del_field_documentversionsignature_signature_state.py mayan/apps/document_states/__init__.py mayan/apps/document_states/south_migrations/0001_initial.py mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py mayan/apps/document_states/urls.py mayan/apps/documents/__init__.py mayan/apps/documents/links.py mayan/apps/documents/south_migrations/0001_initial.py mayan/apps/documents/south_migrations/0002_filename_extension_merge.py mayan/apps/documents/south_migrations/0003_auto__del_field_document_file_extension.py mayan/apps/documents/south_migrations/0004_auto__add_documentversion__add_unique_documentversion_document_mayor_m.py mayan/apps/documents/south_migrations/0005_document_versions.py mayan/apps/documents/south_migrations/0006_fix_invalid_document_version_id_keys.py mayan/apps/documents/south_migrations/0007_remove_old_file_fields.py mayan/apps/documents/south_migrations/0008_fix_mayor_field_name.py mayan/apps/documents/south_migrations/0009_add_comment_field.py mayan/apps/documents/south_migrations/0010_auto__chg_field_document_date_added.py mayan/apps/documents/south_migrations/0011_auto__add_field_documentversion_signature_state.py mayan/apps/documents/south_migrations/0012_auto__add_field_documentversion_signature_file.py mayan/apps/documents/south_migrations/0013_auto__del_field_documentversion_signature_file__del_field_documentvers.py mayan/apps/documents/south_migrations/0014_change_document_mimetype_encoding_null.py mayan/apps/documents/south_migrations/0015_auto__add_unique_documenttype_name.py mayan/apps/documents/south_migrations/0017_auto__chg_field_documentversion_mimetype.py mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py mayan/apps/documents/south_migrations/0019_auto__add_index_documentversion_timestamp.py mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py mayan/apps/documents/south_migrations/0021_auto__del_field_documentversion_serial__del_field_documentversion_rele.py mayan/apps/documents/south_migrations/0022_set_doc_type.py mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py mayan/apps/documents/south_migrations/0024_auto__add_field_documenttype_ocr.py mayan/apps/documents/south_migrations/0025_auto__add_field_document_language.py mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py mayan/apps/documents/south_migrations/0027_move_filename_to_label.py mayan/apps/documents/south_migrations/0028_auto__del_field_documentversion_filename.py mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py mayan/apps/dynamic_search/south_migrations/0001_initial.py mayan/apps/dynamic_search/south_migrations/0002_auto__chg_field_recentsearch_datetime_created__add_index_recentsearch_.py mayan/apps/dynamic_search/templatetags/search_tags.py mayan/apps/events/south_migrations/0001_initial.py mayan/apps/events/south_migrations/0002_migrate_history_data.py mayan/apps/folders/models.py mayan/apps/folders/south_migrations/0001_initial.py mayan/apps/folders/south_migrations/0002_increase_title_size.py mayan/apps/folders/south_migrations/0004_m2m_fields.py mayan/apps/folders/south_migrations/0005_auto__del_folderdocument.py mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py mayan/apps/history/models.py mayan/apps/history/south_migrations/0001_initial.py mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py mayan/apps/installation/__init__.py mayan/apps/installation/models.py mayan/apps/installation/south_migrations/0001_initial.py mayan/apps/installation/south_migrations/0002_auto__del_field_installation_lock_id.py mayan/apps/installation/south_migrations/0003_auto__del_field_installation_is_first_run.py mayan/apps/linking/south_migrations/0001_initial.py mayan/apps/linking/south_migrations/0003_auto__chg_field_smartlinkcondition_foreign_document_data.py mayan/apps/linking/urls.py mayan/apps/lock_manager/south_migrations/0001_initial.py mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py mayan/apps/mailer/models.py mayan/apps/main/locale/ar/LC_MESSAGES/django.po mayan/apps/main/locale/bg/LC_MESSAGES/django.po mayan/apps/main/locale/bs_BA/LC_MESSAGES/django.po mayan/apps/main/locale/da/LC_MESSAGES/django.po mayan/apps/main/locale/de_CH/LC_MESSAGES/django.po mayan/apps/main/locale/de_DE/LC_MESSAGES/django.po mayan/apps/main/locale/en/LC_MESSAGES/django.po mayan/apps/main/locale/es/LC_MESSAGES/django.po mayan/apps/main/locale/fa/LC_MESSAGES/django.po mayan/apps/main/locale/fr/LC_MESSAGES/django.po mayan/apps/main/locale/hr_HR/LC_MESSAGES/django.po mayan/apps/main/locale/hu/LC_MESSAGES/django.po mayan/apps/main/locale/id/LC_MESSAGES/django.po mayan/apps/main/locale/it/LC_MESSAGES/django.po mayan/apps/main/locale/lv/LC_MESSAGES/django.po mayan/apps/main/locale/nb/LC_MESSAGES/django.po mayan/apps/main/locale/nl_NL/LC_MESSAGES/django.po mayan/apps/main/locale/pl/LC_MESSAGES/django.po mayan/apps/main/locale/pt/LC_MESSAGES/django.po mayan/apps/main/locale/pt_BR/LC_MESSAGES/django.po mayan/apps/main/locale/ro_RO/LC_MESSAGES/django.po mayan/apps/main/locale/ru/LC_MESSAGES/django.po mayan/apps/main/locale/sl_SI/LC_MESSAGES/django.po mayan/apps/main/locale/sq/LC_MESSAGES/django.po mayan/apps/main/locale/tr_TR/LC_MESSAGES/django.po mayan/apps/main/locale/vi_VN/LC_MESSAGES/django.po mayan/apps/main/locale/zh_CN/LC_MESSAGES/django.po mayan/apps/main/locale/zh_TW/LC_MESSAGES/django.po mayan/apps/main/models.py mayan/apps/main/templates/main/about.html mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html mayan/apps/main/urls.py mayan/apps/metadata/south_migrations/0002_auto__add_unique_metadataset_title.py mayan/apps/metadata/south_migrations/0003_auto__chg_field_metadatatype_lookup.py mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py mayan/apps/mimetype/models.py mayan/apps/navigation/classes.py mayan/apps/navigation/forms.py mayan/apps/navigation/models.py mayan/apps/ocr/api.py mayan/apps/ocr/south_migrations/0001_initial.py mayan/apps/ocr/south_migrations/0002_auto__del_field_documentqueue_state__del_field_queuedocument_delay__de.py mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py mayan/apps/permissions/south_migrations/0001_initial.py mayan/apps/permissions/south_migrations/0002_auto__add_storedpermission__add_unique_storedpermission_namespace_name.py mayan/apps/permissions/south_migrations/0003_clear_permission_holders.py mayan/apps/permissions/south_migrations/0004_auto__del_permission__del_unique_permission_namespace_name.py mayan/apps/permissions/widgets.py mayan/apps/project_setup/__init__.py mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.po mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.po mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.po mayan/apps/project_setup/locale/da/LC_MESSAGES/django.po mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.po mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.po mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po mayan/apps/project_setup/locale/es/LC_MESSAGES/django.po mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.po mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.po mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.po mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.po mayan/apps/project_setup/locale/id/LC_MESSAGES/django.po mayan/apps/project_setup/locale/it/LC_MESSAGES/django.po mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.po mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.po mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.po mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.po mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.po mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.po mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.po mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.po mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.po mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.po mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.po mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.po mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.po mayan/apps/project_setup/models.py mayan/apps/project_setup/urls.py mayan/apps/project_tools/__init__.py mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.po mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.po mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.po mayan/apps/project_tools/locale/da/LC_MESSAGES/django.po mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.po mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.po mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po mayan/apps/project_tools/locale/es/LC_MESSAGES/django.po mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.po mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.po mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.po mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.po mayan/apps/project_tools/locale/id/LC_MESSAGES/django.po mayan/apps/project_tools/locale/it/LC_MESSAGES/django.po mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.po mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.po mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.po mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.po mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.po mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.po mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.po mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.po mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.po mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.po mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.po mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.po mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.po mayan/apps/project_tools/models.py mayan/apps/project_tools/urls.py mayan/apps/rest_api/models.py mayan/apps/smart_settings/models.py mayan/apps/sources/south_migrations/0001_initial.py mayan/apps/sources/south_migrations/0002_preview_width_required.py mayan/apps/sources/south_migrations/0003_auto__del_field_stagingfolder_icon__del_field_webform_icon.py mayan/apps/sources/south_migrations/0004_auto__del_stagingfolder__del_webform__del_watchfolder__del_outofproces.py mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py mayan/apps/sources/south_migrations/0007_set_doc_type.py mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py mayan/apps/sources/south_migrations/0009_auto__del_watchfoldersource__chg_field_intervalbasemodel_document_type.py mayan/apps/sources/south_migrations/0010_auto__add_watchfoldersource.py mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py mayan/apps/storage/models.py mayan/apps/tags/south_migrations/0001_initial.py mayan/apps/tags/south_migrations/0003_remove_taggit.py mayan/apps/tags/south_migrations/0005_auto__add_unique_tag_label.py mayan/apps/tags/south_migrations/0006_auto__del_tagproperties.py mayan/apps/user_management/models.py mayan/settings/base.py mayan/urls.py requirements/common.txt
2015-06-01 23:20:17 -04:00
parent 2e6b243dcf 774a018912
commit ce3cf144d5
759 changed files with 4867 additions and 4457 deletions
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,20 @@
+1.1.1 (2015-05-21)
+==================
+
+- Update to Django 1.6.11
+- Fix make_dist.sh script
+- Add test for issue #163
+- Activate tests for the sources app
+- Removal of the registration app
+- New simplified official project description
+- Improvements to the index admin interface
+- Removal of installation statistics gathering
+- Remove unused folder tag
+- Fix usage of ugettext to ugettext_lazy
+- Increase size of the lock name field
+- New style documentation
+
+
 1.1 (2015-02-10)
 ================

--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst LICENSE HISTORY.rst
 recursive-include mayan README *.txt *.html *.css *.ico *.png *.jpg *.js *.po *.mo *.ttf
-global-exclude settings_local.* mayan.sqlite* db.sqlite* mayan/media gpg_home document_storage image_cache
+global-exclude mayan/settings/local.py mayan/settings/travis/* settings_local.* mayan.sqlite* db.sqlite* mayan/media gpg_home document_storage image_cache
--- a/README.rst
+++ b/README.rst
@@ -24,6 +24,10 @@ Free Open Source Electronic Document Management System.

 |Animation|

+Support
+-------
+Help support further improvements and development by donating at: https://www.patreon.com/siloraptor
+
 License
 -------

--- a/2
+++ b/2
@@ -7,6 +7,6 @@ Vagrant.configure(2) do |config|
  config.vm.synced_folder ".", "/mayan-edms-repository"
  config.vm.provision :shell, :path => "contrib/scripts/install/development.sh", privileged: false

-  config.vm.provision "file", destination: "/home/vagrant/mayan-edms/mayan/settings/celery_redis.py", source: "contrib/configs/celery_redis.py"
+  config.vm.provision "file", destination: "/home/vagrant/mayan-edms/mayan/settings/celery_redis.py", source: "contrib/settings/celery_redis.py"
  config.vm.provision "file", destination: "/home/vagrant/mayan-edms/mayan_edms_worker.sh", source: "contrib/misc/mayan_edms_worker.sh"
 end
--- a/contrib/settings/celery_redis.py
+++ b/contrib/settings/celery_redis.py
--- a/docs/_static/logo_pyramid_only.png
+++ b/docs/_static/logo_pyramid_only.png
--- a/docs/_templates/donate.html
+++ b/docs/_templates/donate.html
@@ -0,0 +1,4 @@
+<h3>Donate</h3>
+<p>
+Help support further improvements and development by donating on: <a href="https://www.patreon.com/siloraptor">Patreon</a>
+</p>
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 #
 # Mayan EDMS documentation build configuration file, created by
 # sphinx-quickstart on Fri Aug 19 05:13:38 2011.
@@ -43,7 +45,7 @@ source_suffix = '.rst'
 # source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = 'contents'
+master_doc = 'index'

 # General information about the project.
 project = mayan.__title__
@@ -98,7 +100,7 @@ pygments_style = 'sphinx'

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'classic'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -185,8 +187,8 @@ htmlhelp_basename = 'MayanEDMSdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'MayanEDMS.tex', u'Mayan EDMS Documentation',
-   u'Roberto Rosario', 'manual'),
+  ('index', 'MayanEDMS.tex', 'Mayan EDMS Documentation',
+   mayan.__author__, 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
@@ -218,6 +220,29 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mayanedms', u'Mayan EDMS Documentation',
-     [u'Roberto Rosario'], 1)
+    ('index', 'mayanedms', 'Mayan EDMS Documentation',
+     [mayan.__author__], 1)
 ]
+
+
+# -- Custom options
+import alabaster
+
+html_theme_path = [alabaster.get_path()]
+extensions = ['alabaster']
+html_theme = 'alabaster'
+html_sidebars = {
+    '**': [
+        'about.html', 'navigation.html', 'searchbox.html', 'donate.html',
+    ]
+}
+html_theme_options = {
+    'description': 'Free Open Source Electronic Document Management System',
+    'github_user': 'mayan-edms',
+    'github_repo': 'mayan-edms',
+    'travis_button': True,
+    'gratipay_user': 'rosarior',
+    'github_banner': True,
+}
+
+html_logo = '_static/logo_pyramid_only.png'
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -1,16 +0,0 @@
-.. _contents:
-
-========
-Contents
-========
-
-.. toctree::
-    :hidden:
-
-    index
-
-.. toctree::
-    :maxdepth: 3
-
-    topics/index
-    releases/index
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,60 +1,41 @@
-.. _index:
+Welcome to Mayan EDMS!
+======================

-========================
-Mayan EDMS documentation
-========================
+**Mayan EDMS** is a `Free Open Source`_ `Electronic Document Management System`_, coded in
+the Python language using the Django_ web application framework and released
+under the `Apache 2.0 License`_. It provides an electronic vault or repository for electronic documents.

-.. rubric:: `Open source`_ `electronic document management system`_.
+The easiest way to install and try **Mayan EDMS** is by using a Debian based Linux distribution
+and installing it from PyPI with the following commands:

-Getting help
-============
+.. code-block:: bash

-* Search for information in the `archives of the mayan-edms mailing list`_, or
-  `post a question`_.  If you prefer news servers, use the gateway provided by Gmane_.
-* Report bugs with **Mayan EDMS** using Github's `ticket tracker`_.
-* Try the :doc:`FAQ <topics/faq>` -- it's got answers to many common questions.
+    $ sudo apt-get install libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gpgv python-dev python-virtualenv tesseract-ocr unpaper poppler-utils -y
+    $ virtualenv venv
+    $ source venv/bin/activate
+    $ pip install mayan-edms
+    $ mayan-edms.py initialsetup
+    $ mayan-edms.py runserver

+Point your browser to 127.0.0.1:8000 and use the automatically created admin
+account.

-First steps
-===========
+.. toctree::
+    :hidden:

-  :doc:`Features <topics/features>` |
-  :doc:`Installation <topics/installation>` |
-  :doc:`Getting started <topics/getting_started>`
-
-Understanding Mayan EDMS
-========================
-
-  :doc:`File storage <topics/file_storage>` |
-  :doc:`Permission system <topics/permissions>` |
-  :doc:`Transformations <topics/transformations>` |
-  :doc:`Document versioning <topics/versioning>` |
-  :doc:`Document signatures <topics/signatures>` |
-  :doc:`Indexes <topics/indexes>` |
-  :doc:`Smart links <topics/smart_links>` |
-  :doc:`Tags <topics/tags>` |
-
-Release notes
-=============
-
-  :doc:`Release notes and upgrading instructions <releases/index>`
-
-For developers
-==============
-
-  :doc:`Development <topics/development>`
-
-Credits
-=======
-
-  :doc:`Contributors <topics/contributors>` |
-  :doc:`Licensing <topics/license>`
+    Features <topics/features>
+    Installation <topics/installation>
+    Getting started <topics/getting_started>
+    Release notes and upgrading <releases/index>
+    Concepts <topics/index>
+    Development <topics/development>
+    Contributors <topics/contributors>
+    Licensing <topics/license>
+    FAQ <topics/faq>
+    Contact <topics/contact>


 .. _Django: http://www.djangoproject.com/
-.. _Gmane: http://news.gmane.org/gmane.comp.python.django.mayan-edms
-.. _Open source: http://en.wikipedia.org/wiki/Open_source
-.. _archives of the mayan-edms mailing list: http://groups.google.com/group/mayan-edms/
-.. _electronic document management system: https://en.wikipedia.org/wiki/Document_management_system
-.. _post a question: http://groups.google.com/group/mayan-edms
-.. _ticket tracker: https://github.com/mayan-edms/mayan-edms/issues
+.. _Free Open Source: http://en.wikipedia.org/wiki/Open_source
+.. _Electronic Document Management System: https://en.wikipedia.org/wiki/Document_management_system
+.. _Apache 2.0 License: https://www.apache.org/licenses/LICENSE-2.0.txt
--- a/docs/releases/0.12.rst
+++ b/docs/releases/0.12.rst
@@ -49,14 +49,14 @@ ACL support
  A more in-depth explanation of how this new ACL system can be found in
  the :doc:`3 tier access control <../topics/permissions>` section of the
  permissions chapter.
-  
+
 * Default class ACL support.  Administrators can setup the access control
  lists that new documents, folders and tags will automatically inheric
  when created.  Aside from asigning permission to users, groups and roles
  to specific objects, there is a special user called `Creator`, use to
  allow the access control list that the actual creator of an object will
-  inherit. 
-  
+  inherit.
+
 Anonymous user support
 ~~~~~~~~~~~~~~~~~~~~~~
 Anonymous user support is a two tier function, first is the addition of
@@ -78,32 +78,31 @@ Usability improvements
  erases the previous one.
 * Usability improvement in the role member's add/removal form, by using
  HTML's option groups tag property
-  
+
 2 Step download process
 ~~~~~~~~~~~~~~~~~~~~~~~
 The code for downloading single and multiple document and document versions
 has been merged with compression support also added.  This allows for the
 download of documents in their original format or compressed and well as
-the download of several documents in a single compressed file.   
+the download of several documents in a single compressed file.

 Customizable GPG home directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Addition of the :setting:`SIGNATURES_GPG_HOME` configuration option to let 
+Addition of the :setting:`SIGNATURES_GPG_HOME` configuration option to let
 administrators set **Mayan EDMS**'s GPG instance home directory, used to
 store keyrings and other GPG configuration files.

 Out of process bulk uploading
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 A management command has been added to help upload a large number of documents
-from a compressed file.  For information about this new feature check the 
-:doc:`Initial data loading <../topics/initial_import>` chapter.
+from a compressed file.  For information about this new feature check the Initial data loading chapter.
+

-  
 Out of process user import
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 A management command has been added to import a large number users
-from a CSV file.  More information about this new feature can also be found 
-in the :doc:`Initial data loading <../topics/initial_import>` chapter.
+from a CSV file.  More information about this new feature can also be found
+in the Initial data loading chapter.


 Refactored document indexing
@@ -123,7 +122,7 @@ mirrored on disk.

 Help shape Mayan EDMS's future
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Included in this version is a small feedback application, found under the 
+Included in this version is a small feedback application, found under the
 ``About`` main menu, where users by just answering some questions can
 help determine the priority of the next planned features on the pipeline,
 or even help add new features if enough requests are received.  All questions
@@ -169,7 +168,7 @@ When the following message appears
    If you're unsure, answer 'no'.

        Type 'yes' to continue, or 'no' to cancel:
-    
+
 Type ``yes`` and press **Enter**

 And continue migrating database schema with::
@@ -213,7 +212,7 @@ Bugs fixed
 ==========
 * Issue #17, special thanks to Dave Herring for all the help including
  access to a machine suffering with the issue, and to Sergei Glita for
-  his research and eventual find of the core cause. 
+  his research and eventual find of the core cause.
 * Statistics fixes.
 * Fixed get_image_cache_name regression in the OCR app.

@@ -221,12 +220,12 @@ Stuff removed
 =============
 * Support for Celery and Sentry has been drop
  for now.
-* Removed the 'db_index' argument from Text fields definition and 
+* Removed the 'db_index' argument from Text fields definition and
  migrations as it was causing error messages for MySQL users, thanks to
  Sergei Glita for reporting this one.
 * Configuration options removed:
-  
+
  * OCR_CACHE_URI
  * DOCUMENT_INDEXING_FILESYSTEM_FILESERVING_PATH - Use the newest :setting:`DOCUMENT_INDEXING_FILESYSTEM_SERVING`
  * DOCUMENT_INDEXING_FILESYSTEM_FILESERVING_ENABLE - Use the newest :setting:`DOCUMENT_INDEXING_FILESYSTEM_SERVING`
-   
+
--- a/docs/releases/1.1.1.rst
+++ b/docs/releases/1.1.1.rst
@@ -0,0 +1,72 @@
+===============================
+Mayan EDMS v1.1.1 release notes
+===============================
+
+Released: May 21, 2015
+
+What's new
+==========
+
+Update to Django 1.6.11
+~~~~~~~~~~~~~~~~~~~~~~~
+The required version of Django has been updated to version 1.6.11_.
+
+Minor changes
+~~~~~~~~~~~~~
+- Fix make_dist.sh script
+- Add test for issue #163
+- Activate tests for the sources app
+- Removal of the registration app
+- New simplified official project description
+- Improvements to the index admin interface
+- Removal of installation statistics gathering
+- Remove unused folder tag
+- Fix usage of ugettext to ugettext_lazy
+- Increase size of the lock name field
+- New style documentation
+
+Upgrading from a previous version
+=================================
+
+Using PIP
+~~~~~~~~~
+
+Type in the console::
+
+    $ pip install mayan-edms==1.1.1
+
+the requirements will also be updated.
+
+Using Git
+~~~~~~~~~
+
+If you installed Mayan EDMS by cloning the Git repository issue the commands::
+
+    $ git reset --hard HEAD
+    $ git pull
+
+otherwise download the compressed archived and uncompress it overriding the existing installation.
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+Common steps
+~~~~~~~~~~~~
+
+Add new static media::
+
+    $ mayan-edms.py collectstatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+=============================
+None
+
+Bugs fixed or issues closed
+===========================
+None
+
+.. _1.6.11: https://docs.djangoproject.com/en/1.8/releases/1.6.11/
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -17,26 +17,20 @@ Final releases
 Below are release notes through **Mayan EDMS** |version| and its minor releases. Newer
 versions of the documentation contain the release notes for any later releases.

-2.0 release
-----------
+2.0 series
+----------
 .. toctree::
   :maxdepth: 1

   2.0

-1.1 release
-----------
+1.0 series
+----------
 .. toctree::
   :maxdepth: 1

+   1.1.1
   1.1
-
-
-1.0 release
-----------
-.. toctree::
-   :maxdepth: 1
-
   1.0

 0.13 release
--- a/docs/topics/contact.rst
+++ b/docs/topics/contact.rst
@@ -0,0 +1,38 @@
+=======
+Contact
+=======
+
+
+FAQ
+---
+
+* Try the :doc:`FAQ <faq>` -- it's got answers to many common questions.
+
+Mailing list
+------------
+
+Search for information in the `archives of the mayan-edms mailing list`_, or
+`post a question`_.  If you prefer news servers, use the gateway provided by Gmane_.
+
+**Mayan EDMS** community developers do their best to reply to basic questions.
+Be sure to check the list archives as it may already containt the answers to your
+questions.
+
+Twitter
+-------
+
+**Mayan EDMS** has an official Twitter account, `@mayanedms
+<http://twitter.com/mayanedms>`_, which is used for announcements and occasional
+related news tidbits.
+
+
+Bugs/ticket tracker
+-------------------
+
+Report bugs with **Mayan EDMS** or search existing ones using Github's `ticket tracker`_.
+
+
+.. _archives of the mayan-edms mailing list: http://groups.google.com/group/mayan-edms/
+.. _post a question: http://groups.google.com/group/mayan-edms
+.. _ticket tracker: https://github.com/mayan-edms/mayan-edms/issues
+.. _Gmane: http://news.gmane.org/gmane.comp.python.django.mayan-edms
--- a/docs/topics/development.rst
+++ b/docs/topics/development.rst
@@ -481,7 +481,7 @@ This is the sequence of step I use to produce an installable package:

    $ rm dist -R

-2. Generate the packaged version (will produce dist/mayan-edms-1.1.0.tar.gz)::
+2. Generate the packaged version (will produce dist/mayan-edms-1.1.1.tar.gz)::

    $ python setup.py sdist

@@ -490,7 +490,7 @@ This is the sequence of step I use to produce an installable package:
    $ cd /tmp
    $ virtualenv venv
    $ source venv/bin/activate
-    $ pip install <path of the Git repository>/dist/mayan-edms-1.1.0.tar.gz
+    $ pip install <path of the Git repository>/dist/mayan-edms-1.1.1.tar.gz
    $ mayan-edms.py initialsetup
    $ mayan-edms.py runserver

@@ -504,13 +504,13 @@ Wheel package

 2. Create wheel package using the source file package (Until issue #99 of wheel is fixed: https://bitbucket.org/pypa/wheel/issue/99/cannot-exclude-directory)::

-    $ pip wheel --no-index --no-deps --wheel-dir dist dist/mayan-edms-1.1.0.tar.gz
+    $ pip wheel --no-index --no-deps --wheel-dir dist dist/mayan-edms-1.1.1.tar.gz

 3. Do a test install::

    $ cd /tmp
    $ virtualenv venv
    $ source venv/bin/activate
-    $ pip install <path of the Git repository>/dist/mayan_edms-1.1.0-py2-none-any.whl
+    $ pip install <path of the Git repository>/dist/mayan_edms-1.1.1-py2-none-any.whl
    $ mayan-edms.py initialsetup
    $ mayan-edms.py runserver
--- a/docs/topics/index.rst
+++ b/docs/topics/index.rst
@@ -1,23 +1,16 @@
-Using Mayan EDMS
-================
+Concepts
+========

 Introductions to all the key parts of Mayan EDMS you'll need to know:

 .. toctree::
   :maxdepth: 1

-   contributors
-   development
-   faq
-   features
   file_storage
-   getting_started
-   indexes
-   installation
-   license
   permissions
-   signatures
-   smart_links
-   tags
   transformations
   versioning
+   signatures
+   indexes
+   smart_links
+   tags
--- a/docs/topics/installation.rst
+++ b/docs/topics/installation.rst
@@ -118,8 +118,8 @@ to /usr/bin/ with ...
    GM_PATH = '/usr/local/bin/gm'
    LIBREOFFICE_PATH = '/Applications/LibreOffice.app/Contents/MacOS/soffice'

-Production use
--------------
+Testing the install
+-------------------

 To create a custom settings file for **Mayan EDMS**, create a Python (.py) file
 in the directory: venv/lib/python2.7/site-packages/mayan/settings/ with the following basic content::
@@ -128,7 +128,7 @@ in the directory: venv/lib/python2.7/site-packages/mayan/settings/ with the foll

    from __future__ import unicode_literals

-    from . import *
+    from .local import *

    <Your customized settings>

@@ -136,7 +136,12 @@ To test your settings launch **Mayan EDMS** using::

    $ mayan-edms.py runserver --settings=mayan.settings.my_settings

-After making sure everything is running correctly, stop the runserver command.
+Note: Background tasks and scheduled tasks will not run when using the test server.
+
+Production use
+--------------
+
+After making sure everything is running correctly, stop the `runserver` command.
 Deploy **Mayan EDMS** using the webserver of your preference. For more information
 on deployment instructions and examples, checkout Django's official documentation
 on the topic https://docs.djangoproject.com/en/1.6/howto/deployment/
--- a/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/language/ar/)\n"
--- a/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/bg/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
--- a/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/mayan-edms/language/bs_BA/)\n"
--- a/mayan/apps/acls/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/language/da/)\n"
--- a/mayan/apps/acls/locale/de_CH/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/de_CH/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
--- a/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/de_DE/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-02-06 23:55+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
--- a/mayan/apps/acls/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2012-02-02 18:20+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/acls/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-14 20:07+0000\n"
 "Last-Translator: Lory977 <helga.carrero@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
--- a/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/fa/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-30 13:05+0000\n"
 "Last-Translator: Mehdi Amani <MehdiAmani@toorintan.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/language/fa/)\n"
--- a/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-11-02 08:22+0000\n"
 "Last-Translator: Christophe kryskool <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
--- a/mayan/apps/acls/locale/hr_HR/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/hr_HR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-edms/language/hr_HR/)\n"
--- a/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/mayan-edms/language/hu/)\n"
--- a/mayan/apps/acls/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/language/id/)\n"
--- a/mayan/apps/acls/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/it/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-29 07:17+0000\n"
 "Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
--- a/mayan/apps/acls/locale/lv/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/lv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/acls/locale/nb/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mayan-"
--- a/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
--- a/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pl/LC_MESSAGES/django.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Translators:
-# mic <winterfall24@gmail.com>, 2013
+# mic <winterfall24@gmail.com>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
-"PO-Revision-Date: 2014-10-25 06:47+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
+"PO-Revision-Date: 2015-02-28 19:42+0000\n"
+"Last-Translator: mic <winterfall24@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,15 +45,15 @@ msgstr "ACLs"

 #: links.py:10 links.py:18
 msgid "Details"
-msgstr ""
+msgstr "Szczegóły"

 #: links.py:11 links.py:20
 msgid "Grant"
-msgstr ""
+msgstr "Przyznać"

 #: links.py:12 links.py:21
 msgid "Revoke"
-msgstr ""
+msgstr "Odwołać"

 #: links.py:15
 msgid "Default ACLs"
@@ -73,7 +73,7 @@ msgstr "Niewystarczające uprawnienia."

 #: models.py:25 models.py:67
 msgid "Permission"
-msgstr ""
+msgstr "Uprawnienia"

 #: models.py:51
 msgid "Access entry"
@@ -126,7 +126,7 @@ msgstr ""

 #: views.py:51 views.py:403
 msgid "Permissions"
-msgstr ""
+msgstr "Uprawnienia"

 #: views.py:98
 #, python-format
@@ -139,15 +139,15 @@ msgstr ""

 #: views.py:106 views.py:435
 msgid "Label"
-msgstr ""
+msgstr "Etykieta"

 #: views.py:108 views.py:437
 msgid "Has permission"
-msgstr ""
+msgstr "Ma uprawnienie"

 #: views.py:181 views.py:272 views.py:516 views.py:593
 msgid ", "
-msgstr ""
+msgstr ", "

 #: views.py:182 views.py:273 views.py:517 views.py:594
 #, python-format
@@ -162,7 +162,7 @@ msgstr ""
 #: views.py:186 views.py:521
 #, python-format
 msgid "Are you sure you wish to grant the permission %(title_suffix)s?"
-msgstr "Czy na pewno chcesz przyznać uprawnienia %(title_suffix)s?"
+msgstr "Czy na pewno chcesz przyznać uprawnienie %(title_suffix)s?"

 #: views.py:188 views.py:523
 #, python-format
@@ -172,14 +172,14 @@ msgstr "Czy na pewno chcesz przyznać uprawnienia %(title_suffix)s?"
 #: views.py:195 views.py:530
 #, python-format
 msgid "Permission \"%(permission)s\" granted to %(actor)s for %(object)s."
-msgstr ""
+msgstr "Uprawnienie \"%(permission)s\" przyznane %(actor)s dla %(object)s."

 #: views.py:201 views.py:536
 #, python-format
 msgid ""
 "%(actor)s, already had the permission \"%(permission)s\" granted for "
 "%(object)s."
-msgstr ""
+msgstr "%(actor)s, posiada uprawnienie \"%(permission)s\" przyznane dla %(object)s."

 #: views.py:274 views.py:595
 #, python-format
@@ -189,12 +189,12 @@ msgstr ""
 #: views.py:277 views.py:598
 #, python-format
 msgid "Are you sure you wish to revoke the permission %(title_suffix)s?"
-msgstr ""
+msgstr "Czy na pewno chcesz odwołać uprawnienie %(title_suffix)s?"

 #: views.py:279 views.py:600
 #, python-format
 msgid "Are you sure you wish to revoke the permissions %(title_suffix)s?"
-msgstr ""
+msgstr "Czy na pewno chcesz odwołać uprawnienia %(title_suffix)s?"

 #: views.py:286 views.py:607
 #, python-format
--- a/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pt/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
--- a/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/pt_BR/LC_MESSAGES/django.po
@@ -5,14 +5,15 @@
 # Translators:
 # Translators:
 # wolvsky <gustavo@infomania.com.br>, 2014
+# Rogerio Falcone <rogerio@falconeit.com.br>, 2015
 # wolvsky <gustavo@infomania.com.br>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
-"PO-Revision-Date: 2014-10-25 06:47+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
+"PO-Revision-Date: 2015-05-07 13:57+0000\n"
+"Last-Translator: Rogerio Falcone <rogerio@falconeit.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mayan-edms/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,15 +47,15 @@ msgstr "ACLs"

 #: links.py:10 links.py:18
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"

 #: links.py:11 links.py:20
 msgid "Grant"
-msgstr ""
+msgstr "Conceder"

 #: links.py:12 links.py:21
 msgid "Revoke"
-msgstr ""
+msgstr "Revogar"

 #: links.py:15
 msgid "Default ACLs"
@@ -62,7 +63,7 @@ msgstr "ACLs padrões"

 #: links.py:16 views.py:379
 msgid "Classes"
-msgstr ""
+msgstr "classes"

 #: links.py:17
 msgid "ACLs for class"
@@ -74,23 +75,23 @@ msgstr "Acesso insuficiente."

 #: models.py:25 models.py:67
 msgid "Permission"
-msgstr ""
+msgstr "Permissões"

 #: models.py:51
 msgid "Access entry"
-msgstr ""
+msgstr "Acesso entrada"

 #: models.py:52
 msgid "Access entries"
-msgstr ""
+msgstr "Entradas de acesso"

 #: models.py:88
 msgid "Default access entry"
-msgstr ""
+msgstr "Entrada de acesso padrão"

 #: models.py:89
 msgid "Default access entries"
-msgstr ""
+msgstr "Entradas de acesso padrão"

 #: models.py:108 models.py:111 models.py:112
 msgid "Creator"
@@ -119,32 +120,32 @@ msgstr "Visualizar classe de ACLs padrões"
 #: views.py:48
 #, python-format
 msgid "Access control lists for: %s"
-msgstr ""
+msgstr "listas de controle de acesso para: %s"

 #: views.py:50 views.py:402
 msgid "Holder"
-msgstr ""
+msgstr "Titular"

 #: views.py:51 views.py:403
 msgid "Permissions"
-msgstr ""
+msgstr "Permissões"

 #: views.py:98
 #, python-format
 msgid "Permissions available to: %(actor)s for %(obj)s"
-msgstr ""
+msgstr "permissões disponíveis para: %(actor)s para %(obj)s"

 #: views.py:105 views.py:434
 msgid "Namespace"
-msgstr ""
+msgstr "Namespace"

 #: views.py:106 views.py:435
 msgid "Label"
-msgstr ""
+msgstr "Label"

 #: views.py:108 views.py:437
 msgid "Has permission"
-msgstr ""
+msgstr "tem permissão"

 #: views.py:181 views.py:272 views.py:516 views.py:593
 msgid ", "
@@ -210,7 +211,7 @@ msgstr "%(actor)s, não tinha a permissão \"%(permission)s\" para %(object)s."
 #: views.py:346
 #, python-format
 msgid "Add new holder for: %s"
-msgstr ""
+msgstr "adicionar um novo titular para: %s"

 #: views.py:347 views.py:477
 msgid "Select"
@@ -218,22 +219,22 @@ msgstr "Selecionar"

 #: views.py:381
 msgid "Class"
-msgstr ""
+msgstr "classe"

 #: views.py:400
 #, python-format
 msgid "Default access control lists for class: %s"
-msgstr ""
+msgstr "listas de controle de acesso padrão para classe: %s"

 #: views.py:428
 #, python-format
 msgid "Permissions available to: %(actor)s for class %(class)s"
-msgstr ""
+msgstr "permissões disponíveis para: %(actor)s para a classe %(class)s"

 #: views.py:475
 #, python-format
 msgid "Add new holder for class: %s"
-msgstr ""
+msgstr "adicionar um novo titular para a classe: %s"

 #~ msgid "List of classes"
 #~ msgstr "List of classes"
--- a/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/mayan-edms/language/ro_RO/)\n"
--- a/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/language/ru/)\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"

 #: forms.py:25 links.py:13 links.py:19
 msgid "New holder"
--- a/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/mayan-edms/language/sl_SI/)\n"
--- a/mayan/apps/acls/locale/sq/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/sq/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/acls/locale/tr_TR/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mayan-edms/language/tr_TR/)\n"
--- a/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mayan-edms/language/vi_VN/)\n"
--- a/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/zh_CN/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-07 02:01+0000\n"
 "Last-Translator: Genlin Jiao <jiaogl@pkusz.edu.cn>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
--- a/mayan/apps/acls/locale/zh_TW/LC_MESSAGES/django.po
+++ b/mayan/apps/acls/locale/zh_TW/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2014-10-25 06:47+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mayan-"
--- a/mayan/apps/acls/urls.py
+++ b/mayan/apps/acls/urls.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals

 from django.conf.urls import patterns, url

-urlpatterns = patterns('acls.views',
+urlpatterns = patterns(
+    'acls.views',
    url(r'^new_holder_for/(?P<app_label>[-\w]+)/(?P<model_name>[-\w]+)/(?P<object_id>\d+)/$', 'acl_new_holder_for', (), 'acl_new_holder_for'),
    url(r'^list_for/(?P<app_label>[-\w]+)/(?P<model_name>[-\w]+)/(?P<object_id>\d+)/$', 'acl_list', (), 'acl_list'),
    url(r'^details/(?P<access_object_gid>[.\w]+)/holder/(?P<holder_object_gid>[.\w]+)/$', 'acl_detail', (), 'acl_detail'),
@@ -18,5 +19,4 @@ urlpatterns = patterns('acls.views',

    url(r'^class/multiple/grant/$', 'acl_class_multiple_grant', (), 'acl_class_multiple_grant'),
    url(r'^class/multiple/revoke/$', 'acl_class_multiple_revoke', (), 'acl_class_multiple_revoke'),
-
 )
--- a/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/language/ar/)\n"
--- a/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
--- a/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/mayan-edms/language/bs_BA/)\n"
--- a/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/language/da/)\n"
--- a/mayan/apps/checkouts/locale/de_CH/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/de_CH/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
--- a/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/de_DE/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-02-06 23:55+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
--- a/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2012-07-10 15:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-18 06:13+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
--- a/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/fa/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/language/fa/)\n"
--- a/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/fr/LC_MESSAGES/django.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
-"PO-Revision-Date: 2015-01-29 07:50+0000\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
+"PO-Revision-Date: 2015-04-06 09:00+0000\n"
 "Last-Translator: Christophe kryskool <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,27 +42,27 @@ msgstr "Document déjà verrouillé."

 #: links.py:19
 msgid "Checkouts"
-msgstr ""
+msgstr "Verrous"

 #: links.py:20
 msgid "Check out document"
-msgstr ""
+msgstr "Verrouiller le document"

 #: links.py:21
 msgid "Check in document"
-msgstr ""
+msgstr "Déverrouiller le document"

 #: links.py:22
 msgid "Check in/out"
-msgstr ""
+msgstr "Verrouiller/déverrouiller"

 #: literals.py:9
 msgid "Checked out"
-msgstr ""
+msgstr "Verrouillé"

 #: literals.py:10
 msgid "Checked in/available"
-msgstr ""
+msgstr "Déverrouiller/rendre disponible"

 #: models.py:23
 msgid "Document"
@@ -70,7 +70,7 @@ msgstr "Document"

 #: models.py:24
 msgid "Check out date and time"
-msgstr ""
+msgstr "Date et heure du verrouillage"

 #: models.py:25 widgets.py:79
 msgid "Check out expiration date and time"
@@ -82,7 +82,7 @@ msgstr "Durée en minutes pendant laquelle le document doit être verrouillé"

 #: models.py:32
 msgid "Block new version upload"
-msgstr ""
+msgstr "Empêcher l'importation d'une nouvelle version"

 #: models.py:32
 msgid "Do not allow new version of this document to be uploaded."
@@ -94,7 +94,7 @@ msgstr "Verrouillage du document"

 #: models.py:59
 msgid "Document checkouts"
-msgstr ""
+msgstr "Verrouillages du document"

 #: permissions.py:9
 msgid "Check out documents"
@@ -114,7 +114,7 @@ msgstr "Permettre de révoquer le verrouillage"

 #: views.py:32
 msgid "Documents checked out"
-msgstr ""
+msgstr "Documents verrouillés"

 #: views.py:35
 msgid "Checkout user"
@@ -122,11 +122,11 @@ msgstr "Verrou utilisateur"

 #: views.py:36
 msgid "Checkout time and date"
-msgstr ""
+msgstr "date et heure de verrouillage"

 #: views.py:37
 msgid "Checkout expiration"
-msgstr ""
+msgstr "Expiration du verrou"

 #: views.py:50
 #, python-format
--- a/mayan/apps/checkouts/locale/hr_HR/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/hr_HR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-edms/language/hr_HR/)\n"
--- a/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/mayan-edms/language/hu/)\n"
--- a/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/language/id/)\n"
--- a/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/it/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-29 08:10+0000\n"
 "Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
--- a/mayan/apps/checkouts/locale/lv/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/lv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/checkouts/locale/nb/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mayan-"
--- a/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/nl_NL/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
--- a/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pl/LC_MESSAGES/django.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Translators:
+# Annunnaky <doublemiu@gmail.com>, 2015
+# mic <winterfall24@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
-"PO-Revision-Date: 2015-01-11 22:05+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
+"PO-Revision-Date: 2015-03-01 19:24+0000\n"
+"Last-Translator: Annunnaky <doublemiu@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,15 +66,15 @@ msgstr ""

 #: models.py:23
 msgid "Document"
-msgstr ""
+msgstr "Dokument"

 #: models.py:24
 msgid "Check out date and time"
-msgstr ""
+msgstr "Sprawdź datę i godzinę"

 #: models.py:25 widgets.py:79
 msgid "Check out expiration date and time"
-msgstr ""
+msgstr "Sprawdź datę i godzinę wygaśnięcia"

 #: models.py:25
 msgid "Amount of time to hold the document checked out in minutes."
@@ -80,7 +82,7 @@ msgstr ""

 #: models.py:32
 msgid "Block new version upload"
-msgstr ""
+msgstr "Zablokuj uaktualnienie do nowszej wersji."

 #: models.py:32
 msgid "Do not allow new version of this document to be uploaded."
@@ -129,12 +131,12 @@ msgstr ""
 #: views.py:50
 #, python-format
 msgid "Document status: %s"
-msgstr ""
+msgstr "Status dokumentu: %s"

 #: views.py:54
 #, python-format
 msgid "User: %s"
-msgstr ""
+msgstr "Użytkownik: %s"

 #: views.py:55
 #, python-format
@@ -153,11 +155,11 @@ msgstr ""

 #: views.py:57
 msgid "Yes"
-msgstr ""
+msgstr "Tak"

 #: views.py:57
 msgid "No"
-msgstr ""
+msgstr "Nie"

 #: views.py:62
 #, python-format
@@ -207,23 +209,23 @@ msgstr ""

 #: widgets.py:17
 msgid "Days"
-msgstr ""
+msgstr "Dni"

 #: widgets.py:18
 msgid "Hours"
-msgstr ""
+msgstr "Godziny"

 #: widgets.py:19
 msgid "Minutes"
-msgstr ""
+msgstr "Minuty"

 #: widgets.py:49
 msgid "Enter a valid number of days."
-msgstr ""
+msgstr "Wprowadź poprawną liczbę dni."

 #: widgets.py:50
 msgid "Enter a valid number of hours."
-msgstr ""
+msgstr "Wprowadź poprawną liczbę godzin."

 #: widgets.py:51
 msgid "Enter a valid number of minutes."
@@ -231,7 +233,7 @@ msgstr ""

 #: widgets.py:52
 msgid "Enter a valid time difference."
-msgstr ""
+msgstr "Wprowadź różnicę czasu."

 #: widgets.py:78
 msgid ""
--- a/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
--- a/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/pt_BR/LC_MESSAGES/django.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Translators:
+# Rogerio Falcone <rogerio@falconeit.com.br>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
-"PO-Revision-Date: 2015-01-11 22:05+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
+"PO-Revision-Date: 2015-05-13 17:40+0000\n"
+"Last-Translator: Rogerio Falcone <rogerio@falconeit.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mayan-edms/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,224 +21,224 @@ msgstr ""

 #: events.py:7
 msgid "Document checked out"
-msgstr ""
+msgstr "Documento checked out"

 #: events.py:8
 msgid "Document checked in"
-msgstr ""
+msgstr "Documento checked in"

 #: events.py:9
 msgid "Document automatically checked in"
-msgstr ""
+msgstr "Documento checked in automático"

 #: events.py:10
 msgid "Document forcefully checked in"
-msgstr ""
+msgstr "Documento  forçando o check-in"

 #: exceptions.py:18 views.py:82
 msgid "Document already checked out."
-msgstr ""
+msgstr "Documento já fez check-out. "

 #: links.py:19
 msgid "Checkouts"
-msgstr ""
+msgstr "Checkouts"

 #: links.py:20
 msgid "Check out document"
-msgstr ""
+msgstr "Documento Check out "

 #: links.py:21
 msgid "Check in document"
-msgstr ""
+msgstr "Documento Check in"

 #: links.py:22
 msgid "Check in/out"
-msgstr ""
+msgstr "Check in/out"

 #: literals.py:9
 msgid "Checked out"
-msgstr ""
+msgstr "Checked out"

 #: literals.py:10
 msgid "Checked in/available"
-msgstr ""
+msgstr "Checked in disponível"

 #: models.py:23
 msgid "Document"
-msgstr ""
+msgstr "Documento"

 #: models.py:24
 msgid "Check out date and time"
-msgstr ""
+msgstr "Data e hora do Check out"

 #: models.py:25 widgets.py:79
 msgid "Check out expiration date and time"
-msgstr ""
+msgstr "Confira data e hora de expiração"

 #: models.py:25
 msgid "Amount of time to hold the document checked out in minutes."
-msgstr ""
+msgstr "Quantidade de tempo para armazenar o documento com check-out em poucos minutos."

 #: models.py:32
 msgid "Block new version upload"
-msgstr ""
+msgstr "Permitir  restrições imperativas do check out"

 #: models.py:32
 msgid "Do not allow new version of this document to be uploaded."
-msgstr ""
+msgstr "Não permitir nova versão deste documento a ser enviado."

 #: models.py:58 permissions.py:7
 msgid "Document checkout"
-msgstr ""
+msgstr "Documento checked out"

 #: models.py:59
 msgid "Document checkouts"
-msgstr ""
+msgstr "Documentos checkouts"

 #: permissions.py:9
 msgid "Check out documents"
-msgstr ""
+msgstr "Documentos Check out"

 #: permissions.py:10
 msgid "Check in documents"
-msgstr ""
+msgstr "Documentos Check in "

 #: permissions.py:11
 msgid "Forcefully check in documents"
-msgstr ""
+msgstr "Forçando o check-in documentos"

 #: permissions.py:12
 msgid "Allow overriding check out restrictions"
-msgstr ""
+msgstr "Permitir  restrições imperativas do check out"

 #: views.py:32
 msgid "Documents checked out"
-msgstr ""
+msgstr "Documentos checked out"

 #: views.py:35
 msgid "Checkout user"
-msgstr ""
+msgstr "Checkout de  usuario"

 #: views.py:36
 msgid "Checkout time and date"
-msgstr ""
+msgstr "Data e hora do Check out"

 #: views.py:37
 msgid "Checkout expiration"
-msgstr ""
+msgstr "Check Out expiração"

 #: views.py:50
 #, python-format
 msgid "Document status: %s"
-msgstr ""
+msgstr "Documento status: %s"

 #: views.py:54
 #, python-format
 msgid "User: %s"
-msgstr ""
+msgstr "Usuario: %s"

 #: views.py:55
 #, python-format
 msgid "Check out time: %s"
-msgstr ""
+msgstr "Confira o tempo:%s"

 #: views.py:56
 #, python-format
 msgid "Check out expiration: %s"
-msgstr ""
+msgstr "Check out expirado: %s"

 #: views.py:57
 #, python-format
 msgid "New versions allowed: %s"
-msgstr ""
+msgstr "Novas versões permitida:%s"

 #: views.py:57
 msgid "Yes"
-msgstr ""
+msgstr "Sim"

 #: views.py:57
 msgid "No"
-msgstr ""
+msgstr "não"

 #: views.py:62
 #, python-format
 msgid "Check out details for document: %s"
-msgstr ""
+msgstr "Confira detalhes sobre documento:%s "

 #: views.py:85
 #, python-format
 msgid "Error trying to check out document; %s"
-msgstr ""
+msgstr "Erro tentando check-out de documentos;%s"

 #: views.py:87
 #, python-format
 msgid "Document \"%s\" checked out successfully."
-msgstr ""
+msgstr "Documento \"%s\" check-out com êxito."

 #: views.py:95
 #, python-format
 msgid "Check out document: %s"
-msgstr ""
+msgstr "Check out  -  documento: %s"

 #: views.py:107 views.py:128
 msgid "Document has not been checked out."
-msgstr ""
+msgstr "Documento não foi verificado."

 #: views.py:130
 #, python-format
 msgid "Error trying to check in document; %s"
-msgstr ""
+msgstr "Erro tente novamente realizar o check no documento; %s"

 #: views.py:132
 #, python-format
 msgid "Document \"%s\" checked in successfully."
-msgstr ""
+msgstr "Sucesso no checked in -  Documento \"%s\""

 #: views.py:143
 #, python-format
 msgid ""
 "You didn't originally checked out this document.  Are you sure you wish to "
 "forcefully check in document: %s?"
-msgstr ""
+msgstr "Você originalmente não fez check-out este documento. Tem certeza de que deseja verificar no documento: %s?"

 #: views.py:145
 #, python-format
 msgid "Are you sure you wish to check in document: %s?"
-msgstr ""
+msgstr "Tem certeza de que deseja verificar no documento: %s?"

 #: widgets.py:17
 msgid "Days"
-msgstr ""
+msgstr "Dia"

 #: widgets.py:18
 msgid "Hours"
-msgstr ""
+msgstr "Hora"

 #: widgets.py:19
 msgid "Minutes"
-msgstr ""
+msgstr "Minutos"

 #: widgets.py:49
 msgid "Enter a valid number of days."
-msgstr ""
+msgstr "Entre com o numero válido de dias."

 #: widgets.py:50
 msgid "Enter a valid number of hours."
-msgstr ""
+msgstr "Entre com o numero válido de horas."

 #: widgets.py:51
 msgid "Enter a valid number of minutes."
-msgstr ""
+msgstr "Entre com o numero válido de minutos."

 #: widgets.py:52
 msgid "Enter a valid time difference."
-msgstr ""
+msgstr "Digite com um tempo válido diferente."

 #: widgets.py:78
 msgid ""
 "Amount of time to hold the document in the checked out state in days, hours "
 "and/or minutes."
-msgstr ""
+msgstr "Quantidade de tempo para guardar o documento no estado check-out em dias, horas e / ou minutos."

 #~ msgid "Document \"%(document)s\" checked out by %(fullname)s."
 #~ msgstr "Document \"%(document)s\" checked out by %(fullname)s."
--- a/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ro_RO/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/mayan-edms/language/ro_RO/)\n"
--- a/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/language/ru/)\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"

 #: events.py:7
 msgid "Document checked out"
--- a/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/sl_SI/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/mayan-edms/language/sl_SI/)\n"
--- a/mayan/apps/checkouts/locale/sq/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/sq/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/checkouts/locale/tr_TR/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mayan-edms/language/tr_TR/)\n"
--- a/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/vi_VN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mayan-edms/language/vi_VN/)\n"
--- a/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 20:44-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
--- a/mayan/apps/checkouts/locale/zh_TW/LC_MESSAGES/django.po
+++ b/mayan/apps/checkouts/locale/zh_TW/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 18:59-0400\n"
 "PO-Revision-Date: 2015-01-11 22:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mayan-"
--- a/mayan/apps/checkouts/urls.py
+++ b/mayan/apps/checkouts/urls.py
@@ -5,14 +5,16 @@ from django.conf.urls import patterns, url
 from .api_views import APICheckedoutDocumentListView, APICheckedoutDocumentView
 from .views import CheckoutListView

-urlpatterns = patterns('checkouts.views',
+urlpatterns = patterns(
+    'checkouts.views',
    url(r'^list/$', CheckoutListView.as_view(), name='checkout_list'),
    url(r'^(?P<document_pk>\d+)/check/out/$', 'checkout_document', name='checkout_document'),
    url(r'^(?P<document_pk>\d+)/check/in/$', 'checkin_document', name='checkin_document'),
    url(r'^(?P<document_pk>\d+)/check/info/$', 'checkout_info', name='checkout_info'),
 )

-api_urls = patterns('',
+api_urls = patterns(
+    '',
    url(r'^documents/$', APICheckedoutDocumentListView.as_view(), name='checkout-document-list'),
    url(r'^documents/(?P<pk>[0-9]+)/$', APICheckedoutDocumentView.as_view(), name='checkedout-document-view'),
 )
--- a/mayan/apps/common/forms.py
+++ b/mayan/apps/common/forms.py
@@ -31,8 +31,12 @@ class DetailForm(forms.ModelForm):
                else:
                    self.fields[extra_field['field']] = forms.CharField(
                        label=extra_field['label'],
-                        initial=escape(return_attrib(self.instance,
-                            extra_field['field'], None)),
+                        initial=escape(
+                            return_attrib(
+                                self.instance,
+                                extra_field['field'], None
+                            )
+                        ),
                        widget=PlainWidget)

        for field_name, field in self.fields.items():
--- a/mayan/apps/common/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/fa/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@
 #
 # Translators:
 # Translators:
-# Mehdi Amani <MehdiAmani@toorintan.com>, 2014
+# Mehdi Amani <MehdiAmani@toorintan.com>, 2014-2015
 # Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2013
 msgid ""
 msgstr ""
@@ -27,7 +27,7 @@ msgstr ""

 #: classes.py:40
 msgid "Available attributes: "
-msgstr ""
+msgstr "خصوصیات موجود"

 #: forms.py:98
 msgid "Selection"
@@ -61,6 +61,7 @@ msgstr ""
 msgid "License"
 msgstr "لیسانس"

+<<<<<<< HEAD
 #: links.py:19
 msgid "Maintenance"
 msgstr ""
@@ -72,6 +73,19 @@ msgstr ""
 #: links.py:21 views.py:435
 msgid "Tools"
 msgstr ""
+=======
+#: links.py:17
+msgid "Locale profile"
+msgstr "پروفایل محلی"
+
+#: links.py:18
+msgid "Edit locale profile"
+msgstr "ویرایش پروفایل محلی"
+
+#: links.py:20
+msgid "Logout"
+msgstr "خروج"
+>>>>>>> master

 #: models.py:29 models.py:32
 msgid "Anonymous user"
@@ -115,23 +129,23 @@ msgstr "فایلهای آپلود شده اشتراکی"

 #: models.py:64
 msgid "User"
-msgstr ""
+msgstr "کاربر"

 #: models.py:66
 msgid "Timezone"
-msgstr ""
+msgstr "زمان محلی"

 #: models.py:67
 msgid "Language"
-msgstr ""
+msgstr "زبان"

 #: models.py:73
 msgid "User locale profile"
-msgstr ""
+msgstr "پروفایل محلی کاربر"

 #: models.py:74
 msgid "User locale profiles"
-msgstr ""
+msgstr "پروفایل محلی کاربر"

 #: settings.py:14
 msgid ""
@@ -182,7 +196,7 @@ msgstr "جزئیاتا کاربر فعلی"

 #: views.py:196
 msgid "Current user locale profile details"
-msgstr ""
+msgstr "شرح پروفایل محلی کاربر فعلی"

 #: views.py:213
 msgid "E-mail conflict, another user has that same email."
@@ -198,11 +212,11 @@ msgstr "یرایش جزئیات کاربر کنونی"

 #: views.py:248
 msgid "Current user's locale profile details updated."
-msgstr ""
+msgstr "شرح پروفایل محلی کاربر فعلی بروز رسانی شد."

 #: views.py:257
 msgid "Edit current user locale profile details"
-msgstr ""
+msgstr "ویرایش شرح پروفایل محلی کاربر فعلی"

 #: views.py:282
 #, python-format
--- a/mayan/apps/common/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/pl/LC_MESSAGES/django.po
@@ -4,9 +4,11 @@
 #
 # Translators:
 # Translators:
+# Annunnaky <doublemiu@gmail.com>, 2015
 # mic, 2012
 # mic <diveaway12@gmail.com>, 2012
 # mic <winterfall24@gmail.com>, 2012
+# mic <winterfall24@gmail.com>, 2015
 # mic <winterfall24@gmail.com>, 2012
 msgid ""
 msgstr ""
@@ -30,7 +32,7 @@ msgstr ""

 #: classes.py:40
 msgid "Available attributes: "
-msgstr ""
+msgstr "Dostępne atrybuty:"

 #: forms.py:98
 msgid "Selection"
@@ -46,11 +48,11 @@ msgstr ""

 #: links.py:14
 msgid "User details"
-msgstr ""
+msgstr "Dane użytkownika"

 #: links.py:15
 msgid "Edit details"
-msgstr ""
+msgstr "Edytuj szczegóły"

 #: links.py:16
 msgid "Locale profile"
@@ -82,7 +84,7 @@ msgstr "Użytkownik anonimowy"

 #: models.py:36
 msgid "Account"
-msgstr ""
+msgstr "Konto"

 #: models.py:37
 msgid "Password"
@@ -90,51 +92,51 @@ msgstr ""

 #: models.py:38
 msgid "Password hash"
-msgstr ""
+msgstr "Hasło hash"

 #: models.py:41
 msgid "Auto admin properties"
-msgstr ""
+msgstr "Właściwości automatyczne"

 #: models.py:46
 msgid "File"
-msgstr ""
+msgstr "Plik"

 #: models.py:47
 msgid "Filename"
-msgstr ""
+msgstr "Nazwa"

 #: models.py:48
 msgid "Date time"
-msgstr ""
+msgstr "data i godzina"

 #: models.py:51
 msgid "Shared uploaded file"
-msgstr ""
+msgstr "Udostępniony plik"

 #: models.py:52
 msgid "Shared uploaded files"
-msgstr ""
+msgstr "Pliki udostępnione"

 #: models.py:64
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"

 #: models.py:66
 msgid "Timezone"
-msgstr ""
+msgstr "Strefa czasowa"

 #: models.py:67
 msgid "Language"
-msgstr ""
+msgstr "Język"

 #: models.py:73
 msgid "User locale profile"
-msgstr ""
+msgstr "Lokalny profil użytkownika"

 #: models.py:74
 msgid "User locale profiles"
-msgstr ""
+msgstr "Lokalne profile użytkownika"

 #: settings.py:14
 msgid ""
@@ -145,11 +147,11 @@ msgstr ""

 #: settings.py:48
 msgid "A storage backend that all workers can use to share files."
-msgstr ""
+msgstr "Backend przechowywania umożliwiający wszystkim użytkownikom udostępnianie plików."

 #: utils.py:114
 msgid "Function found"
-msgstr ""
+msgstr "Wyszukano funkcję"

 #: views.py:54
 msgid "No action selected."
@@ -162,12 +164,12 @@ msgstr "Musisz wybrać co najmniej jeden element."
 #: views.py:110
 #, python-format
 msgid "Unable to remove %(selection)s."
-msgstr ""
+msgstr "Nie można usunąć %(selection)s."

 #: views.py:135
 #, python-format
 msgid "Unable to add %(selection)s."
-msgstr ""
+msgstr "Nie można dodać %(selection)s."

 #: views.py:148
 msgid "Add"
@@ -179,11 +181,11 @@ msgstr "Usuń"

 #: views.py:181
 msgid "Current user details"
-msgstr ""
+msgstr "Aktualne dane użytkownika"

 #: views.py:196
 msgid "Current user locale profile details"
-msgstr ""
+msgstr "Aktualne dane użytkownika szczegóły"

 #: views.py:213
 msgid "E-mail conflict, another user has that same email."
@@ -195,69 +197,69 @@ msgstr "Aktualne dane użytkownika aktualizowane."

 #: views.py:225
 msgid "Edit current user details"
-msgstr ""
+msgstr "Edytuj aktualne dane użytkownika"

 #: views.py:248
 msgid "Current user's locale profile details updated."
-msgstr ""
+msgstr "Profil aktualnego użytkownika został zaktualizowany."

 #: views.py:257
 msgid "Edit current user locale profile details"
-msgstr ""
+msgstr "Edytuj profil aktualnego użytkownika."

 #: views.py:282
 #, python-format
 msgid "Error saving %s details."
-msgstr ""
+msgstr "Błąd podczas zapisu  %s."

 #: views.py:284
 msgid "Error saving details."
-msgstr ""
+msgstr "Błąd zapisu detali."

 #: views.py:292
 #, python-format
 msgid "%s details saved successfully."
-msgstr ""
+msgstr "%s detale zapiane pomyślnie."

 #: views.py:294
 msgid "Details saved successfully."
-msgstr ""
+msgstr "Detale zapsane pomyślnie."

 #: views.py:306
 #, python-format
 msgid "Error creating new %s."
-msgstr ""
+msgstr "Błąd podczas tworzenia nowego : %s."

 #: views.py:308
 msgid "Error creating object."
-msgstr ""
+msgstr "Błąd poczas tworzenia obiektu."

 #: views.py:315
 #, python-format
 msgid "%s created successfully."
-msgstr ""
+msgstr "%s utworzono pomyślnie."

 #: views.py:317
 msgid "New object created successfully."
-msgstr ""
+msgstr "Pomyślnie utworzono nowy obiekt."

 #: views.py:335
 #, python-format
 msgid "Error deleting %s."
-msgstr ""
+msgstr "Błąd podczas usuwania %s."

 #: views.py:337
 msgid "Error deleting object."
-msgstr ""
+msgstr "Błąd podczas usuwania obiektu."

 #: views.py:342
 #, python-format
 msgid "%s deleted successfully."
-msgstr ""
+msgstr "%s usunięto pomyślnie."

 #: views.py:344
 msgid "Object deleted successfully."
-msgstr ""
+msgstr "Pomyślnie usunuęto obiekt."

 #: views.py:425
 msgid "Setup items"
--- a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,6 +6,7 @@
 # Translators:
 # Emerson Soares <on.emersonsoares@gmail.com>, 2011
 # Roberto Rosario, 2012
+# Rogerio Falcone <rogerio@falconeit.com.br>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
@@ -27,7 +28,7 @@ msgstr ""

 #: classes.py:40
 msgid "Available attributes: "
-msgstr ""
+msgstr "Atributos disponíveis:"

 #: forms.py:98
 msgid "Selection"
@@ -43,11 +44,11 @@ msgstr ""

 #: links.py:14
 msgid "User details"
-msgstr ""
+msgstr "Detalhes do usuário"

 #: links.py:15
 msgid "Edit details"
-msgstr ""
+msgstr "Editar Detalhes"

 #: links.py:16
 msgid "Locale profile"
@@ -79,7 +80,7 @@ msgstr "Usuário anônimo"

 #: models.py:36
 msgid "Account"
-msgstr ""
+msgstr "Conta"

 #: models.py:37
 msgid "Password"
@@ -87,51 +88,51 @@ msgstr ""

 #: models.py:38
 msgid "Password hash"
-msgstr ""
+msgstr "Senha hash"

 #: models.py:41
 msgid "Auto admin properties"
-msgstr ""
+msgstr "Propriedades de administração Automático"

 #: models.py:46
 msgid "File"
-msgstr ""
+msgstr "Arquivo"

 #: models.py:47
 msgid "Filename"
-msgstr ""
+msgstr "Nome do arquivo"

 #: models.py:48
 msgid "Date time"
-msgstr ""
+msgstr "hora, data"

 #: models.py:51
 msgid "Shared uploaded file"
-msgstr ""
+msgstr "Arquivo enviado Partilhado"

 #: models.py:52
 msgid "Shared uploaded files"
-msgstr ""
+msgstr "Arquivos enviados Partilhado"

 #: models.py:64
 msgid "User"
-msgstr ""
+msgstr "Usuário"

 #: models.py:66
 msgid "Timezone"
-msgstr ""
+msgstr "Timezone"

 #: models.py:67
 msgid "Language"
-msgstr ""
+msgstr "Lingua"

 #: models.py:73
 msgid "User locale profile"
-msgstr ""
+msgstr "Perfil de localidade do usuário"

 #: models.py:74
 msgid "User locale profiles"
-msgstr ""
+msgstr "Perfis de localidade do usuário"

 #: settings.py:14
 msgid ""
@@ -142,11 +143,11 @@ msgstr ""

 #: settings.py:48
 msgid "A storage backend that all workers can use to share files."
-msgstr ""
+msgstr "Um backend de armazenamento que todos os trabalhadores podem usar para compartilhar arquivos."

 #: utils.py:114
 msgid "Function found"
-msgstr ""
+msgstr "função encontrada"

 #: views.py:54
 msgid "No action selected."
@@ -159,12 +160,12 @@ msgstr "Deve selecionar pelo menos um item."
 #: views.py:110
 #, python-format
 msgid "Unable to remove %(selection)s."
-msgstr ""
+msgstr "Não foi possível remover %(selection)s."

 #: views.py:135
 #, python-format
 msgid "Unable to add %(selection)s."
-msgstr ""
+msgstr "Não foi possível adicionar %(selection)s."

 #: views.py:148
 msgid "Add"
@@ -176,11 +177,11 @@ msgstr "Remover"

 #: views.py:181
 msgid "Current user details"
-msgstr ""
+msgstr "Detalhes do usuário"

 #: views.py:196
 msgid "Current user locale profile details"
-msgstr ""
+msgstr "Usuário Atual - detalhes do perfil de localidade"

 #: views.py:213
 msgid "E-mail conflict, another user has that same email."
@@ -192,69 +193,69 @@ msgstr "Detalhes do usuário atual atualizados."

 #: views.py:225
 msgid "Edit current user details"
-msgstr ""
+msgstr "Editar detalhes do usuário corrente"

 #: views.py:248
 msgid "Current user's locale profile details updated."
-msgstr ""
+msgstr "Detalhes do perfil de localidade do usuário atual atualizado."

 #: views.py:257
 msgid "Edit current user locale profile details"
-msgstr ""
+msgstr "Editar Usuário Atual - detalhes do perfil de localidade"

 #: views.py:282
 #, python-format
 msgid "Error saving %s details."
-msgstr ""
+msgstr "Erro ao salvar %s detalhes."

 #: views.py:284
 msgid "Error saving details."
-msgstr ""
+msgstr "Salvar detalhes de erro."

 #: views.py:292
 #, python-format
 msgid "%s details saved successfully."
-msgstr ""
+msgstr "%s Detalhes salvos com sucesso."

 #: views.py:294
 msgid "Details saved successfully."
-msgstr ""
+msgstr "Detalhes salvos com sucesso."

 #: views.py:306
 #, python-format
 msgid "Error creating new %s."
-msgstr ""
+msgstr "Erro ao criar nova :%s. "

 #: views.py:308
 msgid "Error creating object."
-msgstr ""
+msgstr "Erro ao criar objeto."

 #: views.py:315
 #, python-format
 msgid "%s created successfully."
-msgstr ""
+msgstr "%s criado com sucesso."

 #: views.py:317
 msgid "New object created successfully."
-msgstr ""
+msgstr "Novo objeto criado com sucesso."

 #: views.py:335
 #, python-format
 msgid "Error deleting %s."
-msgstr ""
+msgstr "Erro ao excluir:%s."

 #: views.py:337
 msgid "Error deleting object."
-msgstr ""
+msgstr "Erro ao excluir objeto."

 #: views.py:342
 #, python-format
 msgid "%s deleted successfully."
-msgstr ""
+msgstr "%s  excluído com sucesso"

 #: views.py:344
 msgid "Object deleted successfully."
-msgstr ""
+msgstr "Objeto excluído com sucesso."

 #: views.py:425
 msgid "Setup items"
--- a/mayan/apps/common/locale/zh_TW/LC_MESSAGES/django.po
+++ b/mayan/apps/common/locale/zh_TW/LC_MESSAGES/django.po
@@ -269,145 +269,3 @@ msgstr ""
 #: widgets.py:60
 msgid "None"
 msgstr ""
-
-#~ msgid "%(selection)s added successfully added to %(right_list_title)s."
-#~ msgstr "%(selection)s added successfully added to %(right_list_title)s."
-
-#~ msgid "%(selection)s added successfully removed from %(right_list_title)s."
-#~ msgstr "%(selection)s added successfully removed from %(right_list_title)s."
-
-#~ msgid "A5"
-#~ msgstr "A5"
-
-#~ msgid "A4"
-#~ msgstr "A4"
-
-#~ msgid "A3"
-#~ msgstr "A3"
-
-#~ msgid "B5"
-#~ msgstr "B5"
-
-#~ msgid "B4"
-#~ msgstr "B4"
-
-#~ msgid "Letter"
-#~ msgstr "Letter"
-
-#~ msgid "Legal"
-#~ msgstr "Legal"
-
-#~ msgid "Ledger"
-#~ msgstr "Ledger"
-
-#~ msgid "Portrait"
-#~ msgstr "Portrait"
-
-#~ msgid "Landscape"
-#~ msgstr "Landscape"
-
-#~ msgid "license"
-#~ msgstr "license"
-
-#~ msgid "anonymous user"
-#~ msgstr "anonymous user"
-
-#~ msgid "password"
-#~ msgstr "password"
-
-#~ msgid "Insufficient permissions"
-#~ msgstr "Insufficient permissions"
-
-#~ msgid "You don't have enough permissions for this operation."
-#~ msgstr "You don't have enough permissions for this operation."
-
-#~ msgid "Page not found"
-#~ msgstr "Page not found"
-
-#~ msgid "Sorry, but the requested page could not be found."
-#~ msgstr "Sorry, but the requested page could not be found."
-
-#~ msgid "Details for %(object_name)s: %(object)s"
-#~ msgstr "Details for %(object_name)s: %(object)s"
-
-#~ msgid "Details for: %(object)s"
-#~ msgstr "Details for: %(object)s"
-
-#~ msgid "Edit %(object_name)s: %(object)s"
-#~ msgstr "Details for %(object_name)s: %(object)s"
-
-#~ msgid "Edit: %(object)s"
-#~ msgstr "Edit %(object_name)s:"
-
-#~ msgid "Create new %(object_name)s"
-#~ msgstr "Create new %(object_name)s"
-
-#~ msgid "Create"
-#~ msgstr "Create"
-
-#~ msgid "Assign %(title)s %(object)s"
-#~ msgstr "Assign %(title)s %(object)s"
-
-#~ msgid "Confirm"
-#~ msgstr "Confirm"
-
-#~ msgid "Confirm delete"
-#~ msgstr "Confirm delete"
-
-#~ msgid "form icon"
-#~ msgstr "form icon"
-
-#~ msgid "Are you sure you wish to delete %(object_name)s: %(object)s?"
-#~ msgstr "Are you sure you wish to delete %(object_name)s: %(object)s?"
-
-#~ msgid "Are you sure you wish to delete: %(object)s?"
-#~ msgstr "Are you sure you wish to delete: %(object)s?"
-
-#~ msgid "Yes"
-#~ msgstr "Yes"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "required"
-#~ msgstr "required"
-
-#~ msgid "Save"
-#~ msgstr "Save"
-
-#~ msgid "Submit"
-#~ msgstr "Submit"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancel"
-
-#~ msgid "List of %(title)s"
-#~ msgstr "List of %(stripped_title)s"
-
-#~ msgid ""
-#~ "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
-#~ "%(page_number)s of %(total_pages)s)"
-#~ msgstr ""
-#~ "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page "
-#~ "%(page_number)s of %(total_pages)s)"
-
-#~ msgid "List of %(title)s (%(total)s)"
-#~ msgstr "List of %(title)s (%(total)s)"
-
-#~ msgid "Identifier"
-#~ msgstr "Identifier"
-
-#~ msgid "There are no %(title)s"
-#~ msgstr "There are no %(stripped_title)s"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "Password change"
-#~ msgstr "Password change"
-
-#~ msgid "lock field"
-#~ msgstr "lock field"
-
-#~ msgid "Edit"
-#~ msgstr "Edit"
--- a/mayan/apps/common/urls.py
+++ b/mayan/apps/common/urls.py
@@ -9,7 +9,8 @@ from .views import (
    HomeView, LicenseView, MaintenanceMenuView, SetupListView, ToolsListView
 )

-urlpatterns = patterns('common.views',
+urlpatterns = patterns(
+    'common.views',
    url(r'^$', HomeView.as_view(), name='home'),
    url(r'^about/$', AboutView.as_view(), name='about_view'),
    url(r'^license/$', LicenseView.as_view(), name='license_view'),
@@ -21,9 +22,19 @@ urlpatterns = patterns('common.views',
    url(r'^user/edit/$', 'current_user_edit', name='current_user_edit'),
    url(r'^user/locale/$', CurrentUserLocaleProfileDetailsView.as_view(), name='current_user_locale_profile_details'),
    url(r'^user/locale/edit/$', 'current_user_locale_profile_edit', name='current_user_locale_profile_edit'),
+
+urlpatterns += patterns(
+    '',
+    url(r'^logout/$', 'django.contrib.auth.views.logout', {'next_page': 'main:home'}, name='logout_view'),
+
+    url(r'^password/reset/$', 'django.contrib.auth.views.password_reset', {'email_template_name': 'main/password_reset_email.html', 'template_name': 'main/password_reset_form.html', 'post_reset_redirect': '/password/reset/done'}, name='password_reset_view'),
+    url(r'^password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'main/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'),
+    url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'main/password_reset_complete.html'}, name='password_reset_complete_view'),
+    url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'main/password_reset_done.html'}, name='password_reset_done_view'),
 )

-urlpatterns += patterns('',
+urlpatterns += patterns(
+    '',
    url(r'^set_language/$', 'django.views.i18n.set_language', name='set_language'),
    (r'^favicon\.ico$', RedirectView.as_view(url=static('appearance/images/favicon.ico'))),
 )
--- a/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/language/ar/)\n"
--- a/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/bg/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
--- a/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/bs_BA/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/mayan-edms/language/bs_BA/)\n"
--- a/mayan/apps/converter/locale/da/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/language/da/)\n"
--- a/mayan/apps/converter/locale/de_CH/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/de_CH/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
--- a/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/de_DE/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-02-06 23:55+0000\n"
 "Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
--- a/mayan/apps/converter/locale/en/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2012-12-12 06:05+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/converter/locale/es/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/es/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
--- a/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/fa/LC_MESSAGES/django.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Translators:
-# Mehdi Amani <MehdiAmani@toorintan.com>, 2014
+# Mehdi Amani <MehdiAmani@toorintan.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
-"PO-Revision-Date: 2015-01-27 20:01+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
+"PO-Revision-Date: 2015-03-03 10:56+0000\n"
+"Last-Translator: Mehdi Amani <MehdiAmani@toorintan.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +93,7 @@ msgstr "Path to the libreoffice program."

 #: settings.py:17
 msgid "Path to the Popple program pdftoppm."
-msgstr ""
+msgstr "محل  Popple نرم افزار pdftoppm."

 #~ msgid "Help"
 #~ msgstr "Help"
--- a/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/fr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-02-05 10:21+0000\n"
 "Last-Translator: Christophe kryskool <christophe.chauvet@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
--- a/mayan/apps/converter/locale/hr_HR/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/hr_HR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-edms/language/hr_HR/)\n"
--- a/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/hu/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/mayan-edms/language/hu/)\n"
--- a/mayan/apps/converter/locale/id/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/language/id/)\n"
--- a/mayan/apps/converter/locale/it/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-29 08:13+0000\n"
 "Last-Translator: Pierpaolo Baldan <pierpaolo.baldan@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
--- a/mayan/apps/converter/locale/lv/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/lv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/mayan-edms/"
--- a/mayan/apps/converter/locale/nb/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mayan-"
--- a/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/nl_NL/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
--- a/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/pl/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Translators:
+# mic <winterfall24@gmail.com>, 2015
 # mic <winterfall24@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
-"PO-Revision-Date: 2015-01-27 20:01+0000\n"
-"Last-Translator: Roberto Rosario\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
+"PO-Revision-Date: 2015-02-28 19:56+0000\n"
+"Last-Translator: mic <winterfall24@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,11 +30,11 @@ msgstr "Zmiana rozmiaru."

 #: literals.py:24 literals.py:39
 msgid "Width"
-msgstr ""
+msgstr "Szerokość"

 #: literals.py:25 literals.py:40
 msgid "Height"
-msgstr ""
+msgstr "Wysokość"

 #: literals.py:29
 msgid "Rotate"
@@ -45,11 +46,11 @@ msgstr ""

 #: literals.py:32
 msgid "Degrees"
-msgstr ""
+msgstr "Stopnie"

 #: literals.py:36
 msgid "Density"
-msgstr ""
+msgstr "Gęstość"

 #: literals.py:37
 msgid "Change the resolution (ie: DPI) without resizing."
@@ -65,7 +66,7 @@ msgstr ""

 #: literals.py:47
 msgid "Percent"
-msgstr ""
+msgstr "Procent"

 #: settings.py:11
 msgid "File path to imagemagick's convert program."
--- a/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po
+++ b/mayan/apps/converter/locale/pt/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mayan EDMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:50-0400\n"
+"POT-Creation-Date: 2015-05-15 19:00-0400\n"
 "PO-Revision-Date: 2015-01-27 20:01+0000\n"
 "Last-Translator: Roberto Rosario\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
--- a/Show More
+++ b/Show More