From cae951766530d6ada5240f9f3d9653b017a30a98 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 12 Apr 2017 18:55:58 +0200 Subject: Treament dashboard: add filter form (refs #3381) --- ishtar_common/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 83cb25d46..44bc138eb 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1370,7 +1370,7 @@ class DashboardFormItem(object): return q.distinct('pk').count() -class Dashboard: +class Dashboard(object): def __init__(self, model, slice='year', date_source=None, show_detail=None, fltr={}): # don't provide date_source if it is not relevant -- cgit v1.2.3 From d5664fbc9754e987f124444f9dcc02e46d20e0ad Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 13 Apr 2017 12:23:27 +0200 Subject: get_item: refactoting of access control check --- ishtar_common/models.py | 38 ++++++++++++++++++++++++++++++++++++++ ishtar_common/views.py | 31 +++++-------------------------- 2 files changed, 43 insertions(+), 26 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 44bc138eb..77b4ed335 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -90,6 +90,44 @@ def post_save_user(sender, **kwargs): post_save.connect(post_save_user, sender=User) +def check_model_access_control(request, model, available_perms=None): + """ + Check access control to a model for a specific request + + :param request: the current request + :param model: the concerned model + :param available_perms: specific permissions to check if not specified + "view" and "view_own" will be checked + :return: (allowed, own) tuple + """ + own = True # more restrictive by default + allowed = False + if not request.user.is_authenticated(): + return allowed, own + + if not available_perms: + available_perms = ['view_' + model.__name__.lower(), + 'view_own_' + model.__name__.lower()] + if request.user.ishtaruser.has_right('administrator', + session=request.session): + allowed = True + own = False + return allowed, own + for perm, lbl in model._meta.permissions: + if perm not in available_perms: + continue + cperm = model._meta.app_label + '.' + perm + if request.user.has_perm(cperm) \ + or cperm in request.user.get_all_permissions() \ + or request.user.ishtaruser.has_right( + perm, session=request.session): + allowed = True + if "_own_" not in perm: + own = False + break # max right reach + return allowed, own + + class Imported(models.Model): imports = models.ManyToManyField( 'Import', blank=True, null=True, diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 94e4c1582..3cd00a6a6 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -586,47 +586,26 @@ def get_item(model, func_name, default_name, extra_request_keys=[], """ def func(request, data_type='json', full=False, force_own=False, col_names=None, **dct): - # check rights - own = True # more restrictive by default - allowed = False + available_perms = [] if specific_perms: available_perms = specific_perms[:] - else: - available_perms = ['view_' + model.__name__.lower(), - 'view_own_' + model.__name__.lower()] EMPTY = '' if 'type' in dct: data_type = dct.pop('type') if not data_type: EMPTY = '[]' data_type = 'json' - if not request.user.is_authenticated(): + + allowed, own = models.check_model_access_control(request, model, + available_perms) + if not allowed: return HttpResponse(EMPTY, mimetype='text/plain') - if request.user.ishtaruser.has_right('administrator', - session=request.session): - allowed = True - own = False - else: - for perm, lbl in model._meta.permissions: - if perm not in available_perms: - continue - cperm = model._meta.app_label + '.' + perm - if request.user.has_perm(cperm) \ - or cperm in request.user.get_all_permissions() \ - or request.user.ishtaruser.has_right( - perm, session=request.session): - allowed = True - if "_own_" not in perm: - own = False - break # max right reach if force_own: own = True if full == 'shortcut' and 'SHORTCUT_SEARCH' in request.session and \ request.session['SHORTCUT_SEARCH'] == 'own': own = True - if not allowed: - return HttpResponse(EMPTY, mimetype='text/plain') # get defaults from model if not extra_request_keys and hasattr(model, 'EXTRA_REQUEST_KEYS'): -- cgit v1.2.3 From 1b642d737b55c20ea2b83afbf63d701acd25fc00 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 13 Apr 2017 12:52:12 +0200 Subject: Access control: fix show own item (not *all* items) (refs #3593) --- ishtar_common/models.py | 2 +- ishtar_common/views.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 77b4ed335..f1de8c60a 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -125,7 +125,7 @@ def check_model_access_control(request, model, available_perms=None): if "_own_" not in perm: own = False break # max right reach - return allowed, own + return allowed, own class Imported(models.Model): diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 3cd00a6a6..f185576ea 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1192,10 +1192,18 @@ def display_item(model, extra_dct=None, show_url=None): def show_item(model, name, extra_dct=None): def func(request, pk, **dct): + allowed, own = models.check_model_access_control(request, model) + if not allowed: + return HttpResponse('', content_type="application/xhtml") + q = model.objects + if own: + query_own = model.get_query_owns(request.user) + if query_own: + q = q.filter(query_own) try: - item = model.objects.get(pk=pk) + item = q.get(pk=pk) except ObjectDoesNotExist: - return HttpResponse(None) + return HttpResponse('NOK') doc_type = 'type' in dct and dct.pop('type') url_name = u"/".join(reverse('show-' + name, args=['0', ''] ).split('/')[:-2]) + u"/" -- cgit v1.2.3 From b82aae46b7af06fa7dc8b52a68b91784cea0118f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 15 May 2017 13:04:33 +0200 Subject: Can manage find index by context record (refs #3590) --- archaeological_finds/models_finds.py | 89 +++- archaeological_finds/tests.py | 62 ++- ...auto__add_field_ishtarsiteprofile_find_index.py | 496 +++++++++++++++++++++ ishtar_common/models.py | 7 + 4 files changed, 630 insertions(+), 24 deletions(-) create mode 100644 ishtar_common/migrations/0076_auto__add_field_ishtarsiteprofile_find_index.py (limited to 'ishtar_common/models.py') diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1b4125e80..668546602 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -31,7 +31,8 @@ from ishtar_common.utils import cached_label_changed, post_save_point from ishtar_common.models import GeneralType, ImageModel, BaseHistorizedItem, \ ShortMenuItem, LightHistorizedItem, HistoricalRecords, OwnPerms, Source, \ - Person, Basket, get_external_id, post_save_cache, ValueGetter + Person, Basket, get_external_id, post_save_cache, ValueGetter, \ + get_current_profile from archaeological_operations.models import AdministrativeAct from archaeological_context_records.models import ContextRecord, Dating @@ -212,13 +213,31 @@ class BaseFind(BaseHistorizedItem, OwnPerms): finds = self.find.filter().order_by("-order").all() return finds and finds[0] - @classmethod - def get_max_index(cls, operation): - q = BaseFind.objects \ - .filter(context_record__operation=operation) + def generate_index(self): + """ + Generate index based on operation or context record (based on + the configuration) + + :return: True if index has been changed. + """ + profile = get_current_profile() + if profile.find_index == u'O': + operation = self.context_record.operation + q = Find.objects \ + .filter(base_finds__context_record__operation=operation) + elif profile.find_index == u'CR': + cr = self.context_record + q = Find.objects \ + .filter(base_finds__context_record=cr) + else: + return False + if self.pk: + q = q.exclude(pk=self.pk) if q.count(): - return q.aggregate(Max('index'))['index__max'] - return 0 + self.index = q.aggregate(Max('index'))['index__max'] + 1 + else: + self.index = 1 + return True def _ope_code(self): if not self.context_record.operation: @@ -992,6 +1011,43 @@ class Find(ValueGetter, BaseHistorizedItem, ImageModel, OwnPerms, c.execute(sql, args) transaction.commit_unless_managed() + def generate_index(self): + """ + Generate index based on operation or context record (based on + the configuration) + + :return: True if index has been changed. + """ + bfs = self.base_finds + profile = get_current_profile() + if profile.find_index == u'O': + bfs = bfs.filter( + context_record__operation__pk__isnull=False).order_by( + '-context_record__operation__start_date') + if not bfs.count(): + return False + operation = bfs.all()[0].context_record.operation + q = Find.objects \ + .filter(base_finds__context_record__operation=operation) + elif profile.find_index == u'CR': + bfs = bfs.filter( + context_record__pk__isnull=False).order_by( + 'context_record__pk') + if not bfs.count(): + return False + cr = bfs.all()[0].context_record + q = Find.objects \ + .filter(base_finds__context_record=cr) + else: + return False + if self.pk: + q = q.exclude(pk=self.pk) + if q.count(): + self.index = q.aggregate(Max('index'))['index__max'] + 1 + else: + self.index = 1 + return True + def save(self, *args, **kwargs): super(Find, self).save(*args, **kwargs) @@ -1010,28 +1066,15 @@ class Find(ValueGetter, BaseHistorizedItem, ImageModel, OwnPerms, q = self.base_finds if not self.index and q.count(): - operation = q.filter( - context_record__operation__pk__isnull=False).order_by( - '-context_record__operation__start_date') - if operation.count(): - operation = operation.all()[0].context_record.operation - q = Find.objects \ - .filter(base_finds__context_record__operation=operation) - if self.pk: - q = q.exclude(pk=self.pk) - if q.count(): - self.index = q.aggregate(Max('index'))['index__max'] + 1 - else: - self.index = 1 + changed = self.generate_index() + if changed: self._cached_label_checked = False self.save() for base_find in self.base_finds.filter( context_record__operation__pk__isnull=False).all(): modified = False if not base_find.index: - modified = True - base_find.index = BaseFind.get_max_index( - base_find.context_record.operation) + 1 + modified = base_find.generate_index() short_id = base_find.short_id() if base_find.cache_short_id != short_id: base_find.cache_short_id = short_id diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 1268b4f03..cd6bada77 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -28,7 +28,7 @@ from django.test.client import Client from ishtar_common.models import ImporterType, IshtarUser, ImporterColumn,\ FormaterType, ImportTarget -from ishtar_common.models import Person +from ishtar_common.models import Person, get_current_profile from archaeological_context_records.models import Period, Dating from archaeological_finds import models, views from archaeological_warehouse.models import Warehouse, WarehouseType @@ -312,6 +312,66 @@ class FindTest(FindInit, TestCase): base_find.context_record.external_id, base_find.label)) + def testIndex(self): + profile = get_current_profile() + profile.find_index = u"O" + profile.save() + + op1 = self.create_operation()[-1] + op2 = self.create_operation()[-1] + op1_cr1 = self.create_context_record(data={'label': "CR1", + 'operation': op1})[-1] + op1_cr2 = self.create_context_record(data={'label': "CR2", + 'operation': op1})[-1] + op2_cr1 = self.create_context_record(data={'label': "CR3", + 'operation': op2})[-1] + self.create_finds(data_base={'context_record': op1_cr1}) + find_1 = self.finds[-1] + bf_1 = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_1.index, 1) + self.assertEqual(bf_1.index, 1) + + # index is based on operations + self.create_finds(data_base={'context_record': op1_cr2}) + find_2 = self.finds[-1] + bf_2 = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_2.index, 2) + self.assertEqual(bf_2.index, 2) + + self.create_finds(data_base={'context_record': op2_cr1}) + find_3 = self.finds[-1] + bf_3 = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_3.index, 1) + self.assertEqual(bf_3.index, 1) + + profile = get_current_profile() + profile.find_index = u"CR" + profile.save() + + op3 = self.create_operation()[-1] + op3_cr1 = self.create_context_record(data={'label': "CR1", + 'operation': op3})[-1] + op3_cr2 = self.create_context_record(data={'label': "CR2", + 'operation': op3})[-1] + self.create_finds(data_base={'context_record': op3_cr1}) + find_1b = self.finds[-1] + bf_1b = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_1b.index, 1) + self.assertEqual(bf_1b.index, 1) + + # index now based on context records + self.create_finds(data_base={'context_record': op3_cr2}) + find_2b = self.finds[-1] + bf_2b = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_2b.index, 1) + self.assertEqual(bf_2b.index, 1) + + self.create_finds(data_base={'context_record': op3_cr2}) + find_3b = self.finds[-1] + bf_3b = models.BaseFind.objects.get(pk=self.base_finds[-1].pk) + self.assertEqual(find_3b.index, 2) + self.assertEqual(bf_3b.index, 2) + def testShowFind(self): find = self.finds[0] response = self.client.get(reverse('display-find', args=[find.pk])) diff --git a/ishtar_common/migrations/0076_auto__add_field_ishtarsiteprofile_find_index.py b/ishtar_common/migrations/0076_auto__add_field_ishtarsiteprofile_find_index.py new file mode 100644 index 000000000..84bf5f971 --- /dev/null +++ b/ishtar_common/migrations/0076_auto__add_field_ishtarsiteprofile_find_index.py @@ -0,0 +1,496 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'IshtarSiteProfile.find_index' + db.add_column('ishtar_common_ishtarsiteprofile', 'find_index', + self.gf('django.db.models.fields.CharField')(default='O', max_length=2), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'IshtarSiteProfile.find_index' + db.delete_column('ishtar_common_ishtarsiteprofile', 'find_index') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.author': { + 'Meta': {'ordering': "('author_type__order', 'person__name')", 'object_name': 'Author'}, + 'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'ordering': "['order', 'label']", 'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + 'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.department': { + 'Meta': {'ordering': "['number']", 'object_name': 'Department'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'ordering': "['label']", 'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.formatertype': { + 'Meta': {'ordering': "('formater_type', 'options')", 'unique_together': "(('formater_type', 'options', 'many_split'),)", 'object_name': 'FormaterType'}, + 'formater_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'many_split': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'options': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.globalvar': { + 'Meta': {'ordering': "['slug']", 'object_name': 'GlobalVar'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalorganization': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOrganization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'organization_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalperson': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalPerson'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importercolumn': { + 'Meta': {'ordering': "('importer_type', 'col_number')", 'unique_together': "(('importer_type', 'col_number'),)", 'object_name': 'ImporterColumn'}, + 'col_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'export_field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'columns'", 'to': "orm['ishtar_common.ImporterType']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'regexp_pre_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'ishtar_common.importerdefault': { + 'Meta': {'object_name': 'ImporterDefault'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'defaults'", 'to': "orm['ishtar_common.ImporterType']"}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerdefaultvalues': { + 'Meta': {'object_name': 'ImporterDefaultValues'}, + 'default_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'default_values'", 'to': "orm['ishtar_common.ImporterDefault']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerduplicatefield': { + 'Meta': {'object_name': 'ImporterDuplicateField'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'duplicate_fields'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'ishtar_common.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.importtarget': { + 'Meta': {'object_name': 'ImportTarget'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'targets'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'formater_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.FormaterType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'regexp_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.ishtarsiteprofile': { + 'Meta': {'ordering': "['label']", 'object_name': 'IshtarSiteProfile'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 0, 0, 0)'", 'max_length': '200'}), + 'base_find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{context_record__external_id}-{label}'"}), + 'container_external_id': ('django.db.models.fields.TextField', [], {'default': "'{responsible__external_id}-{index}'"}), + 'context_record': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'context_record_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,200,0,0.2)'", 'max_length': '200'}), + 'context_record_external_id': ('django.db.models.fields.TextField', [], {'default': "'{parcel__external_id}-{label}'"}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "u'\\u20ac'", 'max_length': "'5'"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file_external_id': ('django.db.models.fields.TextField', [], {'default': "'{year}-{numeric_reference}'"}), + 'files': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'files_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 32, 210, 0.1)'", 'max_length': '200'}), + 'find': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'find_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,0,0,0.15)'", 'max_length': '200'}), + 'find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{get_first_base_find__context_record__external_id}-{label}'"}), + 'find_index': ('django.db.models.fields.CharField', [], {'default': "'O'", 'max_length': '2'}), + 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'mapping': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'mapping_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(72, 236, 0, 0.15)'", 'max_length': '200'}), + 'parcel_external_id': ('django.db.models.fields.TextField', [], {'default': "'{associated_file__external_id}{operation__code_patriarche}-{town__numero_insee}-{section}{parcel_number}'"}), + 'person_raw_name': ('django.db.models.fields.TextField', [], {'default': "'{name|upper} {surname}'"}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'warehouse': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'warehouse_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(10,20,200,0.15)'", 'max_length': '200'}), + 'warehouse_external_id': ('django.db.models.fields.TextField', [], {'default': "'{name|slug}'"}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.itemkey': { + 'Meta': {'object_name': 'ItemKey'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.organization': { + 'Meta': {'object_name': 'Organization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.regexp': { + 'Meta': {'object_name': 'Regexp'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'regexp': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'ordering': "['label']", 'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.targetkey': { + 'Meta': {'unique_together': "(('target', 'key', 'associated_user', 'associated_import'),)", 'object_name': 'TargetKey'}, + 'associated_import': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'associated_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_set': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'key': ('django.db.models.fields.TextField', [], {}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'keys'", 'to': "orm['ishtar_common.ImportTarget']"}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + 'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}), + 'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), + 'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['ishtar_common'] \ No newline at end of file diff --git a/ishtar_common/models.py b/ishtar_common/models.py index f1de8c60a..85bef32f3 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1150,6 +1150,8 @@ def get_external_id(key, item): CURRENCY = ((u"€", _(u"Euro")), (u"$", _(u"US dollar"))) +FIND_INDEX_SOURCE = ((u"O", _(u"Operations")), + (u"CR", _(u"Context records"))) class IshtarSiteProfile(models.Model, Cached): @@ -1171,6 +1173,11 @@ class IshtarSiteProfile(models.Model, Cached): default='rgba(210,200,0,0.2)', max_length=200) find = models.BooleanField(_(u"Finds module"), default=False, help_text=_(u"Need context records module")) + find_index = models.CharField( + _(u"Find index is based on"), default='O', max_length=2, + choices=FIND_INDEX_SOURCE, + help_text=_(u"To prevent irrlevant indexes, change this parameter " + u"only if there is no find in the database")) find_color = models.CharField( _(u"CSS color code for find module"), default='rgba(210,0,0,0.15)', max_length=200) -- cgit v1.2.3 From b1e8ef0f311c786e6e390418b73ebe8e0d305562 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 May 2017 12:18:44 +0200 Subject: Update translations --- archaeological_finds/locale/django.pot | 360 ++++++++++----------- ishtar_common/locale/django.pot | 544 +++++++++++++++---------------- ishtar_common/models.py | 2 +- translations/de/ishtar_common.po | 544 +++++++++++++++---------------- translations/fr/archaeological_finds.po | 360 ++++++++++----------- translations/fr/ishtar_common.po | 551 ++++++++++++++++---------------- 6 files changed, 1197 insertions(+), 1164 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 4a9cc517c..f3b087244 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -9,161 +9,161 @@ msgid "" msgstr "" -#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:519 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:538 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:686 models_finds.py:1117 -#: models_finds.py:1138 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1160 +#: models_finds.py:1181 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:150 -#: models_finds.py:616 +#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:151 +#: models_finds.py:635 msgid "Free ID" msgstr "" -#: forms.py:144 models_finds.py:669 +#: forms.py:144 models_finds.py:688 msgid "Previous ID" msgstr "" -#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:154 -#: models_finds.py:617 models_treatments.py:128 +#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:155 +#: models_finds.py:636 models_treatments.py:128 msgid "Description" msgstr "" -#: forms.py:148 forms.py:389 models_finds.py:163 +#: forms.py:148 forms.py:389 models_finds.py:164 msgid "Batch/object" msgstr "" -#: forms.py:150 models_finds.py:646 +#: forms.py:150 models_finds.py:665 msgid "Is complete?" msgstr "" -#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:50 +#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:51 msgid "Material type" msgstr "" -#: forms.py:155 forms.py:381 models_finds.py:62 models_finds.py:621 +#: forms.py:155 forms.py:381 models_finds.py:63 models_finds.py:640 msgid "Conservatory state" msgstr "" -#: forms.py:158 models_finds.py:623 +#: forms.py:158 models_finds.py:642 msgid "Conservatory comment" msgstr "" -#: forms.py:161 models_finds.py:112 models_finds.py:649 +#: forms.py:161 models_finds.py:113 models_finds.py:668 msgid "Object types" msgstr "" -#: forms.py:164 forms.py:380 models_finds.py:71 +#: forms.py:164 forms.py:380 models_finds.py:72 msgid "Preservation type" msgstr "" -#: forms.py:167 forms.py:383 models_finds.py:651 +#: forms.py:167 forms.py:383 models_finds.py:670 msgid "Integrity / interest" msgstr "" -#: forms.py:170 forms.py:385 models_finds.py:654 +#: forms.py:170 forms.py:385 models_finds.py:673 msgid "Remarkability" msgstr "" -#: forms.py:173 models_finds.py:168 +#: forms.py:173 models_finds.py:169 msgid "Point of topographic reference" msgstr "" -#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:209 +#: forms.py:176 models_finds.py:171 templates/ishtar/sheet_find.html:209 msgid "X" msgstr "" -#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:210 +#: forms.py:177 models_finds.py:172 templates/ishtar/sheet_find.html:210 msgid "Y" msgstr "" -#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:211 +#: forms.py:178 models_finds.py:173 templates/ishtar/sheet_find.html:211 msgid "Z" msgstr "" -#: forms.py:180 models_finds.py:180 +#: forms.py:180 models_finds.py:181 msgid "Spatial Reference System" msgstr "" -#: forms.py:183 models_finds.py:173 +#: forms.py:183 models_finds.py:174 msgid "Estimated error for X" msgstr "" -#: forms.py:185 models_finds.py:175 +#: forms.py:185 models_finds.py:176 msgid "Estimated error for Y" msgstr "" -#: forms.py:187 models_finds.py:177 +#: forms.py:187 models_finds.py:178 msgid "Estimated error for Z" msgstr "" -#: forms.py:188 models_finds.py:658 +#: forms.py:188 models_finds.py:677 msgid "Length (cm)" msgstr "" -#: forms.py:189 models_finds.py:659 +#: forms.py:189 models_finds.py:678 msgid "Width (cm)" msgstr "" -#: forms.py:190 models_finds.py:660 +#: forms.py:190 models_finds.py:679 msgid "Height (cm)" msgstr "" -#: forms.py:191 models_finds.py:661 +#: forms.py:191 models_finds.py:680 msgid "Diameter (cm)" msgstr "" -#: forms.py:192 models_finds.py:662 +#: forms.py:192 models_finds.py:681 msgid "Thickness (cm)" msgstr "" -#: forms.py:193 forms.py:634 models_finds.py:628 +#: forms.py:193 forms.py:634 models_finds.py:647 msgid "Volume (l)" msgstr "" -#: forms.py:194 forms.py:635 models_finds.py:629 +#: forms.py:194 forms.py:635 models_finds.py:648 msgid "Weight (g)" msgstr "" -#: forms.py:196 models_finds.py:663 +#: forms.py:196 models_finds.py:682 msgid "Dimensions comment" msgstr "" -#: forms.py:197 forms.py:636 models_finds.py:632 +#: forms.py:197 forms.py:636 models_finds.py:651 msgid "Find number" msgstr "" -#: forms.py:199 models_finds.py:657 +#: forms.py:199 models_finds.py:676 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:200 models_finds.py:665 +#: forms.py:200 models_finds.py:684 msgid "Mark" msgstr "" -#: forms.py:201 forms.py:390 models_finds.py:671 +#: forms.py:201 forms.py:390 models_finds.py:690 msgid "Check" msgstr "" -#: forms.py:203 models_finds.py:673 +#: forms.py:203 models_finds.py:692 msgid "Check date" msgstr "" -#: forms.py:204 forms_treatments.py:136 forms_treatments.py:478 -#: models_finds.py:155 models_finds.py:666 models_treatments.py:127 +#: forms.py:204 forms_treatments.py:136 forms_treatments.py:479 +#: models_finds.py:156 models_finds.py:685 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "" -#: forms.py:207 models_finds.py:667 +#: forms.py:207 models_finds.py:686 msgid "Comment on dating" msgstr "" -#: forms.py:208 models_finds.py:675 +#: forms.py:208 models_finds.py:694 msgid "Estimated value" msgstr "" @@ -186,7 +186,7 @@ msgstr "" msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:310 forms.py:341 models_finds.py:640 +#: forms.py:310 forms.py:341 models_finds.py:659 msgid "Dating" msgstr "" @@ -194,14 +194,14 @@ msgstr "" msgid "Period" msgstr "" -#: forms.py:316 forms_treatments.py:138 forms_treatments.py:282 -#: forms_treatments.py:480 models_finds.py:1143 models_treatments.py:130 +#: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 +#: forms_treatments.py:481 models_finds.py:1186 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:95 #: templates/ishtar/sheet_find.html:137 msgid "Start date" msgstr "" -#: forms.py:318 models_finds.py:1144 models_treatments.py:310 +#: forms.py:318 models_finds.py:1187 models_treatments.py:310 #: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 msgid "End date" msgstr "" @@ -218,17 +218,17 @@ msgstr "" msgid "Precise dating" msgstr "" -#: forms.py:345 models_finds.py:187 +#: forms.py:345 models_finds.py:188 msgid "Short ID" msgstr "" -#: forms.py:346 models_finds.py:190 +#: forms.py:346 models_finds.py:191 msgid "Complete ID" msgstr "" #: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 -#: forms_treatments.py:328 forms_treatments.py:400 forms_treatments.py:450 -#: forms_treatments.py:578 models_treatments.py:103 models_treatments.py:483 +#: forms_treatments.py:329 forms_treatments.py:401 forms_treatments.py:451 +#: forms_treatments.py:579 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "" @@ -252,7 +252,7 @@ msgstr "" msgid "Search within related context records" msgstr "" -#: forms.py:378 models_finds.py:111 +#: forms.py:378 models_finds.py:112 msgid "Object type" msgstr "" @@ -284,7 +284,7 @@ msgstr "" msgid "Upstream finds" msgstr "" -#: forms.py:511 models_finds.py:687 +#: forms.py:511 models_finds.py:706 msgid "Finds" msgstr "" @@ -340,11 +340,11 @@ msgstr "" msgid "Description of the archaeological find" msgstr "" -#: forms.py:700 forms_treatments.py:679 forms_treatments.py:705 +#: forms.py:700 forms_treatments.py:680 forms_treatments.py:706 msgid "Documentation search" msgstr "" -#: forms.py:702 forms_treatments.py:681 forms_treatments.py:707 +#: forms.py:702 forms_treatments.py:682 forms_treatments.py:708 msgid "You should select a document." msgstr "" @@ -365,20 +365,20 @@ msgstr "" msgid "Other ref." msgstr "" -#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:329 -#: forms_treatments.py:392 forms_treatments.py:401 forms_treatments.py:503 -#: forms_treatments.py:579 forms_treatments.py:646 models_treatments.py:105 +#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:330 +#: forms_treatments.py:393 forms_treatments.py:402 forms_treatments.py:504 +#: forms_treatments.py:580 forms_treatments.py:647 models_treatments.py:105 #: models_treatments.py:485 msgid "Index" msgstr "" -#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:290 -#: forms_treatments.py:345 forms_treatments.py:667 models_treatments.py:56 +#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:291 +#: forms_treatments.py:346 forms_treatments.py:668 models_treatments.py:56 #: models_treatments.py:110 models_treatments.py:308 msgid "Treatment type" msgstr "" -#: forms_treatments.py:68 forms_treatments.py:649 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:650 views.py:398 msgid "Treatment search" msgstr "" @@ -395,7 +395,7 @@ msgstr "" msgid "Target" msgstr "" -#: forms_treatments.py:107 forms_treatments.py:461 models_treatments.py:120 +#: forms_treatments.py:107 forms_treatments.py:462 models_treatments.py:120 msgid "Responsible" msgstr "" @@ -411,7 +411,7 @@ msgstr "" msgid "Container (relevant for packaging)" msgstr "" -#: forms_treatments.py:131 forms_treatments.py:457 +#: forms_treatments.py:131 forms_treatments.py:458 msgid "External ref." msgstr "" @@ -419,8 +419,8 @@ msgstr "" msgid "Goal" msgstr "" -#: forms_treatments.py:140 forms_treatments.py:282 forms_treatments.py:486 -#: forms_treatments.py:534 models_treatments.py:131 models_treatments.py:505 +#: forms_treatments.py:140 forms_treatments.py:283 forms_treatments.py:487 +#: forms_treatments.py:535 models_treatments.py:131 models_treatments.py:505 msgid "Closing date" msgstr "" @@ -462,173 +462,173 @@ msgstr "" msgid "A responsible or an organization must be defined." msgstr "" -#: forms_treatments.py:256 +#: forms_treatments.py:257 msgid "Another treatment with this index exists for {}." msgstr "" -#: forms_treatments.py:262 models_treatments.py:108 +#: forms_treatments.py:263 models_treatments.py:108 msgid "Associated request" msgstr "" -#: forms_treatments.py:266 forms_treatments.py:441 ishtar_menu.py:108 +#: forms_treatments.py:267 forms_treatments.py:442 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" -#: forms_treatments.py:275 +#: forms_treatments.py:276 msgid "" "Are you sure you want to delete this treatment? All changes made to the " "associated finds since this treatment record will be lost!" msgstr "" -#: forms_treatments.py:278 +#: forms_treatments.py:279 msgid "Would you like to delete this treatment?" msgstr "" -#: forms_treatments.py:280 +#: forms_treatments.py:281 msgid "months" msgstr "" -#: forms_treatments.py:280 +#: forms_treatments.py:281 msgid "years" msgstr "" -#: forms_treatments.py:286 forms_treatments.py:538 +#: forms_treatments.py:287 forms_treatments.py:539 msgid "Slicing" msgstr "" -#: forms_treatments.py:289 forms_treatments.py:541 +#: forms_treatments.py:290 forms_treatments.py:542 msgid "Date get from" msgstr "" -#: forms_treatments.py:292 forms_treatments.py:544 +#: forms_treatments.py:293 forms_treatments.py:545 msgid "Date after" msgstr "" -#: forms_treatments.py:294 forms_treatments.py:546 +#: forms_treatments.py:295 forms_treatments.py:547 msgid "Date before" msgstr "" -#: forms_treatments.py:330 forms_treatments.py:378 forms_treatments.py:580 -#: forms_treatments.py:631 +#: forms_treatments.py:331 forms_treatments.py:379 forms_treatments.py:581 +#: forms_treatments.py:632 msgid "Act type" msgstr "" -#: forms_treatments.py:331 forms_treatments.py:581 +#: forms_treatments.py:332 forms_treatments.py:582 msgid "Indexed?" msgstr "" -#: forms_treatments.py:332 forms_treatments.py:582 +#: forms_treatments.py:333 forms_treatments.py:583 msgid "Object" msgstr "" -#: forms_treatments.py:336 forms_treatments.py:586 +#: forms_treatments.py:337 forms_treatments.py:587 msgid "Signature date after" msgstr "" -#: forms_treatments.py:338 forms_treatments.py:588 +#: forms_treatments.py:339 forms_treatments.py:589 msgid "Signature date before" msgstr "" -#: forms_treatments.py:340 forms_treatments.py:662 +#: forms_treatments.py:341 forms_treatments.py:663 msgid "Treatment name" msgstr "" -#: forms_treatments.py:341 forms_treatments.py:663 +#: forms_treatments.py:342 forms_treatments.py:664 msgid "Treatment year" msgstr "" -#: forms_treatments.py:342 forms_treatments.py:664 +#: forms_treatments.py:343 forms_treatments.py:665 msgid "Treatment index" msgstr "" -#: forms_treatments.py:344 forms_treatments.py:666 +#: forms_treatments.py:345 forms_treatments.py:667 msgid "Treatment internal reference" msgstr "" -#: forms_treatments.py:348 forms_treatments.py:600 +#: forms_treatments.py:349 forms_treatments.py:601 msgid "Modified by" msgstr "" -#: forms_treatments.py:398 forms_treatments.py:448 models_treatments.py:490 +#: forms_treatments.py:399 forms_treatments.py:449 models_treatments.py:490 msgid "Name" msgstr "" -#: forms_treatments.py:399 forms_treatments.py:455 +#: forms_treatments.py:400 forms_treatments.py:456 msgid "Internal ref." msgstr "" -#: forms_treatments.py:402 forms_treatments.py:459 models_treatments.py:92 +#: forms_treatments.py:403 forms_treatments.py:460 models_treatments.py:92 #: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:132 #: templates/ishtar/sheet_find.html:232 msgid "Type" msgstr "" -#: forms_treatments.py:404 +#: forms_treatments.py:405 msgid "In charge" msgstr "" -#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:499 +#: forms_treatments.py:411 forms_treatments.py:468 models_treatments.py:499 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "" -#: forms_treatments.py:416 forms_treatments.py:473 models_treatments.py:503 +#: forms_treatments.py:417 forms_treatments.py:474 models_treatments.py:503 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "" -#: forms_treatments.py:429 forms_treatments.py:654 views.py:502 +#: forms_treatments.py:430 forms_treatments.py:655 views.py:502 msgid "Treatment request search" msgstr "" -#: forms_treatments.py:483 forms_treatments.py:533 models_treatments.py:509 +#: forms_treatments.py:484 forms_treatments.py:534 models_treatments.py:509 msgid "Reception date" msgstr "" -#: forms_treatments.py:522 +#: forms_treatments.py:523 msgid "Another treatment request with this index exists for {}." msgstr "" -#: forms_treatments.py:528 +#: forms_treatments.py:529 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: forms_treatments.py:529 +#: forms_treatments.py:530 msgid "Would you like to delete this treatment request?" msgstr "" -#: forms_treatments.py:532 models_treatments.py:507 +#: forms_treatments.py:533 models_treatments.py:507 msgid "Creation date" msgstr "" -#: forms_treatments.py:542 forms_treatments.py:597 forms_treatments.py:693 +#: forms_treatments.py:543 forms_treatments.py:598 forms_treatments.py:694 #: models_treatments.py:468 models_treatments.py:492 msgid "Treatment request type" msgstr "" -#: forms_treatments.py:590 forms_treatments.py:686 +#: forms_treatments.py:591 forms_treatments.py:687 msgid "Treatment request name" msgstr "" -#: forms_treatments.py:592 forms_treatments.py:688 +#: forms_treatments.py:593 forms_treatments.py:689 msgid "Treatment request year" msgstr "" -#: forms_treatments.py:594 forms_treatments.py:690 +#: forms_treatments.py:595 forms_treatments.py:691 msgid "Treatment request index" msgstr "" -#: forms_treatments.py:596 forms_treatments.py:692 +#: forms_treatments.py:597 forms_treatments.py:693 msgid "Treatment request internal reference" msgstr "" -#: forms_treatments.py:651 +#: forms_treatments.py:652 msgid "You should select a treatment." msgstr "" -#: forms_treatments.py:657 +#: forms_treatments.py:658 msgid "You should select a treatment request." msgstr "" @@ -662,7 +662,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1140 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1183 msgid "Administrative act" msgstr "" @@ -685,303 +685,303 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: models_finds.py:43 +#: models_finds.py:44 msgid "Code" msgstr "" -#: models_finds.py:44 +#: models_finds.py:45 msgid "Recommendation" msgstr "" -#: models_finds.py:47 +#: models_finds.py:48 msgid "Parent material" msgstr "" -#: models_finds.py:51 models_finds.py:539 models_finds.py:619 +#: models_finds.py:52 models_finds.py:558 models_finds.py:638 msgid "Material types" msgstr "" -#: models_finds.py:59 +#: models_finds.py:60 msgid "Parent conservatory state" msgstr "" -#: models_finds.py:63 +#: models_finds.py:64 msgid "Conservatory states" msgstr "" -#: models_finds.py:72 +#: models_finds.py:73 msgid "Preservation types" msgstr "" -#: models_finds.py:80 +#: models_finds.py:81 msgid "Integrity / interest type" msgstr "" -#: models_finds.py:81 +#: models_finds.py:82 msgid "Integrity / interest types" msgstr "" -#: models_finds.py:89 +#: models_finds.py:90 msgid "Remarkability type" msgstr "" -#: models_finds.py:90 +#: models_finds.py:91 msgid "Remarkability types" msgstr "" -#: models_finds.py:97 models_finds.py:615 models_treatments.py:40 +#: models_finds.py:98 models_finds.py:634 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "" -#: models_finds.py:99 +#: models_finds.py:100 msgid "Batch type" msgstr "" -#: models_finds.py:100 +#: models_finds.py:101 msgid "Batch types" msgstr "" -#: models_finds.py:108 +#: models_finds.py:109 msgid "Parent" msgstr "" -#: models_finds.py:151 models_finds.py:612 models_treatments.py:125 +#: models_finds.py:152 models_finds.py:631 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "" -#: models_finds.py:153 models_finds.py:614 +#: models_finds.py:154 models_finds.py:633 msgid "External ID is set automatically" msgstr "" -#: models_finds.py:156 +#: models_finds.py:157 msgid "Special interest" msgstr "" -#: models_finds.py:160 +#: models_finds.py:161 msgid "Context Record" msgstr "" -#: models_finds.py:161 +#: models_finds.py:162 msgid "Discovery date" msgstr "" -#: models_finds.py:166 +#: models_finds.py:167 msgid "Material index" msgstr "" -#: models_finds.py:182 +#: models_finds.py:183 msgid "Point (2D)" msgstr "" -#: models_finds.py:183 +#: models_finds.py:184 msgid "Point" msgstr "" -#: models_finds.py:184 +#: models_finds.py:185 msgid "Line" msgstr "" -#: models_finds.py:185 +#: models_finds.py:186 msgid "Polygon" msgstr "" -#: models_finds.py:188 models_finds.py:191 +#: models_finds.py:189 models_finds.py:192 msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:197 models_finds.py:610 +#: models_finds.py:198 models_finds.py:629 msgid "Base find" msgstr "" -#: models_finds.py:198 +#: models_finds.py:199 msgid "Base finds" msgstr "" -#: models_finds.py:200 +#: models_finds.py:201 msgid "Can view all Base finds" msgstr "" -#: models_finds.py:201 +#: models_finds.py:202 msgid "Can view own Base find" msgstr "" -#: models_finds.py:202 +#: models_finds.py:203 msgid "Can add own Base find" msgstr "" -#: models_finds.py:203 +#: models_finds.py:204 msgid "Can change own Base find" msgstr "" -#: models_finds.py:204 +#: models_finds.py:205 msgid "Can delete own Base find" msgstr "" -#: models_finds.py:443 +#: models_finds.py:462 msgid "g" msgstr "" -#: models_finds.py:444 +#: models_finds.py:463 msgid "kg" msgstr "" -#: models_finds.py:446 +#: models_finds.py:465 msgid "Not checked" msgstr "" -#: models_finds.py:447 +#: models_finds.py:466 msgid "Checked but incorrect" msgstr "" -#: models_finds.py:448 +#: models_finds.py:467 msgid "Checked and correct" msgstr "" -#: models_finds.py:520 +#: models_finds.py:539 msgid "Base find - Short ID" msgstr "" -#: models_finds.py:521 +#: models_finds.py:540 msgid "Base find - Complete ID" msgstr "" -#: models_finds.py:523 +#: models_finds.py:542 msgid "Operation (code)" msgstr "" -#: models_finds.py:525 +#: models_finds.py:544 msgid "Town" msgstr "" -#: models_finds.py:527 +#: models_finds.py:546 msgid "Operation (name)" msgstr "" -#: models_finds.py:529 +#: models_finds.py:548 msgid "Parcel" msgstr "" -#: models_finds.py:530 +#: models_finds.py:549 msgid "Batch" msgstr "" -#: models_finds.py:531 +#: models_finds.py:550 msgid "Base find - Comment" msgstr "" -#: models_finds.py:532 +#: models_finds.py:551 msgid "Base find - Description" msgstr "" -#: models_finds.py:533 +#: models_finds.py:552 msgid "Base find - Topographic localisation" msgstr "" -#: models_finds.py:535 +#: models_finds.py:554 msgid "Base find - Special interest" msgstr "" -#: models_finds.py:536 +#: models_finds.py:555 msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:537 models_finds.py:643 models_treatments.py:132 +#: models_finds.py:556 models_finds.py:662 models_treatments.py:132 #: models_treatments.py:312 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Container" msgstr "" -#: models_finds.py:538 +#: models_finds.py:557 msgid "Periods" msgstr "" -#: models_finds.py:626 +#: models_finds.py:645 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:630 +#: models_finds.py:649 msgid "Weight unit" msgstr "" -#: models_finds.py:636 templates/ishtar/sheet_find.html:82 +#: models_finds.py:655 templates/ishtar/sheet_find.html:82 msgid "Upstream treatment" msgstr "" -#: models_finds.py:639 templates/ishtar/sheet_find.html:124 +#: models_finds.py:658 templates/ishtar/sheet_find.html:124 msgid "Downstream treatment" msgstr "" -#: models_finds.py:678 +#: models_finds.py:697 msgid "Collection" msgstr "" -#: models_finds.py:680 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:699 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "" -#: models_finds.py:689 +#: models_finds.py:708 msgid "Can view all Finds" msgstr "" -#: models_finds.py:690 +#: models_finds.py:709 msgid "Can view own Find" msgstr "" -#: models_finds.py:691 +#: models_finds.py:710 msgid "Can add own Find" msgstr "" -#: models_finds.py:692 +#: models_finds.py:711 msgid "Can change own Find" msgstr "" -#: models_finds.py:693 +#: models_finds.py:712 msgid "Can delete own Find" msgstr "" -#: models_finds.py:699 +#: models_finds.py:718 msgid "FIND" msgstr "" -#: models_finds.py:1103 +#: models_finds.py:1146 msgid "Find documentation" msgstr "" -#: models_finds.py:1104 +#: models_finds.py:1147 msgid "Find documentations" msgstr "" -#: models_finds.py:1107 +#: models_finds.py:1150 msgid "Can view all Find sources" msgstr "" -#: models_finds.py:1109 +#: models_finds.py:1152 msgid "Can view own Find source" msgstr "" -#: models_finds.py:1111 +#: models_finds.py:1154 msgid "Can add own Find source" msgstr "" -#: models_finds.py:1113 +#: models_finds.py:1156 msgid "Can change own Find source" msgstr "" -#: models_finds.py:1115 +#: models_finds.py:1158 msgid "Can delete own Find source" msgstr "" -#: models_finds.py:1141 +#: models_finds.py:1184 msgid "Person" msgstr "" -#: models_finds.py:1147 +#: models_finds.py:1190 msgid "Property" msgstr "" -#: models_finds.py:1148 +#: models_finds.py:1191 msgid "Properties" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index eb5bf2bf1..002f724cf 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -176,12 +176,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:297 models.py:1549 +#: forms.py:297 models.py:1556 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1615 models.py:3078 +#: forms_common.py:408 models.py:1622 models.py:3085 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -197,8 +197,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

" msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2678 -#: models.py:2871 models.py:2933 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2685 +#: models.py:2878 models.py:2940 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -209,64 +209,64 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2561 models.py:2652 +#: ishtar_menu.py:75 models.py:2568 models.py:2659 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 -#: forms_common.py:378 forms_common.py:448 models.py:1157 models.py:1548 -#: models.py:1817 models.py:1833 models.py:2071 models.py:2349 models.py:2555 -#: models.py:2664 models.py:3064 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1159 models.py:1555 +#: models.py:1824 models.py:1840 models.py:2078 models.py:2356 models.py:2562 +#: models.py:2671 models.py:3071 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:176 models.py:1770 models.py:2202 +#: forms_common.py:176 models.py:1777 models.py:2209 msgid "Organization type" msgstr "" -#: forms_common.py:178 forms_common.py:402 models.py:1610 +#: forms_common.py:178 forms_common.py:402 models.py:1617 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:180 forms_common.py:405 models.py:1611 +#: forms_common.py:180 forms_common.py:405 models.py:1618 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:182 forms_common.py:406 models.py:1613 +#: forms_common.py:182 forms_common.py:406 models.py:1620 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:185 forms_common.py:409 models.py:1616 +#: forms_common.py:185 forms_common.py:409 models.py:1623 msgid "Country" msgstr "" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1643 +#: forms_common.py:450 forms_common.py:574 models.py:1650 msgid "Email" msgstr "" -#: forms_common.py:188 forms_common.py:385 models.py:1628 +#: forms_common.py:188 forms_common.py:385 models.py:1635 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:189 forms_common.py:394 models.py:1640 +#: forms_common.py:189 forms_common.py:394 models.py:1647 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2240 -#: models.py:2557 models.py:2999 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2247 +#: models.py:2564 models.py:3006 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -290,7 +290,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2662 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2669 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -308,25 +308,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2203 -#: models.py:2656 models.py:2658 models.py:2996 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2210 +#: models.py:2663 models.py:2665 models.py:3003 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2660 +#: forms_common.py:374 models.py:2667 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2666 +#: forms_common.py:380 models.py:2673 msgid "Raw name" msgstr "" -#: forms_common.py:383 models.py:1629 +#: forms_common.py:383 models.py:1636 msgid "Phone description" msgstr "" -#: forms_common.py:386 models.py:1631 models.py:1633 +#: forms_common.py:386 models.py:1638 models.py:1640 msgid "Phone description 2" msgstr "" @@ -334,11 +334,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:390 models.py:1637 +#: forms_common.py:390 models.py:1644 msgid "Phone description 3" msgstr "" -#: forms_common.py:392 models.py:1635 +#: forms_common.py:392 models.py:1642 msgid "Phone 3" msgstr "" @@ -346,23 +346,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:411 models.py:1618 +#: forms_common.py:411 models.py:1625 msgid "Other address: address" msgstr "" -#: forms_common.py:414 models.py:1621 +#: forms_common.py:414 models.py:1628 msgid "Other address: address complement" msgstr "" -#: forms_common.py:416 models.py:1622 +#: forms_common.py:416 models.py:1629 msgid "Other address: postal code" msgstr "" -#: forms_common.py:418 models.py:1624 +#: forms_common.py:418 models.py:1631 msgid "Other address: town" msgstr "" -#: forms_common.py:420 models.py:1626 +#: forms_common.py:420 models.py:1633 msgid "Other address: country" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2609 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2616 msgid "Person type" msgstr "" @@ -410,7 +410,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:3079 +#: forms_common.py:636 forms_common.py:649 models.py:3086 msgid "Towns" msgstr "" @@ -426,7 +426,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2204 models.py:2971 +#: forms_common.py:783 forms_common.py:831 models.py:2211 models.py:2978 msgid "Source type" msgstr "" @@ -438,37 +438,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:3010 +#: forms_common.py:791 models.py:3017 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:3012 +#: forms_common.py:792 models.py:3019 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2375 models.py:3014 +#: forms_common.py:794 models.py:2382 models.py:3021 msgid "Creation date" msgstr "" -#: forms_common.py:797 models.py:3017 +#: forms_common.py:797 models.py:3024 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:419 models.py:746 -#: models.py:2098 models.py:2670 models.py:3024 +#: models.py:2105 models.py:2677 models.py:3031 msgid "Comment" msgstr "" -#: forms_common.py:801 forms_common.py:834 models.py:1159 models.py:1837 -#: models.py:2025 models.py:2072 models.py:3023 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1161 models.py:1844 +#: models.py:2032 models.py:2079 models.py:3030 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:804 models.py:3025 +#: forms_common.py:804 models.py:3032 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:3027 +#: forms_common.py:806 forms_common.py:838 models.py:3034 msgid "Has a duplicate" msgstr "" @@ -483,7 +483,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2938 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2945 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -496,7 +496,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2205 models.py:2925 models.py:2935 +#: forms_common.py:864 models.py:2212 models.py:2932 models.py:2942 msgid "Author type" msgstr "" @@ -508,7 +508,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2939 models.py:3006 +#: forms_common.py:901 models.py:2946 models.py:3013 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -526,7 +526,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1331 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1640 msgid "Global variables" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2383 +#: ishtar_menu.py:109 models.py:2390 msgid "Imports" msgstr "" @@ -582,7 +582,7 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:415 models.py:745 models.py:1583 models.py:1595 models.py:2021 +#: models.py:415 models.py:745 models.py:1590 models.py:1602 models.py:2028 msgid "Label" msgstr "" @@ -590,11 +590,11 @@ msgstr "" msgid "Textual ID" msgstr "" -#: models.py:420 models.py:748 models.py:1552 +#: models.py:420 models.py:748 models.py:1559 msgid "Available" msgstr "" -#: models.py:772 models.py:2144 +#: models.py:772 models.py:2151 msgid "Key" msgstr "" @@ -610,7 +610,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:1019 models.py:2922 models.py:3090 models.py:3146 +#: models.py:1019 models.py:2929 models.py:3097 models.py:3153 msgid "Order" msgstr "" @@ -634,198 +634,216 @@ msgstr "" msgid "US dollar" msgstr "" -#: models.py:1158 models.py:1835 +#: models.py:1153 views.py:1438 views.py:1500 +msgid "Operations" +msgstr "" + +#: models.py:1154 views.py:1440 views.py:1504 +msgid "Context records" +msgstr "" + +#: models.py:1160 models.py:1842 msgid "Slug" msgstr "" -#: models.py:1161 +#: models.py:1163 msgid "CSS color code for base module" msgstr "" -#: models.py:1163 +#: models.py:1165 msgid "Files module" msgstr "" -#: models.py:1165 +#: models.py:1167 msgid "CSS color code for files module" msgstr "" -#: models.py:1167 +#: models.py:1169 msgid "Context records module" msgstr "" -#: models.py:1170 +#: models.py:1172 msgid "CSS color code for context record module" msgstr "" -#: models.py:1172 +#: models.py:1174 msgid "Finds module" msgstr "" -#: models.py:1173 +#: models.py:1175 msgid "Need context records module" msgstr "" -#: models.py:1175 +#: models.py:1177 +msgid "Find index is based on" +msgstr "" + +#: models.py:1179 +msgid "" +"To prevent irrelevant indexes, change this parameter only if there is no " +"find in the database" +msgstr "" + +#: models.py:1182 msgid "CSS color code for find module" msgstr "" -#: models.py:1178 +#: models.py:1185 msgid "Warehouses module" msgstr "" -#: models.py:1179 +#: models.py:1186 msgid "Need finds module" msgstr "" -#: models.py:1181 +#: models.py:1188 msgid "CSS code for warehouse module" msgstr "" -#: models.py:1183 +#: models.py:1190 msgid "Mapping module" msgstr "" -#: models.py:1185 +#: models.py:1192 msgid "CSS code for mapping module" msgstr "" -#: models.py:1188 +#: models.py:1195 msgid "Home page" msgstr "" -#: models.py:1189 +#: models.py:1196 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1193 +#: models.py:1200 msgid "File external id" msgstr "" -#: models.py:1195 +#: models.py:1202 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1200 +#: models.py:1207 msgid "Parcel external id" msgstr "" -#: models.py:1203 +#: models.py:1210 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1208 +#: models.py:1215 msgid "Context record external id" msgstr "" -#: models.py:1210 +#: models.py:1217 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1215 +#: models.py:1222 msgid "Base find external id" msgstr "" -#: models.py:1217 +#: models.py:1224 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1222 +#: models.py:1229 msgid "Find external id" msgstr "" -#: models.py:1224 +#: models.py:1231 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1229 +#: models.py:1236 msgid "Container external id" msgstr "" -#: models.py:1231 +#: models.py:1238 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1236 +#: models.py:1243 msgid "Warehouse external id" msgstr "" -#: models.py:1238 +#: models.py:1245 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1243 +#: models.py:1250 msgid "Raw name for person" msgstr "" -#: models.py:1245 +#: models.py:1252 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1249 +#: models.py:1256 msgid "Current active" msgstr "" -#: models.py:1250 +#: models.py:1257 msgid "Currency" msgstr "" -#: models.py:1254 +#: models.py:1261 msgid "Ishtar site profile" msgstr "" -#: models.py:1255 +#: models.py:1262 msgid "Ishtar site profiles" msgstr "" -#: models.py:1324 +#: models.py:1331 msgid "Variable name" msgstr "" -#: models.py:1325 +#: models.py:1332 msgid "Description of the variable" msgstr "" -#: models.py:1327 models.py:2145 +#: models.py:1334 models.py:2152 msgid "Value" msgstr "" -#: models.py:1330 +#: models.py:1337 msgid "Global variable" msgstr "" -#: models.py:1453 models.py:1483 +#: models.py:1460 models.py:1490 msgid "Total" msgstr "" -#: models.py:1460 models.py:1584 models.py:1596 +#: models.py:1467 models.py:1591 models.py:1603 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -833,663 +851,663 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1547 +#: models.py:1554 msgid "Administrative Act" msgstr "" -#: models.py:1551 +#: models.py:1558 msgid "Associated object" msgstr "" -#: models.py:1555 +#: models.py:1562 msgid "Document template" msgstr "" -#: models.py:1556 +#: models.py:1563 msgid "Document templates" msgstr "" -#: models.py:1587 models.py:1597 models.py:2369 +#: models.py:1594 models.py:1604 models.py:2376 msgid "State" msgstr "" -#: models.py:1601 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1608 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1602 +#: models.py:1609 msgid "Departments" msgstr "" -#: models.py:1639 +#: models.py:1646 msgid "Raw phone" msgstr "" -#: models.py:1645 +#: models.py:1652 msgid "Alternative address is prefered" msgstr "" -#: models.py:1684 +#: models.py:1691 msgid "Tel: " msgstr "" -#: models.py:1688 +#: models.py:1695 msgid "Mobile: " msgstr "" -#: models.py:1692 +#: models.py:1699 msgid "Email: " msgstr "" -#: models.py:1697 +#: models.py:1704 msgid "Merge key" msgstr "" -#: models.py:1771 +#: models.py:1778 msgid "Organization types" msgstr "" -#: models.py:1818 +#: models.py:1825 msgid "Class name" msgstr "" -#: models.py:1821 +#: models.py:1828 msgid "Importer - Model" msgstr "" -#: models.py:1822 +#: models.py:1829 msgid "Importer - Models" msgstr "" -#: models.py:1839 templates/ishtar/dashboards/dashboard_main.html:34 +#: models.py:1846 templates/ishtar/dashboards/dashboard_main.html:34 msgid "Users" msgstr "" -#: models.py:1842 +#: models.py:1849 msgid "Associated model" msgstr "" -#: models.py:1845 +#: models.py:1852 msgid "Models that can accept new items" msgstr "" -#: models.py:1846 +#: models.py:1853 msgid "Leave blank for no restrictions" msgstr "" -#: models.py:1848 +#: models.py:1855 msgid "Is template" msgstr "" -#: models.py:1849 +#: models.py:1856 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1853 +#: models.py:1860 msgid "Importer - Type" msgstr "" -#: models.py:1854 +#: models.py:1861 msgid "Importer - Types" msgstr "" -#: models.py:1953 +#: models.py:1960 msgid "Importer - Default" msgstr "" -#: models.py:1954 +#: models.py:1961 msgid "Importer - Defaults" msgstr "" -#: models.py:1989 +#: models.py:1996 msgid "Importer - Default value" msgstr "" -#: models.py:1990 +#: models.py:1997 msgid "Importer - Default values" msgstr "" -#: models.py:2024 +#: models.py:2031 msgid "Column number" msgstr "" -#: models.py:2027 +#: models.py:2034 msgid "Required" msgstr "" -#: models.py:2029 +#: models.py:2036 msgid "Export field name" msgstr "" -#: models.py:2030 +#: models.py:2037 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: models.py:2035 +#: models.py:2042 msgid "Importer - Column" msgstr "" -#: models.py:2036 +#: models.py:2043 msgid "Importer - Columns" msgstr "" -#: models.py:2056 +#: models.py:2063 msgid "Field name" msgstr "" -#: models.py:2058 models.py:2092 +#: models.py:2065 models.py:2099 msgid "Force creation of new items" msgstr "" -#: models.py:2060 models.py:2094 +#: models.py:2067 models.py:2101 msgid "Concatenate with existing" msgstr "" -#: models.py:2062 models.py:2096 +#: models.py:2069 models.py:2103 msgid "Concatenate character" msgstr "" -#: models.py:2066 +#: models.py:2073 msgid "Importer - Duplicate field" msgstr "" -#: models.py:2067 +#: models.py:2074 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:2074 +#: models.py:2081 msgid "Regular expression" msgstr "" -#: models.py:2077 +#: models.py:2084 msgid "Importer - Regular expression" msgstr "" -#: models.py:2078 +#: models.py:2085 msgid "Importer - Regular expressions" msgstr "" -#: models.py:2101 +#: models.py:2108 msgid "Importer - Target" msgstr "" -#: models.py:2102 +#: models.py:2109 msgid "Importer - Targets" msgstr "" -#: models.py:2126 views.py:570 +#: models.py:2133 views.py:570 msgid "True" msgstr "" -#: models.py:2127 views.py:572 +#: models.py:2134 views.py:572 msgid "False" msgstr "" -#: models.py:2146 +#: models.py:2153 msgid "Is set" msgstr "" -#: models.py:2153 +#: models.py:2160 msgid "Importer - Target key" msgstr "" -#: models.py:2154 +#: models.py:2161 msgid "Importer - Targets keys" msgstr "" -#: models.py:2206 models.py:3002 +#: models.py:2213 models.py:3009 msgid "Format" msgstr "" -#: models.py:2207 models.py:3094 +#: models.py:2214 models.py:3101 msgid "Operation type" msgstr "" -#: models.py:2208 +#: models.py:2215 msgid "Period" msgstr "" -#: models.py:2209 +#: models.py:2216 msgid "Report state" msgstr "" -#: models.py:2210 +#: models.py:2217 msgid "Remain type" msgstr "" -#: models.py:2211 +#: models.py:2218 msgid "Unit" msgstr "" -#: models.py:2213 +#: models.py:2220 msgid "Activity type" msgstr "" -#: models.py:2214 +#: models.py:2221 msgid "Material" msgstr "" -#: models.py:2216 +#: models.py:2223 msgid "Conservatory state" msgstr "" -#: models.py:2217 +#: models.py:2224 msgid "Container type" msgstr "" -#: models.py:2218 +#: models.py:2225 msgid "Preservation type" msgstr "" -#: models.py:2219 +#: models.py:2226 msgid "Object type" msgstr "" -#: models.py:2220 +#: models.py:2227 msgid "Integrity type" msgstr "" -#: models.py:2222 +#: models.py:2229 msgid "Remarkability type" msgstr "" -#: models.py:2223 +#: models.py:2230 msgid "Batch type" msgstr "" -#: models.py:2225 +#: models.py:2232 msgid "Identification type" msgstr "" -#: models.py:2227 +#: models.py:2234 msgid "Context record relation type" msgstr "" -#: models.py:2228 models.py:3152 +#: models.py:2235 models.py:3159 msgid "Spatial reference system" msgstr "" -#: models.py:2229 models.py:2980 +#: models.py:2236 models.py:2987 msgid "Support type" msgstr "" -#: models.py:2230 models.py:2621 +#: models.py:2237 models.py:2628 msgid "Title type" msgstr "" -#: models.py:2236 +#: models.py:2243 msgid "Integer" msgstr "" -#: models.py:2237 +#: models.py:2244 msgid "Float" msgstr "" -#: models.py:2238 +#: models.py:2245 msgid "String" msgstr "" -#: models.py:2239 templates/sheet_ope.html:86 +#: models.py:2246 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2241 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2248 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2242 +#: models.py:2249 msgid "String to boolean" msgstr "" -#: models.py:2243 +#: models.py:2250 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2244 +#: models.py:2251 msgid "Unknow type" msgstr "" -#: models.py:2260 +#: models.py:2267 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2261 +#: models.py:2268 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2262 +#: models.py:2269 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2272 +#: models.py:2279 msgid "Options" msgstr "" -#: models.py:2274 +#: models.py:2281 msgid "Split character(s)" msgstr "" -#: models.py:2278 +#: models.py:2285 msgid "Importer - Formater type" msgstr "" -#: models.py:2279 +#: models.py:2286 msgid "Importer - Formater types" msgstr "" -#: models.py:2331 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2338 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2332 +#: models.py:2339 msgid "Analyse in progress" msgstr "" -#: models.py:2333 +#: models.py:2340 msgid "Analysed" msgstr "" -#: models.py:2334 +#: models.py:2341 msgid "Import pending" msgstr "" -#: models.py:2335 +#: models.py:2342 msgid "Import in progress" msgstr "" -#: models.py:2336 +#: models.py:2343 msgid "Finished with errors" msgstr "" -#: models.py:2337 +#: models.py:2344 msgid "Finished" msgstr "" -#: models.py:2338 +#: models.py:2345 msgid "Archived" msgstr "" -#: models.py:2353 +#: models.py:2360 msgid "Imported file" msgstr "" -#: models.py:2355 +#: models.py:2362 msgid "Associated images (zip file)" msgstr "" -#: models.py:2357 +#: models.py:2364 msgid "Encoding" msgstr "" -#: models.py:2359 +#: models.py:2366 msgid "Skip lines" msgstr "" -#: models.py:2360 templates/ishtar/import_list.html:51 +#: models.py:2367 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2363 +#: models.py:2370 msgid "Result file" msgstr "" -#: models.py:2366 templates/ishtar/import_list.html:57 +#: models.py:2373 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2372 +#: models.py:2379 msgid "Conservative import" msgstr "" -#: models.py:2376 +#: models.py:2383 msgid "End date" msgstr "" -#: models.py:2379 +#: models.py:2386 msgid "Remaining seconds" msgstr "" -#: models.py:2382 +#: models.py:2389 msgid "Import" msgstr "" -#: models.py:2411 +#: models.py:2418 msgid "Analyse" msgstr "" -#: models.py:2413 models.py:2416 +#: models.py:2420 models.py:2423 msgid "Re-analyse" msgstr "" -#: models.py:2414 +#: models.py:2421 msgid "Launch import" msgstr "" -#: models.py:2417 +#: models.py:2424 msgid "Re-import" msgstr "" -#: models.py:2418 +#: models.py:2425 msgid "Archive" msgstr "" -#: models.py:2420 +#: models.py:2427 msgid "Unarchive" msgstr "" -#: models.py:2421 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2562 +#: models.py:2569 msgid "Organizations" msgstr "" -#: models.py:2564 +#: models.py:2571 msgid "Can view all Organizations" msgstr "" -#: models.py:2565 +#: models.py:2572 msgid "Can view own Organization" msgstr "" -#: models.py:2566 +#: models.py:2573 msgid "Can add own Organization" msgstr "" -#: models.py:2568 +#: models.py:2575 msgid "Can change own Organization" msgstr "" -#: models.py:2570 +#: models.py:2577 msgid "Can delete own Organization" msgstr "" -#: models.py:2605 +#: models.py:2612 msgid "Groups" msgstr "" -#: models.py:2610 +#: models.py:2617 msgid "Person types" msgstr "" -#: models.py:2622 +#: models.py:2629 msgid "Title types" msgstr "" -#: models.py:2631 +#: models.py:2638 msgid "Mr" msgstr "" -#: models.py:2632 +#: models.py:2639 msgid "Miss" msgstr "" -#: models.py:2633 +#: models.py:2640 msgid "Mr and Mrs" msgstr "" -#: models.py:2634 +#: models.py:2641 msgid "Mrs" msgstr "" -#: models.py:2635 +#: models.py:2642 msgid "Doctor" msgstr "" -#: models.py:2668 +#: models.py:2675 msgid "Contact type" msgstr "" -#: models.py:2671 models.py:2735 +#: models.py:2678 models.py:2742 msgid "Types" msgstr "" -#: models.py:2674 +#: models.py:2681 msgid "Is attached to" msgstr "" -#: models.py:2679 +#: models.py:2686 msgid "Persons" msgstr "" -#: models.py:2681 +#: models.py:2688 msgid "Can view all Persons" msgstr "" -#: models.py:2682 +#: models.py:2689 msgid "Can view own Person" msgstr "" -#: models.py:2683 +#: models.py:2690 msgid "Can add own Person" msgstr "" -#: models.py:2684 +#: models.py:2691 msgid "Can change own Person" msgstr "" -#: models.py:2685 +#: models.py:2692 msgid "Can delete own Person" msgstr "" -#: models.py:2874 +#: models.py:2881 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2877 +#: models.py:2884 msgid "Ishtar user" msgstr "" -#: models.py:2878 +#: models.py:2885 msgid "Ishtar users" msgstr "" -#: models.py:2918 +#: models.py:2925 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2926 +#: models.py:2933 msgid "Author types" msgstr "" -#: models.py:2943 +#: models.py:2950 msgid "Can view all Authors" msgstr "" -#: models.py:2945 +#: models.py:2952 msgid "Can view own Author" msgstr "" -#: models.py:2947 +#: models.py:2954 msgid "Can add own Author" msgstr "" -#: models.py:2949 +#: models.py:2956 msgid "Can change own Author" msgstr "" -#: models.py:2951 +#: models.py:2958 msgid "Can delete own Author" msgstr "" -#: models.py:2972 +#: models.py:2979 msgid "Source types" msgstr "" -#: models.py:2981 +#: models.py:2988 msgid "Support types" msgstr "" -#: models.py:2988 +#: models.py:2995 msgid "Format type" msgstr "" -#: models.py:2989 +#: models.py:2996 msgid "Format types" msgstr "" -#: models.py:2997 +#: models.py:3004 msgid "External ID" msgstr "" -#: models.py:3000 +#: models.py:3007 msgid "Support" msgstr "" -#: models.py:3004 +#: models.py:3011 msgid "Scale" msgstr "" -#: models.py:3018 +#: models.py:3025 msgid "Item number" msgstr "" -#: models.py:3019 +#: models.py:3026 msgid "Ref." msgstr "" -#: models.py:3022 +#: models.py:3029 msgid "Internal ref." msgstr "" -#: models.py:3065 +#: models.py:3072 msgid "Surface (m2)" msgstr "" -#: models.py:3066 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3073 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:3091 +#: models.py:3098 msgid "Is preventive" msgstr "" -#: models.py:3095 +#: models.py:3102 msgid "Operation types" msgstr "" -#: models.py:3124 +#: models.py:3131 msgid "Preventive" msgstr "" -#: models.py:3125 +#: models.py:3132 msgid "Research" msgstr "" -#: models.py:3148 +#: models.py:3155 msgid "Authority name" msgstr "" -#: models.py:3149 +#: models.py:3156 msgid "Authority SRID" msgstr "" -#: models.py:3153 +#: models.py:3160 msgid "Spatial reference systems" msgstr "" @@ -1570,14 +1588,6 @@ msgstr "" msgid "Archaeological files" msgstr "" -#: views.py:1438 views.py:1500 -msgid "Operations" -msgstr "" - -#: views.py:1440 views.py:1504 -msgid "Context records" -msgstr "" - #: views.py:1442 views.py:1507 msgid "Finds" msgstr "" diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 85bef32f3..5095619e0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1176,7 +1176,7 @@ class IshtarSiteProfile(models.Model, Cached): find_index = models.CharField( _(u"Find index is based on"), default='O', max_length=2, choices=FIND_INDEX_SOURCE, - help_text=_(u"To prevent irrlevant indexes, change this parameter " + help_text=_(u"To prevent irrelevant indexes, change this parameter " u"only if there is no find in the database")) find_color = models.CharField( _(u"CSS color code for find module"), diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index cd78f1e0d..900a7339c 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -179,12 +179,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:297 models.py:1549 +#: forms.py:297 models.py:1556 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1615 models.py:3078 +#: forms_common.py:408 models.py:1622 models.py:3085 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -200,8 +200,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

" msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2678 -#: models.py:2871 models.py:2933 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2685 +#: models.py:2878 models.py:2940 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -212,64 +212,64 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2561 models.py:2652 +#: ishtar_menu.py:75 models.py:2568 models.py:2659 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 -#: forms_common.py:378 forms_common.py:448 models.py:1157 models.py:1548 -#: models.py:1817 models.py:1833 models.py:2071 models.py:2349 models.py:2555 -#: models.py:2664 models.py:3064 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1159 models.py:1555 +#: models.py:1824 models.py:1840 models.py:2078 models.py:2356 models.py:2562 +#: models.py:2671 models.py:3071 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Name" -#: forms_common.py:176 models.py:1770 models.py:2202 +#: forms_common.py:176 models.py:1777 models.py:2209 msgid "Organization type" msgstr "" -#: forms_common.py:178 forms_common.py:402 models.py:1610 +#: forms_common.py:178 forms_common.py:402 models.py:1617 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:180 forms_common.py:405 models.py:1611 +#: forms_common.py:180 forms_common.py:405 models.py:1618 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:182 forms_common.py:406 models.py:1613 +#: forms_common.py:182 forms_common.py:406 models.py:1620 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Postleitzahl" -#: forms_common.py:185 forms_common.py:409 models.py:1616 +#: forms_common.py:185 forms_common.py:409 models.py:1623 msgid "Country" msgstr "" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1643 +#: forms_common.py:450 forms_common.py:574 models.py:1650 msgid "Email" msgstr "E-Mail-Adresse" -#: forms_common.py:188 forms_common.py:385 models.py:1628 +#: forms_common.py:188 forms_common.py:385 models.py:1635 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:189 forms_common.py:394 models.py:1640 +#: forms_common.py:189 forms_common.py:394 models.py:1647 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2240 -#: models.py:2557 models.py:2999 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2247 +#: models.py:2564 models.py:3006 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -293,7 +293,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2662 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2669 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -311,25 +311,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2203 -#: models.py:2656 models.py:2658 models.py:2996 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2210 +#: models.py:2663 models.py:2665 models.py:3003 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2660 +#: forms_common.py:374 models.py:2667 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2666 +#: forms_common.py:380 models.py:2673 msgid "Raw name" msgstr "" -#: forms_common.py:383 models.py:1629 +#: forms_common.py:383 models.py:1636 msgid "Phone description" msgstr "" -#: forms_common.py:386 models.py:1631 models.py:1633 +#: forms_common.py:386 models.py:1638 models.py:1640 msgid "Phone description 2" msgstr "" @@ -337,11 +337,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:390 models.py:1637 +#: forms_common.py:390 models.py:1644 msgid "Phone description 3" msgstr "" -#: forms_common.py:392 models.py:1635 +#: forms_common.py:392 models.py:1642 msgid "Phone 3" msgstr "" @@ -349,23 +349,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:411 models.py:1618 +#: forms_common.py:411 models.py:1625 msgid "Other address: address" msgstr "" -#: forms_common.py:414 models.py:1621 +#: forms_common.py:414 models.py:1628 msgid "Other address: address complement" msgstr "" -#: forms_common.py:416 models.py:1622 +#: forms_common.py:416 models.py:1629 msgid "Other address: postal code" msgstr "" -#: forms_common.py:418 models.py:1624 +#: forms_common.py:418 models.py:1631 msgid "Other address: town" msgstr "" -#: forms_common.py:420 models.py:1626 +#: forms_common.py:420 models.py:1633 msgid "Other address: country" msgstr "" @@ -381,7 +381,7 @@ msgstr "Benutzername" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2609 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2616 msgid "Person type" msgstr "" @@ -413,7 +413,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:3079 +#: forms_common.py:636 forms_common.py:649 models.py:3086 msgid "Towns" msgstr "" @@ -429,7 +429,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2204 models.py:2971 +#: forms_common.py:783 forms_common.py:831 models.py:2211 models.py:2978 msgid "Source type" msgstr "" @@ -441,37 +441,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:3010 +#: forms_common.py:791 models.py:3017 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:3012 +#: forms_common.py:792 models.py:3019 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2375 models.py:3014 +#: forms_common.py:794 models.py:2382 models.py:3021 msgid "Creation date" msgstr "Gründungsdatum" -#: forms_common.py:797 models.py:3017 +#: forms_common.py:797 models.py:3024 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:419 models.py:746 -#: models.py:2098 models.py:2670 models.py:3024 +#: models.py:2105 models.py:2677 models.py:3031 msgid "Comment" msgstr "" -#: forms_common.py:801 forms_common.py:834 models.py:1159 models.py:1837 -#: models.py:2025 models.py:2072 models.py:3023 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1161 models.py:1844 +#: models.py:2032 models.py:2079 models.py:3030 templates/sheet_ope.html:128 msgid "Description" msgstr "Beschreibung" -#: forms_common.py:804 models.py:3025 +#: forms_common.py:804 models.py:3032 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:3027 +#: forms_common.py:806 forms_common.py:838 models.py:3034 msgid "Has a duplicate" msgstr "" @@ -486,7 +486,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2938 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2945 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -499,7 +499,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2205 models.py:2925 models.py:2935 +#: forms_common.py:864 models.py:2212 models.py:2932 models.py:2942 msgid "Author type" msgstr "" @@ -511,7 +511,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2939 models.py:3006 +#: forms_common.py:901 models.py:2946 models.py:3013 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -529,7 +529,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1331 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1640 msgid "Global variables" msgstr "" @@ -557,7 +557,7 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2383 +#: ishtar_menu.py:109 models.py:2390 msgid "Imports" msgstr "" @@ -585,7 +585,7 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:415 models.py:745 models.py:1583 models.py:1595 models.py:2021 +#: models.py:415 models.py:745 models.py:1590 models.py:1602 models.py:2028 msgid "Label" msgstr "" @@ -593,11 +593,11 @@ msgstr "" msgid "Textual ID" msgstr "" -#: models.py:420 models.py:748 models.py:1552 +#: models.py:420 models.py:748 models.py:1559 msgid "Available" msgstr "" -#: models.py:772 models.py:2144 +#: models.py:772 models.py:2151 msgid "Key" msgstr "" @@ -613,7 +613,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:1019 models.py:2922 models.py:3090 models.py:3146 +#: models.py:1019 models.py:2929 models.py:3097 models.py:3153 msgid "Order" msgstr "" @@ -637,198 +637,216 @@ msgstr "" msgid "US dollar" msgstr "" -#: models.py:1158 models.py:1835 +#: models.py:1153 views.py:1438 views.py:1500 +msgid "Operations" +msgstr "" + +#: models.py:1154 views.py:1440 views.py:1504 +msgid "Context records" +msgstr "" + +#: models.py:1160 models.py:1842 msgid "Slug" msgstr "" -#: models.py:1161 +#: models.py:1163 msgid "CSS color code for base module" msgstr "" -#: models.py:1163 +#: models.py:1165 msgid "Files module" msgstr "" -#: models.py:1165 +#: models.py:1167 msgid "CSS color code for files module" msgstr "" -#: models.py:1167 +#: models.py:1169 msgid "Context records module" msgstr "" -#: models.py:1170 +#: models.py:1172 msgid "CSS color code for context record module" msgstr "" -#: models.py:1172 +#: models.py:1174 msgid "Finds module" msgstr "" -#: models.py:1173 +#: models.py:1175 msgid "Need context records module" msgstr "" -#: models.py:1175 +#: models.py:1177 +msgid "Find index is based on" +msgstr "" + +#: models.py:1179 +msgid "" +"To prevent irrelevant indexes, change this parameter only if there is no " +"find in the database" +msgstr "" + +#: models.py:1182 msgid "CSS color code for find module" msgstr "" -#: models.py:1178 +#: models.py:1185 msgid "Warehouses module" msgstr "" -#: models.py:1179 +#: models.py:1186 msgid "Need finds module" msgstr "" -#: models.py:1181 +#: models.py:1188 msgid "CSS code for warehouse module" msgstr "" -#: models.py:1183 +#: models.py:1190 msgid "Mapping module" msgstr "" -#: models.py:1185 +#: models.py:1192 msgid "CSS code for mapping module" msgstr "" -#: models.py:1188 +#: models.py:1195 msgid "Home page" msgstr "" -#: models.py:1189 +#: models.py:1196 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1193 +#: models.py:1200 msgid "File external id" msgstr "" -#: models.py:1195 +#: models.py:1202 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1200 +#: models.py:1207 msgid "Parcel external id" msgstr "" -#: models.py:1203 +#: models.py:1210 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1208 +#: models.py:1215 msgid "Context record external id" msgstr "" -#: models.py:1210 +#: models.py:1217 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1215 +#: models.py:1222 msgid "Base find external id" msgstr "" -#: models.py:1217 +#: models.py:1224 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1222 +#: models.py:1229 msgid "Find external id" msgstr "" -#: models.py:1224 +#: models.py:1231 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1229 +#: models.py:1236 msgid "Container external id" msgstr "" -#: models.py:1231 +#: models.py:1238 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1236 +#: models.py:1243 msgid "Warehouse external id" msgstr "" -#: models.py:1238 +#: models.py:1245 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1243 +#: models.py:1250 msgid "Raw name for person" msgstr "" -#: models.py:1245 +#: models.py:1252 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1249 +#: models.py:1256 msgid "Current active" msgstr "" -#: models.py:1250 +#: models.py:1257 msgid "Currency" msgstr "" -#: models.py:1254 +#: models.py:1261 msgid "Ishtar site profile" msgstr "" -#: models.py:1255 +#: models.py:1262 msgid "Ishtar site profiles" msgstr "" -#: models.py:1324 +#: models.py:1331 msgid "Variable name" msgstr "" -#: models.py:1325 +#: models.py:1332 msgid "Description of the variable" msgstr "" -#: models.py:1327 models.py:2145 +#: models.py:1334 models.py:2152 msgid "Value" msgstr "" -#: models.py:1330 +#: models.py:1337 msgid "Global variable" msgstr "" -#: models.py:1453 models.py:1483 +#: models.py:1460 models.py:1490 msgid "Total" msgstr "" -#: models.py:1460 models.py:1584 models.py:1596 +#: models.py:1467 models.py:1591 models.py:1603 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -836,663 +854,663 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1547 +#: models.py:1554 msgid "Administrative Act" msgstr "" -#: models.py:1551 +#: models.py:1558 msgid "Associated object" msgstr "" -#: models.py:1555 +#: models.py:1562 msgid "Document template" msgstr "" -#: models.py:1556 +#: models.py:1563 msgid "Document templates" msgstr "" -#: models.py:1587 models.py:1597 models.py:2369 +#: models.py:1594 models.py:1604 models.py:2376 msgid "State" msgstr "" -#: models.py:1601 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1608 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1602 +#: models.py:1609 msgid "Departments" msgstr "" -#: models.py:1639 +#: models.py:1646 msgid "Raw phone" msgstr "" -#: models.py:1645 +#: models.py:1652 msgid "Alternative address is prefered" msgstr "" -#: models.py:1684 +#: models.py:1691 msgid "Tel: " msgstr "" -#: models.py:1688 +#: models.py:1695 msgid "Mobile: " msgstr "" -#: models.py:1692 +#: models.py:1699 msgid "Email: " msgstr "E-Mail-Adresse:" -#: models.py:1697 +#: models.py:1704 msgid "Merge key" msgstr "" -#: models.py:1771 +#: models.py:1778 msgid "Organization types" msgstr "" -#: models.py:1818 +#: models.py:1825 msgid "Class name" msgstr "" -#: models.py:1821 +#: models.py:1828 msgid "Importer - Model" msgstr "" -#: models.py:1822 +#: models.py:1829 msgid "Importer - Models" msgstr "" -#: models.py:1839 templates/ishtar/dashboards/dashboard_main.html:34 +#: models.py:1846 templates/ishtar/dashboards/dashboard_main.html:34 msgid "Users" msgstr "" -#: models.py:1842 +#: models.py:1849 msgid "Associated model" msgstr "" -#: models.py:1845 +#: models.py:1852 msgid "Models that can accept new items" msgstr "" -#: models.py:1846 +#: models.py:1853 msgid "Leave blank for no restrictions" msgstr "" -#: models.py:1848 +#: models.py:1855 msgid "Is template" msgstr "" -#: models.py:1849 +#: models.py:1856 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1853 +#: models.py:1860 msgid "Importer - Type" msgstr "" -#: models.py:1854 +#: models.py:1861 msgid "Importer - Types" msgstr "" -#: models.py:1953 +#: models.py:1960 msgid "Importer - Default" msgstr "" -#: models.py:1954 +#: models.py:1961 msgid "Importer - Defaults" msgstr "" -#: models.py:1989 +#: models.py:1996 msgid "Importer - Default value" msgstr "" -#: models.py:1990 +#: models.py:1997 msgid "Importer - Default values" msgstr "" -#: models.py:2024 +#: models.py:2031 msgid "Column number" msgstr "" -#: models.py:2027 +#: models.py:2034 msgid "Required" msgstr "" -#: models.py:2029 +#: models.py:2036 msgid "Export field name" msgstr "" -#: models.py:2030 +#: models.py:2037 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: models.py:2035 +#: models.py:2042 msgid "Importer - Column" msgstr "" -#: models.py:2036 +#: models.py:2043 msgid "Importer - Columns" msgstr "" -#: models.py:2056 +#: models.py:2063 msgid "Field name" msgstr "" -#: models.py:2058 models.py:2092 +#: models.py:2065 models.py:2099 msgid "Force creation of new items" msgstr "" -#: models.py:2060 models.py:2094 +#: models.py:2067 models.py:2101 msgid "Concatenate with existing" msgstr "" -#: models.py:2062 models.py:2096 +#: models.py:2069 models.py:2103 msgid "Concatenate character" msgstr "" -#: models.py:2066 +#: models.py:2073 msgid "Importer - Duplicate field" msgstr "" -#: models.py:2067 +#: models.py:2074 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:2074 +#: models.py:2081 msgid "Regular expression" msgstr "" -#: models.py:2077 +#: models.py:2084 msgid "Importer - Regular expression" msgstr "" -#: models.py:2078 +#: models.py:2085 msgid "Importer - Regular expressions" msgstr "" -#: models.py:2101 +#: models.py:2108 msgid "Importer - Target" msgstr "" -#: models.py:2102 +#: models.py:2109 msgid "Importer - Targets" msgstr "" -#: models.py:2126 views.py:570 +#: models.py:2133 views.py:570 msgid "True" msgstr "" -#: models.py:2127 views.py:572 +#: models.py:2134 views.py:572 msgid "False" msgstr "" -#: models.py:2146 +#: models.py:2153 msgid "Is set" msgstr "" -#: models.py:2153 +#: models.py:2160 msgid "Importer - Target key" msgstr "" -#: models.py:2154 +#: models.py:2161 msgid "Importer - Targets keys" msgstr "" -#: models.py:2206 models.py:3002 +#: models.py:2213 models.py:3009 msgid "Format" msgstr "" -#: models.py:2207 models.py:3094 +#: models.py:2214 models.py:3101 msgid "Operation type" msgstr "" -#: models.py:2208 +#: models.py:2215 msgid "Period" msgstr "" -#: models.py:2209 +#: models.py:2216 msgid "Report state" msgstr "" -#: models.py:2210 +#: models.py:2217 msgid "Remain type" msgstr "" -#: models.py:2211 +#: models.py:2218 msgid "Unit" msgstr "" -#: models.py:2213 +#: models.py:2220 msgid "Activity type" msgstr "" -#: models.py:2214 +#: models.py:2221 msgid "Material" msgstr "" -#: models.py:2216 +#: models.py:2223 msgid "Conservatory state" msgstr "" -#: models.py:2217 +#: models.py:2224 msgid "Container type" msgstr "" -#: models.py:2218 +#: models.py:2225 msgid "Preservation type" msgstr "" -#: models.py:2219 +#: models.py:2226 msgid "Object type" msgstr "" -#: models.py:2220 +#: models.py:2227 msgid "Integrity type" msgstr "" -#: models.py:2222 +#: models.py:2229 msgid "Remarkability type" msgstr "" -#: models.py:2223 +#: models.py:2230 msgid "Batch type" msgstr "" -#: models.py:2225 +#: models.py:2232 msgid "Identification type" msgstr "" -#: models.py:2227 +#: models.py:2234 msgid "Context record relation type" msgstr "" -#: models.py:2228 models.py:3152 +#: models.py:2235 models.py:3159 msgid "Spatial reference system" msgstr "" -#: models.py:2229 models.py:2980 +#: models.py:2236 models.py:2987 msgid "Support type" msgstr "" -#: models.py:2230 models.py:2621 +#: models.py:2237 models.py:2628 msgid "Title type" msgstr "" -#: models.py:2236 +#: models.py:2243 msgid "Integer" msgstr "" -#: models.py:2237 +#: models.py:2244 msgid "Float" msgstr "" -#: models.py:2238 +#: models.py:2245 msgid "String" msgstr "" -#: models.py:2239 templates/sheet_ope.html:86 +#: models.py:2246 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2241 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2248 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2242 +#: models.py:2249 msgid "String to boolean" msgstr "" -#: models.py:2243 +#: models.py:2250 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2244 +#: models.py:2251 msgid "Unknow type" msgstr "" -#: models.py:2260 +#: models.py:2267 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2261 +#: models.py:2268 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2262 +#: models.py:2269 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2272 +#: models.py:2279 msgid "Options" msgstr "" -#: models.py:2274 +#: models.py:2281 msgid "Split character(s)" msgstr "" -#: models.py:2278 +#: models.py:2285 msgid "Importer - Formater type" msgstr "" -#: models.py:2279 +#: models.py:2286 msgid "Importer - Formater types" msgstr "" -#: models.py:2331 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2338 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2332 +#: models.py:2339 msgid "Analyse in progress" msgstr "" -#: models.py:2333 +#: models.py:2340 msgid "Analysed" msgstr "" -#: models.py:2334 +#: models.py:2341 msgid "Import pending" msgstr "" -#: models.py:2335 +#: models.py:2342 msgid "Import in progress" msgstr "" -#: models.py:2336 +#: models.py:2343 msgid "Finished with errors" msgstr "" -#: models.py:2337 +#: models.py:2344 msgid "Finished" msgstr "" -#: models.py:2338 +#: models.py:2345 msgid "Archived" msgstr "" -#: models.py:2353 +#: models.py:2360 msgid "Imported file" msgstr "" -#: models.py:2355 +#: models.py:2362 msgid "Associated images (zip file)" msgstr "" -#: models.py:2357 +#: models.py:2364 msgid "Encoding" msgstr "" -#: models.py:2359 +#: models.py:2366 msgid "Skip lines" msgstr "" -#: models.py:2360 templates/ishtar/import_list.html:51 +#: models.py:2367 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2363 +#: models.py:2370 msgid "Result file" msgstr "" -#: models.py:2366 templates/ishtar/import_list.html:57 +#: models.py:2373 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2372 +#: models.py:2379 msgid "Conservative import" msgstr "" -#: models.py:2376 +#: models.py:2383 msgid "End date" msgstr "" -#: models.py:2379 +#: models.py:2386 msgid "Remaining seconds" msgstr "" -#: models.py:2382 +#: models.py:2389 msgid "Import" msgstr "" -#: models.py:2411 +#: models.py:2418 msgid "Analyse" msgstr "" -#: models.py:2413 models.py:2416 +#: models.py:2420 models.py:2423 msgid "Re-analyse" msgstr "" -#: models.py:2414 +#: models.py:2421 msgid "Launch import" msgstr "" -#: models.py:2417 +#: models.py:2424 msgid "Re-import" msgstr "" -#: models.py:2418 +#: models.py:2425 msgid "Archive" msgstr "" -#: models.py:2420 +#: models.py:2427 msgid "Unarchive" msgstr "" -#: models.py:2421 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2562 +#: models.py:2569 msgid "Organizations" msgstr "" -#: models.py:2564 +#: models.py:2571 msgid "Can view all Organizations" msgstr "" -#: models.py:2565 +#: models.py:2572 msgid "Can view own Organization" msgstr "" -#: models.py:2566 +#: models.py:2573 msgid "Can add own Organization" msgstr "" -#: models.py:2568 +#: models.py:2575 msgid "Can change own Organization" msgstr "" -#: models.py:2570 +#: models.py:2577 msgid "Can delete own Organization" msgstr "" -#: models.py:2605 +#: models.py:2612 msgid "Groups" msgstr "" -#: models.py:2610 +#: models.py:2617 msgid "Person types" msgstr "" -#: models.py:2622 +#: models.py:2629 msgid "Title types" msgstr "" -#: models.py:2631 +#: models.py:2638 msgid "Mr" msgstr "" -#: models.py:2632 +#: models.py:2639 msgid "Miss" msgstr "" -#: models.py:2633 +#: models.py:2640 msgid "Mr and Mrs" msgstr "" -#: models.py:2634 +#: models.py:2641 msgid "Mrs" msgstr "" -#: models.py:2635 +#: models.py:2642 msgid "Doctor" msgstr "" -#: models.py:2668 +#: models.py:2675 msgid "Contact type" msgstr "" -#: models.py:2671 models.py:2735 +#: models.py:2678 models.py:2742 msgid "Types" msgstr "" -#: models.py:2674 +#: models.py:2681 msgid "Is attached to" msgstr "" -#: models.py:2679 +#: models.py:2686 msgid "Persons" msgstr "" -#: models.py:2681 +#: models.py:2688 msgid "Can view all Persons" msgstr "" -#: models.py:2682 +#: models.py:2689 msgid "Can view own Person" msgstr "" -#: models.py:2683 +#: models.py:2690 msgid "Can add own Person" msgstr "" -#: models.py:2684 +#: models.py:2691 msgid "Can change own Person" msgstr "" -#: models.py:2685 +#: models.py:2692 msgid "Can delete own Person" msgstr "" -#: models.py:2874 +#: models.py:2881 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2877 +#: models.py:2884 msgid "Ishtar user" msgstr "" -#: models.py:2878 +#: models.py:2885 msgid "Ishtar users" msgstr "" -#: models.py:2918 +#: models.py:2925 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2926 +#: models.py:2933 msgid "Author types" msgstr "" -#: models.py:2943 +#: models.py:2950 msgid "Can view all Authors" msgstr "" -#: models.py:2945 +#: models.py:2952 msgid "Can view own Author" msgstr "" -#: models.py:2947 +#: models.py:2954 msgid "Can add own Author" msgstr "" -#: models.py:2949 +#: models.py:2956 msgid "Can change own Author" msgstr "" -#: models.py:2951 +#: models.py:2958 msgid "Can delete own Author" msgstr "" -#: models.py:2972 +#: models.py:2979 msgid "Source types" msgstr "" -#: models.py:2981 +#: models.py:2988 msgid "Support types" msgstr "" -#: models.py:2988 +#: models.py:2995 msgid "Format type" msgstr "" -#: models.py:2989 +#: models.py:2996 msgid "Format types" msgstr "" -#: models.py:2997 +#: models.py:3004 msgid "External ID" msgstr "" -#: models.py:3000 +#: models.py:3007 msgid "Support" msgstr "" -#: models.py:3004 +#: models.py:3011 msgid "Scale" msgstr "" -#: models.py:3018 +#: models.py:3025 msgid "Item number" msgstr "" -#: models.py:3019 +#: models.py:3026 msgid "Ref." msgstr "" -#: models.py:3022 +#: models.py:3029 msgid "Internal ref." msgstr "" -#: models.py:3065 +#: models.py:3072 msgid "Surface (m2)" msgstr "" -#: models.py:3066 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3073 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Lokalisierung" -#: models.py:3091 +#: models.py:3098 msgid "Is preventive" msgstr "" -#: models.py:3095 +#: models.py:3102 msgid "Operation types" msgstr "" -#: models.py:3124 +#: models.py:3131 msgid "Preventive" msgstr "" -#: models.py:3125 +#: models.py:3132 msgid "Research" msgstr "" -#: models.py:3148 +#: models.py:3155 msgid "Authority name" msgstr "" -#: models.py:3149 +#: models.py:3156 msgid "Authority SRID" msgstr "" -#: models.py:3153 +#: models.py:3160 msgid "Spatial reference systems" msgstr "" @@ -1573,14 +1591,6 @@ msgstr "" msgid "Archaeological files" msgstr "" -#: views.py:1438 views.py:1500 -msgid "Operations" -msgstr "" - -#: views.py:1440 views.py:1504 -msgid "Context records" -msgstr "" - #: views.py:1442 views.py:1507 msgid "Finds" msgstr "" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 0e4ef5e21..6b2e9b5ff 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -18,161 +18,161 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:519 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:538 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:686 models_finds.py:1117 -#: models_finds.py:1138 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1160 +#: models_finds.py:1181 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:150 -#: models_finds.py:616 +#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:151 +#: models_finds.py:635 msgid "Free ID" msgstr "ID libre" -#: forms.py:144 models_finds.py:669 +#: forms.py:144 models_finds.py:688 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:154 -#: models_finds.py:617 models_treatments.py:128 +#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:155 +#: models_finds.py:636 models_treatments.py:128 msgid "Description" msgstr "Description" -#: forms.py:148 forms.py:389 models_finds.py:163 +#: forms.py:148 forms.py:389 models_finds.py:164 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:150 models_finds.py:646 +#: forms.py:150 models_finds.py:665 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:50 +#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:51 msgid "Material type" msgstr "Type de matériau" -#: forms.py:155 forms.py:381 models_finds.py:62 models_finds.py:621 +#: forms.py:155 forms.py:381 models_finds.py:63 models_finds.py:640 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:158 models_finds.py:623 +#: forms.py:158 models_finds.py:642 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:161 models_finds.py:112 models_finds.py:649 +#: forms.py:161 models_finds.py:113 models_finds.py:668 msgid "Object types" msgstr "Types d'objet" -#: forms.py:164 forms.py:380 models_finds.py:71 +#: forms.py:164 forms.py:380 models_finds.py:72 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:167 forms.py:383 models_finds.py:651 +#: forms.py:167 forms.py:383 models_finds.py:670 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:170 forms.py:385 models_finds.py:654 +#: forms.py:170 forms.py:385 models_finds.py:673 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:173 models_finds.py:168 +#: forms.py:173 models_finds.py:169 msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:209 +#: forms.py:176 models_finds.py:171 templates/ishtar/sheet_find.html:209 msgid "X" msgstr "X" -#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:210 +#: forms.py:177 models_finds.py:172 templates/ishtar/sheet_find.html:210 msgid "Y" msgstr "Y" -#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:211 +#: forms.py:178 models_finds.py:173 templates/ishtar/sheet_find.html:211 msgid "Z" msgstr "Z" -#: forms.py:180 models_finds.py:180 +#: forms.py:180 models_finds.py:181 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: forms.py:183 models_finds.py:173 +#: forms.py:183 models_finds.py:174 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: forms.py:185 models_finds.py:175 +#: forms.py:185 models_finds.py:176 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: forms.py:187 models_finds.py:177 +#: forms.py:187 models_finds.py:178 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:188 models_finds.py:658 +#: forms.py:188 models_finds.py:677 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:189 models_finds.py:659 +#: forms.py:189 models_finds.py:678 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:190 models_finds.py:660 +#: forms.py:190 models_finds.py:679 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:191 models_finds.py:661 +#: forms.py:191 models_finds.py:680 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:192 models_finds.py:662 +#: forms.py:192 models_finds.py:681 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:193 forms.py:634 models_finds.py:628 +#: forms.py:193 forms.py:634 models_finds.py:647 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:194 forms.py:635 models_finds.py:629 +#: forms.py:194 forms.py:635 models_finds.py:648 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:196 models_finds.py:663 +#: forms.py:196 models_finds.py:682 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:197 forms.py:636 models_finds.py:632 +#: forms.py:197 forms.py:636 models_finds.py:651 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:199 models_finds.py:657 +#: forms.py:199 models_finds.py:676 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:200 models_finds.py:665 +#: forms.py:200 models_finds.py:684 msgid "Mark" msgstr "Marque" -#: forms.py:201 forms.py:390 models_finds.py:671 +#: forms.py:201 forms.py:390 models_finds.py:690 msgid "Check" msgstr "Vérification" -#: forms.py:203 models_finds.py:673 +#: forms.py:203 models_finds.py:692 msgid "Check date" msgstr "Date de vérification" -#: forms.py:204 forms_treatments.py:136 forms_treatments.py:478 -#: models_finds.py:155 models_finds.py:666 models_treatments.py:127 +#: forms.py:204 forms_treatments.py:136 forms_treatments.py:479 +#: models_finds.py:156 models_finds.py:685 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "Commentaires" -#: forms.py:207 models_finds.py:667 +#: forms.py:207 models_finds.py:686 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:208 models_finds.py:675 +#: forms.py:208 models_finds.py:694 msgid "Estimated value" msgstr "Valeur estimée" @@ -203,7 +203,7 @@ msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." -#: forms.py:310 forms.py:341 models_finds.py:640 +#: forms.py:310 forms.py:341 models_finds.py:659 msgid "Dating" msgstr "Datation" @@ -211,14 +211,14 @@ msgstr "Datation" msgid "Period" msgstr "Période" -#: forms.py:316 forms_treatments.py:138 forms_treatments.py:282 -#: forms_treatments.py:480 models_finds.py:1143 models_treatments.py:130 +#: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 +#: forms_treatments.py:481 models_finds.py:1186 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:95 #: templates/ishtar/sheet_find.html:137 msgid "Start date" msgstr "Date de début" -#: forms.py:318 models_finds.py:1144 models_treatments.py:310 +#: forms.py:318 models_finds.py:1187 models_treatments.py:310 #: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 msgid "End date" msgstr "Date de fin" @@ -235,17 +235,17 @@ msgstr "Type de datation" msgid "Precise dating" msgstr "Datation précise" -#: forms.py:345 models_finds.py:187 +#: forms.py:345 models_finds.py:188 msgid "Short ID" msgstr "ID court" -#: forms.py:346 models_finds.py:190 +#: forms.py:346 models_finds.py:191 msgid "Complete ID" msgstr "ID complet" #: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 -#: forms_treatments.py:328 forms_treatments.py:400 forms_treatments.py:450 -#: forms_treatments.py:578 models_treatments.py:103 models_treatments.py:483 +#: forms_treatments.py:329 forms_treatments.py:401 forms_treatments.py:451 +#: forms_treatments.py:579 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "Année" @@ -269,7 +269,7 @@ msgstr "Rechercher parmi les opérations liées" msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: forms.py:378 models_finds.py:111 +#: forms.py:378 models_finds.py:112 msgid "Object type" msgstr "Type d'objet" @@ -301,7 +301,7 @@ msgstr "Rechercher un mobilier" msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:511 models_finds.py:687 +#: forms.py:511 models_finds.py:706 msgid "Finds" msgstr "Mobilier" @@ -357,11 +357,11 @@ msgstr "Type de matériau du mobilier" msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:700 forms_treatments.py:679 forms_treatments.py:705 +#: forms.py:700 forms_treatments.py:680 forms_treatments.py:706 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:702 forms_treatments.py:681 forms_treatments.py:707 +#: forms.py:702 forms_treatments.py:682 forms_treatments.py:708 msgid "You should select a document." msgstr "Vous devez sélectionner un document." @@ -382,20 +382,20 @@ msgstr "Intitulé" msgid "Other ref." msgstr "Autre réf." -#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:329 -#: forms_treatments.py:392 forms_treatments.py:401 forms_treatments.py:503 -#: forms_treatments.py:579 forms_treatments.py:646 models_treatments.py:105 +#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:330 +#: forms_treatments.py:393 forms_treatments.py:402 forms_treatments.py:504 +#: forms_treatments.py:580 forms_treatments.py:647 models_treatments.py:105 #: models_treatments.py:485 msgid "Index" msgstr "Index" -#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:290 -#: forms_treatments.py:345 forms_treatments.py:667 models_treatments.py:56 +#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:291 +#: forms_treatments.py:346 forms_treatments.py:668 models_treatments.py:56 #: models_treatments.py:110 models_treatments.py:308 msgid "Treatment type" msgstr "Type de traitement" -#: forms_treatments.py:68 forms_treatments.py:649 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:650 views.py:398 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -412,7 +412,7 @@ msgstr "État" msgid "Target" msgstr "Destination" -#: forms_treatments.py:107 forms_treatments.py:461 models_treatments.py:120 +#: forms_treatments.py:107 forms_treatments.py:462 models_treatments.py:120 msgid "Responsible" msgstr "Responsable" @@ -428,7 +428,7 @@ msgstr "Lieu" msgid "Container (relevant for packaging)" msgstr "Contenant (pertinent dans le cadre du conditionnement)" -#: forms_treatments.py:131 forms_treatments.py:457 +#: forms_treatments.py:131 forms_treatments.py:458 msgid "External ref." msgstr "Réf. externe" @@ -436,8 +436,8 @@ msgstr "Réf. externe" msgid "Goal" msgstr "But" -#: forms_treatments.py:140 forms_treatments.py:282 forms_treatments.py:486 -#: forms_treatments.py:534 models_treatments.py:131 models_treatments.py:505 +#: forms_treatments.py:140 forms_treatments.py:283 forms_treatments.py:487 +#: forms_treatments.py:535 models_treatments.py:131 models_treatments.py:505 msgid "Closing date" msgstr "Date de clôture" @@ -482,21 +482,21 @@ msgstr "" msgid "A responsible or an organization must be defined." msgstr "Un responsable ou une organisation doit être défini." -#: forms_treatments.py:256 +#: forms_treatments.py:257 msgid "Another treatment with this index exists for {}." msgstr "Un autre traitement avec cet index existe pour {}." -#: forms_treatments.py:262 models_treatments.py:108 +#: forms_treatments.py:263 models_treatments.py:108 msgid "Associated request" msgstr "Demande associée" -#: forms_treatments.py:266 forms_treatments.py:441 ishtar_menu.py:108 +#: forms_treatments.py:267 forms_treatments.py:442 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" -#: forms_treatments.py:275 +#: forms_treatments.py:276 msgid "" "Are you sure you want to delete this treatment? All changes made to the " "associated finds since this treatment record will be lost!" @@ -505,153 +505,153 @@ msgstr "" "sur le mobilier associé réalisées depuis l'enregistrement de ce traitement " "seront perdues !" -#: forms_treatments.py:278 +#: forms_treatments.py:279 msgid "Would you like to delete this treatment?" msgstr "Voulez-vous supprimer ce traitement ?" -#: forms_treatments.py:280 +#: forms_treatments.py:281 msgid "months" msgstr "mois" -#: forms_treatments.py:280 +#: forms_treatments.py:281 msgid "years" msgstr "années" -#: forms_treatments.py:286 forms_treatments.py:538 +#: forms_treatments.py:287 forms_treatments.py:539 msgid "Slicing" msgstr "Découpage" -#: forms_treatments.py:289 forms_treatments.py:541 +#: forms_treatments.py:290 forms_treatments.py:542 msgid "Date get from" msgstr "Date utilisée" -#: forms_treatments.py:292 forms_treatments.py:544 +#: forms_treatments.py:293 forms_treatments.py:545 msgid "Date after" msgstr "Date après" -#: forms_treatments.py:294 forms_treatments.py:546 +#: forms_treatments.py:295 forms_treatments.py:547 msgid "Date before" msgstr "Date avant" -#: forms_treatments.py:330 forms_treatments.py:378 forms_treatments.py:580 -#: forms_treatments.py:631 +#: forms_treatments.py:331 forms_treatments.py:379 forms_treatments.py:581 +#: forms_treatments.py:632 msgid "Act type" msgstr "Type d'acte" -#: forms_treatments.py:331 forms_treatments.py:581 +#: forms_treatments.py:332 forms_treatments.py:582 msgid "Indexed?" msgstr "Indexé ?" -#: forms_treatments.py:332 forms_treatments.py:582 +#: forms_treatments.py:333 forms_treatments.py:583 msgid "Object" msgstr "Objet" -#: forms_treatments.py:336 forms_treatments.py:586 +#: forms_treatments.py:337 forms_treatments.py:587 msgid "Signature date after" msgstr "Date de signature après" -#: forms_treatments.py:338 forms_treatments.py:588 +#: forms_treatments.py:339 forms_treatments.py:589 msgid "Signature date before" msgstr "Date de signature avant" -#: forms_treatments.py:340 forms_treatments.py:662 +#: forms_treatments.py:341 forms_treatments.py:663 msgid "Treatment name" msgstr "Nom du traitement" -#: forms_treatments.py:341 forms_treatments.py:663 +#: forms_treatments.py:342 forms_treatments.py:664 msgid "Treatment year" msgstr "Année du traitement" -#: forms_treatments.py:342 forms_treatments.py:664 +#: forms_treatments.py:343 forms_treatments.py:665 msgid "Treatment index" msgstr "Index du traitement" -#: forms_treatments.py:344 forms_treatments.py:666 +#: forms_treatments.py:345 forms_treatments.py:667 msgid "Treatment internal reference" msgstr "Référence interne du traitement" -#: forms_treatments.py:348 forms_treatments.py:600 +#: forms_treatments.py:349 forms_treatments.py:601 msgid "Modified by" msgstr "Modifié par" -#: forms_treatments.py:398 forms_treatments.py:448 models_treatments.py:490 +#: forms_treatments.py:399 forms_treatments.py:449 models_treatments.py:490 msgid "Name" msgstr "Nom" -#: forms_treatments.py:399 forms_treatments.py:455 +#: forms_treatments.py:400 forms_treatments.py:456 msgid "Internal ref." msgstr "Réf. interne" -#: forms_treatments.py:402 forms_treatments.py:459 models_treatments.py:92 +#: forms_treatments.py:403 forms_treatments.py:460 models_treatments.py:92 #: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:132 #: templates/ishtar/sheet_find.html:232 msgid "Type" msgstr "Type" -#: forms_treatments.py:404 +#: forms_treatments.py:405 msgid "In charge" msgstr "Responsable" -#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:499 +#: forms_treatments.py:411 forms_treatments.py:468 models_treatments.py:499 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "Demandeur" -#: forms_treatments.py:416 forms_treatments.py:473 models_treatments.py:503 +#: forms_treatments.py:417 forms_treatments.py:474 models_treatments.py:503 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "Organisation du demandeur" -#: forms_treatments.py:429 forms_treatments.py:654 views.py:502 +#: forms_treatments.py:430 forms_treatments.py:655 views.py:502 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: forms_treatments.py:483 forms_treatments.py:533 models_treatments.py:509 +#: forms_treatments.py:484 forms_treatments.py:534 models_treatments.py:509 msgid "Reception date" msgstr "Date de réception" -#: forms_treatments.py:522 +#: forms_treatments.py:523 msgid "Another treatment request with this index exists for {}." msgstr "Une autre demande de traitement avec cet index existe pour {}." -#: forms_treatments.py:528 +#: forms_treatments.py:529 msgid "Are you sure you want to delete this treatment request?" msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ? " -#: forms_treatments.py:529 +#: forms_treatments.py:530 msgid "Would you like to delete this treatment request?" msgstr "Voulez-vous supprimer cette demande de traitement ?" -#: forms_treatments.py:532 models_treatments.py:507 +#: forms_treatments.py:533 models_treatments.py:507 msgid "Creation date" msgstr "Date de création" -#: forms_treatments.py:542 forms_treatments.py:597 forms_treatments.py:693 +#: forms_treatments.py:543 forms_treatments.py:598 forms_treatments.py:694 #: models_treatments.py:468 models_treatments.py:492 msgid "Treatment request type" msgstr "Type de demande de traitement" -#: forms_treatments.py:590 forms_treatments.py:686 +#: forms_treatments.py:591 forms_treatments.py:687 msgid "Treatment request name" msgstr "Nom du dossier de traitement" -#: forms_treatments.py:592 forms_treatments.py:688 +#: forms_treatments.py:593 forms_treatments.py:689 msgid "Treatment request year" msgstr "Année du dossier de traitement" -#: forms_treatments.py:594 forms_treatments.py:690 +#: forms_treatments.py:595 forms_treatments.py:691 msgid "Treatment request index" msgstr "Index de la demande de traitement" -#: forms_treatments.py:596 forms_treatments.py:692 +#: forms_treatments.py:597 forms_treatments.py:693 msgid "Treatment request internal reference" msgstr "Référence interne de la demande de traitement" -#: forms_treatments.py:651 +#: forms_treatments.py:652 msgid "You should select a treatment." msgstr "Vous devez sélectionner un traitement." -#: forms_treatments.py:657 +#: forms_treatments.py:658 msgid "You should select a treatment request." msgstr "Vous devez sélectionner une demande de traitement." @@ -685,7 +685,7 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1140 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1183 msgid "Administrative act" msgstr "Acte administratif" @@ -708,303 +708,303 @@ msgstr "Traitement" msgid "Simple treatments" msgstr "Traitements simples" -#: models_finds.py:43 +#: models_finds.py:44 msgid "Code" msgstr "Code" -#: models_finds.py:44 +#: models_finds.py:45 msgid "Recommendation" msgstr "Recommandation" -#: models_finds.py:47 +#: models_finds.py:48 msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:51 models_finds.py:539 models_finds.py:619 +#: models_finds.py:52 models_finds.py:558 models_finds.py:638 msgid "Material types" msgstr "Types de matériau" -#: models_finds.py:59 +#: models_finds.py:60 msgid "Parent conservatory state" msgstr "État sanitaire - parent" -#: models_finds.py:63 +#: models_finds.py:64 msgid "Conservatory states" msgstr "États sanitaires" -#: models_finds.py:72 +#: models_finds.py:73 msgid "Preservation types" msgstr "Types de conservation" -#: models_finds.py:80 +#: models_finds.py:81 msgid "Integrity / interest type" msgstr "Type d'intégrité / intérêt" -#: models_finds.py:81 +#: models_finds.py:82 msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: models_finds.py:89 +#: models_finds.py:90 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models_finds.py:90 +#: models_finds.py:91 msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:97 models_finds.py:615 models_treatments.py:40 +#: models_finds.py:98 models_finds.py:634 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "Ordre" -#: models_finds.py:99 +#: models_finds.py:100 msgid "Batch type" msgstr "Type de lot" -#: models_finds.py:100 +#: models_finds.py:101 msgid "Batch types" msgstr "Types de lot" -#: models_finds.py:108 +#: models_finds.py:109 msgid "Parent" msgstr "Parent" -#: models_finds.py:151 models_finds.py:612 models_treatments.py:125 +#: models_finds.py:152 models_finds.py:631 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "ID externe" -#: models_finds.py:153 models_finds.py:614 +#: models_finds.py:154 models_finds.py:633 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models_finds.py:156 +#: models_finds.py:157 msgid "Special interest" msgstr "Intérêt spécifique" -#: models_finds.py:160 +#: models_finds.py:161 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models_finds.py:161 +#: models_finds.py:162 msgid "Discovery date" msgstr "Date de découverte" -#: models_finds.py:166 +#: models_finds.py:167 msgid "Material index" msgstr "Index matériel" -#: models_finds.py:182 +#: models_finds.py:183 msgid "Point (2D)" msgstr "Point (2D)" -#: models_finds.py:183 +#: models_finds.py:184 msgid "Point" msgstr "Point" -#: models_finds.py:184 +#: models_finds.py:185 msgid "Line" msgstr "Ligne" -#: models_finds.py:185 +#: models_finds.py:186 msgid "Polygon" msgstr "Polygon" -#: models_finds.py:188 models_finds.py:191 +#: models_finds.py:189 models_finds.py:192 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:197 models_finds.py:610 +#: models_finds.py:198 models_finds.py:629 msgid "Base find" msgstr "Mobilier de base" -#: models_finds.py:198 +#: models_finds.py:199 msgid "Base finds" msgstr "Mobilier de base" -#: models_finds.py:200 +#: models_finds.py:201 msgid "Can view all Base finds" msgstr "Peut voir tout le Mobilier de base" -#: models_finds.py:201 +#: models_finds.py:202 msgid "Can view own Base find" msgstr "Peut voir son propre Mobilier de base" -#: models_finds.py:202 +#: models_finds.py:203 msgid "Can add own Base find" msgstr "Peut ajouter son propre Mobilier de base" -#: models_finds.py:203 +#: models_finds.py:204 msgid "Can change own Base find" msgstr "Peut modifier son propre Mobilier de base" -#: models_finds.py:204 +#: models_finds.py:205 msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models_finds.py:443 +#: models_finds.py:462 msgid "g" msgstr "g" -#: models_finds.py:444 +#: models_finds.py:463 msgid "kg" msgstr "kg" -#: models_finds.py:446 +#: models_finds.py:465 msgid "Not checked" msgstr "Non vérifié" -#: models_finds.py:447 +#: models_finds.py:466 msgid "Checked but incorrect" msgstr "Vérifié mais incorrect" -#: models_finds.py:448 +#: models_finds.py:467 msgid "Checked and correct" msgstr "Vérifié et correct" -#: models_finds.py:520 +#: models_finds.py:539 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models_finds.py:521 +#: models_finds.py:540 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models_finds.py:523 +#: models_finds.py:542 msgid "Operation (code)" msgstr "Opération (code)" -#: models_finds.py:525 +#: models_finds.py:544 msgid "Town" msgstr "Ville" -#: models_finds.py:527 +#: models_finds.py:546 msgid "Operation (name)" msgstr "Opération (nom)" -#: models_finds.py:529 +#: models_finds.py:548 msgid "Parcel" msgstr "Parcelle" -#: models_finds.py:530 +#: models_finds.py:549 msgid "Batch" msgstr "Lot" -#: models_finds.py:531 +#: models_finds.py:550 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models_finds.py:532 +#: models_finds.py:551 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models_finds.py:533 +#: models_finds.py:552 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models_finds.py:535 +#: models_finds.py:554 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models_finds.py:536 +#: models_finds.py:555 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:537 models_finds.py:643 models_treatments.py:132 +#: models_finds.py:556 models_finds.py:662 models_treatments.py:132 #: models_treatments.py:312 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Container" msgstr "Contenant" -#: models_finds.py:538 +#: models_finds.py:557 msgid "Periods" msgstr "Périodes" -#: models_finds.py:626 +#: models_finds.py:645 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:630 +#: models_finds.py:649 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:636 templates/ishtar/sheet_find.html:82 +#: models_finds.py:655 templates/ishtar/sheet_find.html:82 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:639 templates/ishtar/sheet_find.html:124 +#: models_finds.py:658 templates/ishtar/sheet_find.html:124 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:678 +#: models_finds.py:697 msgid "Collection" msgstr "Collection" -#: models_finds.py:680 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:699 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:689 +#: models_finds.py:708 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:690 +#: models_finds.py:709 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:691 +#: models_finds.py:710 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:692 +#: models_finds.py:711 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:693 +#: models_finds.py:712 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:699 +#: models_finds.py:718 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1103 +#: models_finds.py:1146 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1104 +#: models_finds.py:1147 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1107 +#: models_finds.py:1150 msgid "Can view all Find sources" msgstr "Peut voir toutes les Documentations de mobilier" -#: models_finds.py:1109 +#: models_finds.py:1152 msgid "Can view own Find source" msgstr "Peut voir sa propre Documentation de mobilier" -#: models_finds.py:1111 +#: models_finds.py:1154 msgid "Can add own Find source" msgstr "Peut ajouter sa propre Documentation de mobilier" -#: models_finds.py:1113 +#: models_finds.py:1156 msgid "Can change own Find source" msgstr "Peut modifier sa propre Documentation de mobilier" -#: models_finds.py:1115 +#: models_finds.py:1158 msgid "Can delete own Find source" msgstr "Peut suprimer sa propre Documentation de mobilier" -#: models_finds.py:1141 +#: models_finds.py:1184 msgid "Person" msgstr "Individu" -#: models_finds.py:1147 +#: models_finds.py:1190 msgid "Property" msgstr "Propriété" -#: models_finds.py:1148 +#: models_finds.py:1191 msgid "Properties" msgstr "Propriétés" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 4ac8c3302..980fba45d 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -6,13 +6,14 @@ # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-04-07 05:56-0400\n" -"Last-Translator: Valérie-Emma Leroux \n" +"PO-Revision-Date: 2017-05-16 06:17-0400\n" +"Last-Translator: Étienne Loks \n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -196,12 +197,12 @@ msgstr "Vous devez sélectionner un élément." msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:297 models.py:1549 +#: forms.py:297 models.py:1556 msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1615 models.py:3078 +#: forms_common.py:408 models.py:1622 models.py:3085 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -224,8 +225,8 @@ msgstr "" "

Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.

" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2678 -#: models.py:2871 models.py:2933 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2685 +#: models.py:2878 models.py:2940 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -238,64 +239,64 @@ msgstr "" "pas possible." #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2561 models.py:2652 +#: ishtar_menu.py:75 models.py:2568 models.py:2659 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 -#: forms_common.py:378 forms_common.py:448 models.py:1157 models.py:1548 -#: models.py:1817 models.py:1833 models.py:2071 models.py:2349 models.py:2555 -#: models.py:2664 models.py:3064 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1159 models.py:1555 +#: models.py:1824 models.py:1840 models.py:2078 models.py:2356 models.py:2562 +#: models.py:2671 models.py:3071 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:176 models.py:1770 models.py:2202 +#: forms_common.py:176 models.py:1777 models.py:2209 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:178 forms_common.py:402 models.py:1610 +#: forms_common.py:178 forms_common.py:402 models.py:1617 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:180 forms_common.py:405 models.py:1611 +#: forms_common.py:180 forms_common.py:405 models.py:1618 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:182 forms_common.py:406 models.py:1613 +#: forms_common.py:182 forms_common.py:406 models.py:1620 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:185 forms_common.py:409 models.py:1616 +#: forms_common.py:185 forms_common.py:409 models.py:1623 msgid "Country" msgstr "Pays" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1643 +#: forms_common.py:450 forms_common.py:574 models.py:1650 msgid "Email" msgstr "Courriel" -#: forms_common.py:188 forms_common.py:385 models.py:1628 +#: forms_common.py:188 forms_common.py:385 models.py:1635 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:189 forms_common.py:394 models.py:1640 +#: forms_common.py:189 forms_common.py:394 models.py:1647 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2240 -#: models.py:2557 models.py:2999 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2247 +#: models.py:2564 models.py:3006 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -319,7 +320,7 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2662 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2669 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" @@ -337,25 +338,25 @@ msgstr "Personne à fusionner" msgid "Identity" msgstr "Identité" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2203 -#: models.py:2656 models.py:2658 models.py:2996 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2210 +#: models.py:2663 models.py:2665 models.py:3003 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:374 models.py:2660 +#: forms_common.py:374 models.py:2667 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:380 models.py:2666 +#: forms_common.py:380 models.py:2673 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:383 models.py:1629 +#: forms_common.py:383 models.py:1636 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:386 models.py:1631 models.py:1633 +#: forms_common.py:386 models.py:1638 models.py:1640 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -363,11 +364,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:390 models.py:1637 +#: forms_common.py:390 models.py:1644 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:392 models.py:1635 +#: forms_common.py:392 models.py:1642 msgid "Phone 3" msgstr "Téléphone 3" @@ -375,23 +376,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:411 models.py:1618 +#: forms_common.py:411 models.py:1625 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:414 models.py:1621 +#: forms_common.py:414 models.py:1628 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:416 models.py:1622 +#: forms_common.py:416 models.py:1629 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:418 models.py:1624 +#: forms_common.py:418 models.py:1631 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:420 models.py:1626 +#: forms_common.py:420 models.py:1633 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -407,7 +408,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Rechercher un compte" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2609 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2616 msgid "Person type" msgstr "Type de personne" @@ -439,7 +440,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:636 forms_common.py:649 models.py:3079 +#: forms_common.py:636 forms_common.py:649 models.py:3086 msgid "Towns" msgstr "Communes" @@ -455,7 +456,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:783 forms_common.py:831 models.py:2204 models.py:2971 +#: forms_common.py:783 forms_common.py:831 models.py:2211 models.py:2978 msgid "Source type" msgstr "Type de document" @@ -467,37 +468,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:791 models.py:3010 +#: forms_common.py:791 models.py:3017 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:792 models.py:3012 +#: forms_common.py:792 models.py:3019 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:794 models.py:2375 models.py:3014 +#: forms_common.py:794 models.py:2382 models.py:3021 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:797 models.py:3017 +#: forms_common.py:797 models.py:3024 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" #: forms_common.py:799 forms_common.py:835 models.py:419 models.py:746 -#: models.py:2098 models.py:2670 models.py:3024 +#: models.py:2105 models.py:2677 models.py:3031 msgid "Comment" msgstr "Commentaire" -#: forms_common.py:801 forms_common.py:834 models.py:1159 models.py:1837 -#: models.py:2025 models.py:2072 models.py:3023 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1161 models.py:1844 +#: models.py:2032 models.py:2079 models.py:3030 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:804 models.py:3025 +#: forms_common.py:804 models.py:3032 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:806 forms_common.py:838 models.py:3027 +#: forms_common.py:806 forms_common.py:838 models.py:3034 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -514,7 +515,7 @@ msgstr "" "

Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2938 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2945 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -527,7 +528,7 @@ msgstr "Informations supplémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:864 models.py:2205 models.py:2925 models.py:2935 +#: forms_common.py:864 models.py:2212 models.py:2932 models.py:2942 msgid "Author type" msgstr "Type d'auteur" @@ -539,7 +540,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:901 models.py:2939 models.py:3006 +#: forms_common.py:901 models.py:2946 models.py:3013 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -557,7 +558,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1331 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1640 msgid "Global variables" msgstr "Variables globales" @@ -585,7 +586,7 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2383 +#: ishtar_menu.py:109 models.py:2390 msgid "Imports" msgstr "Imports" @@ -613,7 +614,7 @@ msgstr "Un élément sélectionné n'est pas valide." msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:415 models.py:745 models.py:1583 models.py:1595 models.py:2021 +#: models.py:415 models.py:745 models.py:1590 models.py:1602 models.py:2028 msgid "Label" msgstr "Libellé" @@ -621,11 +622,11 @@ msgstr "Libellé" msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:420 models.py:748 models.py:1552 +#: models.py:420 models.py:748 models.py:1559 msgid "Available" msgstr "Disponible" -#: models.py:772 models.py:2144 +#: models.py:772 models.py:2151 msgid "Key" msgstr "Clé" @@ -641,7 +642,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:1019 models.py:2922 models.py:3090 models.py:3146 +#: models.py:1019 models.py:2929 models.py:3097 models.py:3153 msgid "Order" msgstr "Ordre" @@ -665,67 +666,87 @@ msgstr "Euro" msgid "US dollar" msgstr "Dollar US" -#: models.py:1158 models.py:1835 +#: models.py:1153 views.py:1438 views.py:1500 +msgid "Operations" +msgstr "Opérations" + +#: models.py:1154 views.py:1440 views.py:1504 +msgid "Context records" +msgstr "Unités d'Enregistrement" + +#: models.py:1160 models.py:1842 msgid "Slug" msgstr "Identifiant texte" -#: models.py:1161 +#: models.py:1163 msgid "CSS color code for base module" msgstr "Code couleur CSS pour le tronc commun" -#: models.py:1163 +#: models.py:1165 msgid "Files module" msgstr "Module Dossiers" -#: models.py:1165 +#: models.py:1167 msgid "CSS color code for files module" msgstr "Code couleur CSS pour le module Dossier" -#: models.py:1167 +#: models.py:1169 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:1170 +#: models.py:1172 msgid "CSS color code for context record module" msgstr "Code couleur CSS pour le module Unité d'Enregistrement" -#: models.py:1172 +#: models.py:1174 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:1173 +#: models.py:1175 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:1175 +#: models.py:1177 +msgid "Find index is based on" +msgstr "Index mobilier basé sur" + +#: models.py:1179 +msgid "" +"To prevent irrelevant indexes, change this parameter only if there is no " +"find in the database" +msgstr "" +"Pour éviter des index non pertinents, ne changer ce paramètre seulement si " +"il n'y a pas encore de mobilier dans cette base de données" + +#: models.py:1182 msgid "CSS color code for find module" msgstr "Code couleur CSS pour le module Mobilier" -#: models.py:1178 +#: models.py:1185 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:1179 +#: models.py:1186 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:1181 +#: models.py:1188 msgid "CSS code for warehouse module" msgstr "Code couleur CSS pour le module Dépôt" -#: models.py:1183 +#: models.py:1190 msgid "Mapping module" msgstr "Module cartographique" -#: models.py:1185 +#: models.py:1192 msgid "CSS code for mapping module" msgstr "Code couleur CSS pour le module cartographique" -#: models.py:1188 +#: models.py:1195 msgid "Home page" msgstr "Page d'accueil" -#: models.py:1189 +#: models.py:1196 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -735,11 +756,11 @@ msgstr "" "défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: models.py:1193 +#: models.py:1200 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:1195 +#: models.py:1202 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -749,11 +770,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1200 +#: models.py:1207 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:1203 +#: models.py:1210 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -763,11 +784,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1208 +#: models.py:1215 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:1210 +#: models.py:1217 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -777,11 +798,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1215 +#: models.py:1222 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:1217 +#: models.py:1224 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -791,11 +812,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1222 +#: models.py:1229 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:1224 +#: models.py:1231 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -805,11 +826,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1229 +#: models.py:1236 msgid "Container external id" msgstr "ID externe du contenant" -#: models.py:1231 +#: models.py:1238 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -819,11 +840,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1236 +#: models.py:1243 msgid "Warehouse external id" msgstr "ID externe du dépôt" -#: models.py:1238 +#: models.py:1245 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -833,11 +854,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1243 +#: models.py:1250 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: models.py:1245 +#: models.py:1252 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -847,43 +868,43 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: models.py:1249 +#: models.py:1256 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:1250 +#: models.py:1257 msgid "Currency" msgstr "Devise" -#: models.py:1254 +#: models.py:1261 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:1255 +#: models.py:1262 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:1324 +#: models.py:1331 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1325 +#: models.py:1332 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1327 models.py:2145 +#: models.py:1334 models.py:2152 msgid "Value" msgstr "Valeur" -#: models.py:1330 +#: models.py:1337 msgid "Global variable" msgstr "Variable globale" -#: models.py:1453 models.py:1483 +#: models.py:1460 models.py:1490 msgid "Total" msgstr "Total" -#: models.py:1460 models.py:1584 models.py:1596 +#: models.py:1467 models.py:1591 models.py:1603 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -891,135 +912,135 @@ msgstr "Total" msgid "Number" msgstr "Nombre" -#: models.py:1547 +#: models.py:1554 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1551 +#: models.py:1558 msgid "Associated object" msgstr "Objet associé" -#: models.py:1555 +#: models.py:1562 msgid "Document template" msgstr "Patron de document" -#: models.py:1556 +#: models.py:1563 msgid "Document templates" msgstr "Patrons de document" -#: models.py:1587 models.py:1597 models.py:2369 +#: models.py:1594 models.py:1604 models.py:2376 msgid "State" msgstr "État" -#: models.py:1601 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1608 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1602 +#: models.py:1609 msgid "Departments" msgstr "Départements" -#: models.py:1639 +#: models.py:1646 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1645 +#: models.py:1652 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1684 +#: models.py:1691 msgid "Tel: " msgstr "Tél :" -#: models.py:1688 +#: models.py:1695 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1692 +#: models.py:1699 msgid "Email: " msgstr "Courriel :" -#: models.py:1697 +#: models.py:1704 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1771 +#: models.py:1778 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1818 +#: models.py:1825 msgid "Class name" msgstr "Nom de la classe" -#: models.py:1821 +#: models.py:1828 msgid "Importer - Model" msgstr "Importeur - Modèle" -#: models.py:1822 +#: models.py:1829 msgid "Importer - Models" msgstr "Importeur - Modèles" -#: models.py:1839 templates/ishtar/dashboards/dashboard_main.html:34 +#: models.py:1846 templates/ishtar/dashboards/dashboard_main.html:34 msgid "Users" msgstr "Utilisateurs" -#: models.py:1842 +#: models.py:1849 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1845 +#: models.py:1852 msgid "Models that can accept new items" msgstr "Modèles qui peuvent accepter de nouveaux éléments" -#: models.py:1846 +#: models.py:1853 msgid "Leave blank for no restrictions" msgstr "Laissez vide pour aucune restriction" -#: models.py:1848 +#: models.py:1855 msgid "Is template" msgstr "Est un patron" -#: models.py:1849 +#: models.py:1856 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1853 +#: models.py:1860 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1854 +#: models.py:1861 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1953 +#: models.py:1960 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1954 +#: models.py:1961 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1989 +#: models.py:1996 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1990 +#: models.py:1997 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:2024 +#: models.py:2031 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:2027 +#: models.py:2034 msgid "Required" msgstr "Requis" -#: models.py:2029 +#: models.py:2036 msgid "Export field name" msgstr "Exporter le nom du champ" -#: models.py:2030 +#: models.py:2037 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." @@ -1027,531 +1048,531 @@ msgstr "" "Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple " "dans le cas de champs concaténés." -#: models.py:2035 +#: models.py:2042 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:2036 +#: models.py:2043 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:2056 +#: models.py:2063 msgid "Field name" msgstr "Nom du champ" -#: models.py:2058 models.py:2092 +#: models.py:2065 models.py:2099 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:2060 models.py:2094 +#: models.py:2067 models.py:2101 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:2062 models.py:2096 +#: models.py:2069 models.py:2103 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:2066 +#: models.py:2073 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:2067 +#: models.py:2074 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:2074 +#: models.py:2081 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:2077 +#: models.py:2084 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:2078 +#: models.py:2085 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:2101 +#: models.py:2108 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:2102 +#: models.py:2109 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:2126 views.py:570 +#: models.py:2133 views.py:570 msgid "True" msgstr "Oui" -#: models.py:2127 views.py:572 +#: models.py:2134 views.py:572 msgid "False" msgstr "Non" -#: models.py:2146 +#: models.py:2153 msgid "Is set" msgstr "Est défini" -#: models.py:2153 +#: models.py:2160 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: models.py:2154 +#: models.py:2161 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2206 models.py:3002 +#: models.py:2213 models.py:3009 msgid "Format" msgstr "Format" -#: models.py:2207 models.py:3094 +#: models.py:2214 models.py:3101 msgid "Operation type" msgstr "Type d'opération" -#: models.py:2208 +#: models.py:2215 msgid "Period" msgstr "Période" -#: models.py:2209 +#: models.py:2216 msgid "Report state" msgstr "État de rapport" -#: models.py:2210 +#: models.py:2217 msgid "Remain type" msgstr "Type de vestige" -#: models.py:2211 +#: models.py:2218 msgid "Unit" msgstr "Unité" -#: models.py:2213 +#: models.py:2220 msgid "Activity type" msgstr "Type d'activité" -#: models.py:2214 +#: models.py:2221 msgid "Material" msgstr "Matériau" -#: models.py:2216 +#: models.py:2223 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:2217 +#: models.py:2224 msgid "Container type" msgstr "Type de contenant" -#: models.py:2218 +#: models.py:2225 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:2219 +#: models.py:2226 msgid "Object type" msgstr "Type d'objet" -#: models.py:2220 +#: models.py:2227 msgid "Integrity type" msgstr "Type d'intégrité" -#: models.py:2222 +#: models.py:2229 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models.py:2223 +#: models.py:2230 msgid "Batch type" msgstr "Type de lot" -#: models.py:2225 +#: models.py:2232 msgid "Identification type" msgstr "Type d'identification" -#: models.py:2227 +#: models.py:2234 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2228 models.py:3152 +#: models.py:2235 models.py:3159 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2229 models.py:2980 +#: models.py:2236 models.py:2987 msgid "Support type" msgstr "Type de support" -#: models.py:2230 models.py:2621 +#: models.py:2237 models.py:2628 msgid "Title type" msgstr "Type de titre" -#: models.py:2236 +#: models.py:2243 msgid "Integer" msgstr "Entier" -#: models.py:2237 +#: models.py:2244 msgid "Float" msgstr "Nombre à virgule" -#: models.py:2238 +#: models.py:2245 msgid "String" msgstr "Chaîne de caractères" -#: models.py:2239 templates/sheet_ope.html:86 +#: models.py:2246 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:2241 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2248 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:2242 +#: models.py:2249 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:2243 +#: models.py:2250 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:2244 +#: models.py:2251 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:2260 +#: models.py:2267 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:2261 +#: models.py:2268 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:2262 +#: models.py:2269 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2272 +#: models.py:2279 msgid "Options" msgstr "Options" -#: models.py:2274 +#: models.py:2281 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2278 +#: models.py:2285 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2279 +#: models.py:2286 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2331 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2338 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2332 +#: models.py:2339 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2333 +#: models.py:2340 msgid "Analysed" msgstr "Analysé" -#: models.py:2334 +#: models.py:2341 msgid "Import pending" msgstr "Import en attente" -#: models.py:2335 +#: models.py:2342 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2336 +#: models.py:2343 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2337 +#: models.py:2344 msgid "Finished" msgstr "Terminé" -#: models.py:2338 +#: models.py:2345 msgid "Archived" msgstr "Archivé" -#: models.py:2353 +#: models.py:2360 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2355 +#: models.py:2362 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2357 +#: models.py:2364 msgid "Encoding" msgstr "Codage" -#: models.py:2359 +#: models.py:2366 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2360 templates/ishtar/import_list.html:51 +#: models.py:2367 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2363 +#: models.py:2370 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2366 templates/ishtar/import_list.html:57 +#: models.py:2373 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2372 +#: models.py:2379 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2376 +#: models.py:2383 msgid "End date" msgstr "Date de fin" -#: models.py:2379 +#: models.py:2386 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2382 +#: models.py:2389 msgid "Import" msgstr "Import" -#: models.py:2411 +#: models.py:2418 msgid "Analyse" msgstr "Analyser" -#: models.py:2413 models.py:2416 +#: models.py:2420 models.py:2423 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2414 +#: models.py:2421 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2417 +#: models.py:2424 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2418 +#: models.py:2425 msgid "Archive" msgstr "Archiver" -#: models.py:2420 +#: models.py:2427 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2421 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2562 +#: models.py:2569 msgid "Organizations" msgstr "Organisations" -#: models.py:2564 +#: models.py:2571 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2565 +#: models.py:2572 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2566 +#: models.py:2573 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2568 +#: models.py:2575 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2570 +#: models.py:2577 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2605 +#: models.py:2612 msgid "Groups" msgstr "Groupes" -#: models.py:2610 +#: models.py:2617 msgid "Person types" msgstr "Types de personne" -#: models.py:2622 +#: models.py:2629 msgid "Title types" msgstr "Types de titre" -#: models.py:2631 +#: models.py:2638 msgid "Mr" msgstr "M." -#: models.py:2632 +#: models.py:2639 msgid "Miss" msgstr "Mlle" -#: models.py:2633 +#: models.py:2640 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2634 +#: models.py:2641 msgid "Mrs" msgstr "Mme" -#: models.py:2635 +#: models.py:2642 msgid "Doctor" msgstr "Dr." -#: models.py:2668 +#: models.py:2675 msgid "Contact type" msgstr "Type de contact" -#: models.py:2671 models.py:2735 +#: models.py:2678 models.py:2742 msgid "Types" msgstr "Types" -#: models.py:2674 +#: models.py:2681 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2679 +#: models.py:2686 msgid "Persons" msgstr "Personnes" -#: models.py:2681 +#: models.py:2688 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2682 +#: models.py:2689 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2683 +#: models.py:2690 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2684 +#: models.py:2691 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2685 +#: models.py:2692 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2874 +#: models.py:2881 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2877 +#: models.py:2884 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2878 +#: models.py:2885 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2918 +#: models.py:2925 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2926 +#: models.py:2933 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2943 +#: models.py:2950 msgid "Can view all Authors" msgstr "Peut voir tous les Auteurs" -#: models.py:2945 +#: models.py:2952 msgid "Can view own Author" msgstr "Peut voir son propre Auteur" -#: models.py:2947 +#: models.py:2954 msgid "Can add own Author" msgstr "Peut ajouter son propre Auteur" -#: models.py:2949 +#: models.py:2956 msgid "Can change own Author" msgstr "Peut modifier son propre Auteur" -#: models.py:2951 +#: models.py:2958 msgid "Can delete own Author" msgstr "Peut supprimer son propre Auteur" -#: models.py:2972 +#: models.py:2979 msgid "Source types" msgstr "Types de document" -#: models.py:2981 +#: models.py:2988 msgid "Support types" msgstr "Types de support" -#: models.py:2988 +#: models.py:2995 msgid "Format type" msgstr "Type de format" -#: models.py:2989 +#: models.py:2996 msgid "Format types" msgstr "Types de format" -#: models.py:2997 +#: models.py:3004 msgid "External ID" msgstr "Identifiant externe" -#: models.py:3000 +#: models.py:3007 msgid "Support" msgstr "Support" -#: models.py:3004 +#: models.py:3011 msgid "Scale" msgstr "Échelle" -#: models.py:3018 +#: models.py:3025 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:3019 +#: models.py:3026 msgid "Ref." msgstr "Réf." -#: models.py:3022 +#: models.py:3029 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:3065 +#: models.py:3072 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:3066 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3073 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:3091 +#: models.py:3098 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:3095 +#: models.py:3102 msgid "Operation types" msgstr "Types d'opération" -#: models.py:3124 +#: models.py:3131 msgid "Preventive" msgstr "Préventif" -#: models.py:3125 +#: models.py:3132 msgid "Research" msgstr "Programmé" -#: models.py:3148 +#: models.py:3155 msgid "Authority name" msgstr "Registre" -#: models.py:3149 +#: models.py:3156 msgid "Authority SRID" msgstr "SRID" -#: models.py:3153 +#: models.py:3160 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1632,14 +1653,6 @@ msgstr "Nouveau %s" msgid "Archaeological files" msgstr "Dossiers" -#: views.py:1438 views.py:1500 -msgid "Operations" -msgstr "Opérations" - -#: views.py:1440 views.py:1504 -msgid "Context records" -msgstr "Unités d'Enregistrement" - #: views.py:1442 views.py:1507 msgid "Finds" msgstr "Mobilier" -- cgit v1.2.3