From b8116a403127394c4b498b4f6e6fa06ce9bbe415 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 17 Jul 2022 11:14:51 +0200 Subject: Update translations --- ishtar_common/admin.py | 3 + ishtar_common/models_common.py | 10 +- ishtar_common/models_imports.py | 8 +- ishtar_common/models_rest.py | 2 +- locale/de/LC_MESSAGES/django.po | 57 +++--- locale/es/LC_MESSAGES/django.po | 57 +++--- locale/fr/LC_MESSAGES/django.po | 430 ++++++++++++++++------------------------ locale/pt/LC_MESSAGES/django.po | 57 +++--- 8 files changed, 270 insertions(+), 354 deletions(-) diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index b7cc5adf6..86a9af8e8 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -2279,6 +2279,9 @@ def generate_match_document(modeladmin, request, queryset): return response +generate_match_document.short_description = _("Generate match document") + + def update_association_from_match_document(modeladmin, request, queryset): return_url = ( reverse( diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 8707120f9..66025948a 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -2093,7 +2093,7 @@ GEOJSON_POINT_TPL = { GEOMETRY_TYPE_LBL = { "POINT": _("Point"), "MULTILINE": _("Line(s)"), - "MULTIPOINTS": _("Points"), + "MULTIPOINTS": _("Point(s)"), "MULTIPOLYGON": _("Polygon(s)"), } @@ -2124,7 +2124,7 @@ class GeoVectorData(Imported, OwnPerms): null=True, on_delete=models.PROTECT, verbose_name=_("Origin"), - help_text=_("For instance: topographical surveys, georeferencing, ..."), + help_text=_("For instance: topographical survey, georeferencing, ..."), ) data_type = models.ForeignKey( GeoDataType, @@ -2170,8 +2170,8 @@ class GeoVectorData(Imported, OwnPerms): point_2d = models.PointField(_("Point (2D)"), blank=True, null=True) point_3d = models.PointField(_("Point (3D)"), blank=True, null=True, dim=3) multi_points = models.MultiPointField(_("Multi points"), blank=True, null=True) - multi_line = models.MultiLineStringField(_("Multi line"), blank=True, null=True) - multi_polygon = models.MultiPolygonField(_("Multi polygon"), blank=True, null=True) + multi_line = models.MultiLineStringField(_("Multi lines"), blank=True, null=True) + multi_polygon = models.MultiPolygonField(_("Multi polygons"), blank=True, null=True) need_update = models.BooleanField(_("Need update"), default=False) class Meta: @@ -2245,7 +2245,7 @@ class GeoVectorData(Imported, OwnPerms): def get_coordinates(self, rounded=5, srid: int = None, dim=2, cache=False): if dim not in (2, 3): - raise ValueError(_("Only 2 or 3 dimension")) + raise ValueError(_("Only 2 or 3 dimensions")) if cache: coordinates = [self.cached_x, self.cached_y] if dim == 3: diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 1fb5d4fcc..c85533268 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -157,7 +157,7 @@ class ImporterType(models.Model): help_text=_("For GIS file with multiple layers"), ) is_main_geometry = models.BooleanField( - _("Set to main geometry"), + _("Set as main geometry"), default=True, help_text=_("Only relevant for GIS files"), ) @@ -1462,10 +1462,10 @@ class Import(models.Model): else: z.extract(filename, tmp_dir) elif not imported_file.endswith(".gpkg"): - raise ImporterError(_("Incorrect GIS file.")) + raise ImporterError(_("Invalid GIS file.")) if not imported_file: - raise ImporterError(_("Incorrect GIS file.")) + raise ImporterError(_("Invalid GIS file.")) kwargs = {} if self.importer_type.layer_name: @@ -1524,7 +1524,7 @@ class Import(models.Model): _(f"Error reading feature {idx + 1} - {e}") ) except fiona.errors.DriverError: - raise ImporterError(_("Incorrect GIS file.")) + raise ImporterError(_("Invalid GIS file.")) if tmp_dir: shutil.rmtree(tmp_dir) diff --git a/ishtar_common/models_rest.py b/ishtar_common/models_rest.py index b0ed5cbd4..17db09fc2 100644 --- a/ishtar_common/models_rest.py +++ b/ishtar_common/models_rest.py @@ -60,7 +60,7 @@ class ApiSearchModel(models.Model): user = models.ForeignKey(ApiUser, on_delete=models.CASCADE) content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) limit_query = models.TextField( - verbose_name=_("Limit query"), + verbose_name=_("Filter query"), blank=True, null=True, help_text=_("Search query add to each request"), diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index ed694faa7..65e1cf827 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-16 18:56+0200\n" +"POT-Creation-Date: 2022-07-17 11:13+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: German \n" "Language-Team: LANGUAGE \n" @@ -25,8 +25,7 @@ msgid "Point" msgstr "" #: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:2173 -#: ishtar_common/models_common.py:3422 +#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3422 msgid "Multi polygon" msgstr "" @@ -7211,7 +7210,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4966 ishtar_common/admin.py:2315 +#: archaeological_operations/tests.py:4966 ishtar_common/admin.py:2318 msgid "{result['updated']} match key(s) updated." msgstr "" @@ -8290,7 +8289,7 @@ msgid "Content type" msgstr "" #: ishtar_common/admin.py:2151 ishtar_common/admin.py:2261 -#: ishtar_common/admin.py:2294 +#: ishtar_common/admin.py:2297 msgid "Select only one source." msgstr "" @@ -8333,31 +8332,35 @@ msgstr "" msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2303 +#: ishtar_common/admin.py:2282 +msgid "Generate match document" +msgstr "" + +#: ishtar_common/admin.py:2306 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2308 +#: ishtar_common/admin.py:2311 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2321 +#: ishtar_common/admin.py:2324 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2354 +#: ishtar_common/admin.py:2357 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2358 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2365 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2368 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2368 ishtar_common/models.py:446 +#: ishtar_common/admin.py:2371 ishtar_common/models.py:446 #: ishtar_common/models.py:729 ishtar_common/models_common.py:805 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8368,21 +8371,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2370 +#: ishtar_common/admin.py:2373 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2400 +#: ishtar_common/admin.py:2403 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2433 +#: ishtar_common/admin.py:2436 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2441 +#: ishtar_common/admin.py:2444 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -10877,7 +10880,7 @@ msgstr "" msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5061 +#: ishtar_common/models.py:5061 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "" @@ -11075,7 +11078,7 @@ msgid "Line(s)" msgstr "" #: ishtar_common/models_common.py:2095 -msgid "Points" +msgid "Point(s)" msgstr "" #: ishtar_common/models_common.py:2096 @@ -11087,7 +11090,7 @@ msgid "Use this for update imports" msgstr "" #: ishtar_common/models_common.py:2126 -msgid "For instance: topographical surveys, georeferencing, ..." +msgid "For instance: topographical survey, georeferencing, ..." msgstr "" #: ishtar_common/models_common.py:2134 @@ -11124,7 +11127,11 @@ msgid "Multi points" msgstr "" #: ishtar_common/models_common.py:2172 -msgid "Multi line" +msgid "Multi lines" +msgstr "" + +#: ishtar_common/models_common.py:2173 +msgid "Multi polygons" msgstr "" #: ishtar_common/models_common.py:2177 ishtar_common/models_common.py:2178 @@ -11132,7 +11139,7 @@ msgid "Geographic - Vector data" msgstr "" #: ishtar_common/models_common.py:2247 -msgid "Only 2 or 3 dimension" +msgid "Only 2 or 3 dimensions" msgstr "" #: ishtar_common/models_common.py:2545 @@ -11261,7 +11268,7 @@ msgid "For GIS file with multiple layers" msgstr "" #: ishtar_common/models_imports.py:160 -msgid "Set to main geometry" +msgid "Set as main geometry" msgstr "" #: ishtar_common/models_imports.py:162 @@ -11716,7 +11723,7 @@ msgstr "" #: ishtar_common/models_imports.py:1464 ishtar_common/models_imports.py:1467 #: ishtar_common/models_imports.py:1526 -msgid "Incorrect GIS file." +msgid "Invalid GIS file." msgstr "" #: ishtar_common/models_imports.py:1477 @@ -11764,10 +11771,6 @@ msgstr "" msgid "API - Remote access - Users" msgstr "" -#: ishtar_common/models_rest.py:63 -msgid "Limit query" -msgstr "" - #: ishtar_common/models_rest.py:66 msgid "Search query add to each request" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e9ae02c66..2fe934003 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-16 18:56+0200\n" +"POT-Creation-Date: 2022-07-17 11:13+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks \n" "Language-Team: French \n" "Language-Team: LANGUAGE \n" @@ -25,8 +25,7 @@ msgid "Point" msgstr "" #: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:2173 -#: ishtar_common/models_common.py:3422 +#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3422 msgid "Multi polygon" msgstr "" @@ -7211,7 +7210,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4966 ishtar_common/admin.py:2315 +#: archaeological_operations/tests.py:4966 ishtar_common/admin.py:2318 msgid "{result['updated']} match key(s) updated." msgstr "" @@ -8290,7 +8289,7 @@ msgid "Content type" msgstr "" #: ishtar_common/admin.py:2151 ishtar_common/admin.py:2261 -#: ishtar_common/admin.py:2294 +#: ishtar_common/admin.py:2297 msgid "Select only one source." msgstr "" @@ -8333,31 +8332,35 @@ msgstr "" msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2303 +#: ishtar_common/admin.py:2282 +msgid "Generate match document" +msgstr "" + +#: ishtar_common/admin.py:2306 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2308 +#: ishtar_common/admin.py:2311 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2321 +#: ishtar_common/admin.py:2324 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2354 +#: ishtar_common/admin.py:2357 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2358 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2365 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2368 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2368 ishtar_common/models.py:446 +#: ishtar_common/admin.py:2371 ishtar_common/models.py:446 #: ishtar_common/models.py:729 ishtar_common/models_common.py:805 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8368,21 +8371,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2370 +#: ishtar_common/admin.py:2373 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2400 +#: ishtar_common/admin.py:2403 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2433 +#: ishtar_common/admin.py:2436 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2441 +#: ishtar_common/admin.py:2444 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -10877,7 +10880,7 @@ msgstr "" msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5061 +#: ishtar_common/models.py:5061 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "" @@ -11075,7 +11078,7 @@ msgid "Line(s)" msgstr "" #: ishtar_common/models_common.py:2095 -msgid "Points" +msgid "Point(s)" msgstr "" #: ishtar_common/models_common.py:2096 @@ -11087,7 +11090,7 @@ msgid "Use this for update imports" msgstr "" #: ishtar_common/models_common.py:2126 -msgid "For instance: topographical surveys, georeferencing, ..." +msgid "For instance: topographical survey, georeferencing, ..." msgstr "" #: ishtar_common/models_common.py:2134 @@ -11124,7 +11127,11 @@ msgid "Multi points" msgstr "" #: ishtar_common/models_common.py:2172 -msgid "Multi line" +msgid "Multi lines" +msgstr "" + +#: ishtar_common/models_common.py:2173 +msgid "Multi polygons" msgstr "" #: ishtar_common/models_common.py:2177 ishtar_common/models_common.py:2178 @@ -11132,7 +11139,7 @@ msgid "Geographic - Vector data" msgstr "" #: ishtar_common/models_common.py:2247 -msgid "Only 2 or 3 dimension" +msgid "Only 2 or 3 dimensions" msgstr "" #: ishtar_common/models_common.py:2545 @@ -11261,7 +11268,7 @@ msgid "For GIS file with multiple layers" msgstr "" #: ishtar_common/models_imports.py:160 -msgid "Set to main geometry" +msgid "Set as main geometry" msgstr "" #: ishtar_common/models_imports.py:162 @@ -11716,7 +11723,7 @@ msgstr "" #: ishtar_common/models_imports.py:1464 ishtar_common/models_imports.py:1467 #: ishtar_common/models_imports.py:1526 -msgid "Incorrect GIS file." +msgid "Invalid GIS file." msgstr "" #: ishtar_common/models_imports.py:1477 @@ -11764,10 +11771,6 @@ msgstr "" msgid "API - Remote access - Users" msgstr "" -#: ishtar_common/models_rest.py:63 -msgid "Limit query" -msgstr "" - #: ishtar_common/models_rest.py:66 msgid "Search query add to each request" msgstr "" -- cgit v1.2.3