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

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():

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

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"

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"

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"

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'))),
 )