diff options
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 3 | ||||
| -rw-r--r-- | archaeological_files/locale/django.pot | 6 | ||||
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 2 | ||||
| -rw-r--r-- | archaeological_files_pdl/locale/django.pot | 2 | ||||
| -rw-r--r-- | archaeological_finds/locale/django.pot | 3 | ||||
| -rw-r--r-- | archaeological_operations/locale/django.pot | 1 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 1 | ||||
| -rw-r--r-- | translations/fr/archaeological_files.po | 11 |
9 files changed, 19 insertions, 14 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index fb4bf85fc..9e403163d 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -2,7 +2,8 @@ # Copyright (C) 2010-2015 # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. -# Étienne Loks <etienne.loks@proxience.com>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 2ea8acf9e..01477d187 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -2,7 +2,7 @@ # Copyright (C) 2010-2014 # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2014. -# Étienne Loks <etienne.loks@proxience.com>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata msgid "" msgstr "" @@ -292,7 +292,7 @@ msgid "General contractor (raw)" msgstr "" #: models.py:98 -msgid "General contractor - corporation" +msgid "General contractor organization" msgstr "" #: models.py:106 @@ -300,7 +300,7 @@ msgid "Town planning service (raw)" msgstr "" #: models.py:112 -msgid "Planning service - corporation" +msgid "Town planning service organization" msgstr "" #: models.py:118 diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 500c91b5c..bd6a39340 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -95,7 +95,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, corporation_general_contractor = models.ForeignKey( Organization, related_name='general_contractor_files', - verbose_name=_(u"General contractor - corporation"), blank=True, + verbose_name=_(u"General contractor organization"), blank=True, null=True, on_delete=models.SET_NULL,) # aménageur responsible_town_planning_service = models.ForeignKey( Person, related_name='responsible_town_planning_service_files', @@ -109,7 +109,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, Organization, related_name='planning_service_files', blank=True, null=True, - verbose_name=_(u"Planning service - corporation"), + verbose_name=_(u"Town planning service organization"), on_delete=models.SET_NULL,) # service instructeur permit_type = models.ForeignKey( PermitType, verbose_name=_(u"Permit type"), blank=True, null=True) diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 67341c07d..c14327b5b 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -87,7 +87,7 @@ {% endif %} {% field "Permit type" item.permit_type %} -{% field "Permit reference" item.reference %} +{% field "Permit reference" item.permit_reference %} {% field "General contractor" item.general_contractor.full_address %} {% if item.corporation_general_contractor %} diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot index fc0d2a523..e7592e95d 100644 --- a/archaeological_files_pdl/locale/django.pot +++ b/archaeological_files_pdl/locale/django.pot @@ -2,7 +2,7 @@ # Copyright (C) 2014 # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2014. -# Étienne Loks <etienne.loks@proxience.com>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata msgid "" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 13539ca4a..688d732f9 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -2,7 +2,8 @@ # Copyright (C) 2010-2015 # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. -# Étienne Loks <etienne.loks@proxience.com>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 9fd13215f..55f832463 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index f650bd496..20e1cd7bf 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 6eb4d72dd..aa89350c5 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2014. # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2015-12-28 06:34-0500\n" +"PO-Revision-Date: 2016-01-20 06:45-0500\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -301,16 +302,16 @@ msgid "General contractor (raw)" msgstr "Aménageur (brut)" #: models.py:98 -msgid "General contractor - corporation" -msgstr "Aménageur - organisation" +msgid "General contractor organization" +msgstr "Organisation de l'aménageur" #: models.py:106 msgid "Town planning service (raw)" msgstr "Service instructeur (brut)" #: models.py:112 -msgid "Planning service - corporation" -msgstr "Service instructeur - organisation" +msgid "Town planning service organization" +msgstr "Service instructeur" #: models.py:118 msgid "Closing date" |