summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-05-20 00:25:20 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-05-20 00:25:20 +0200
commit0c6578ca35d85afe10d01c1e739d015dfdc224e0 (patch)
treee989fe16e54578643d5f38702b2a87748d363ecd /ishtar_common/models.py
parentba8cd9cb1fedfe5b1263ab09a49d1c0b3dcd834d (diff)
parent804f228fd98c17f48ef3dda3f0eb23fb8e61ec98 (diff)
downloadIshtar-0c6578ca35d85afe10d01c1e739d015dfdc224e0.tar.bz2
Ishtar-0c6578ca35d85afe10d01c1e739d015dfdc224e0.zip
Merge branch 'stable'
Conflicts: ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index a1f1c1129..cb069216d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1256,7 +1256,7 @@ TARGET_MODELS = [
('SourceType', _(u"Source type")),
('AuthorType', _(u"Author type")),
('Format', _(u"Format")),
- ('archaeological_operations.models.OperationType', _(u"OperationType")),
+ ('archaeological_operations.models.OperationType', _(u"Operation type")),
('archaeological_operations.models.Period', _(u"Period")),
]