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 | |
| 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
| -rw-r--r-- | ishtar_common/locale/fr/LC_MESSAGES/django.po | 6 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index aa3a0a5bf..92e30b96a 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-20 00:22+0200\n" +"POT-Creation-Date: 2015-05-20 00:35+0200\n" "PO-Revision-Date: 2015-01-25\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -749,6 +749,10 @@ msgstr "Archivé" msgid "Imported file" msgstr "Fichier importé" +#: models.py:1357 +msgid "Skip lines" +msgstr "Nombre de lignes d'entête" + #: models.py:1358 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "Fichier erreur" 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) |