diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
| commit | e43af859f710814f462001bcde5157a4594c59b7 (patch) | |
| tree | 63f4fab584f0cc4e4b38f19461800b532af98195 /ishtar_common/models.py | |
| parent | 74d607f46c0138a08d47a19385f573f818f8a5f6 (diff) | |
| parent | c435e9230b0291924887460bac3fa8f3576dcf43 (diff) | |
| download | Ishtar-e43af859f710814f462001bcde5157a4594c59b7.tar.bz2 Ishtar-e43af859f710814f462001bcde5157a4594c59b7.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.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index cb069216d..984e9048b 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1354,7 +1354,7 @@ class Import(models.Model): importer_type = models.ForeignKey(ImporterType) imported_file = models.FileField(_(u"Imported file"), upload_to="upload/imports/") - skip_lines = models.IntegerField(default=1) + skip_lines = models.IntegerField(_(u"Skip lines"), default=1) error_file = models.FileField(_(u"Error file"), upload_to="upload/imports/", blank=True, null=True) |