diff --git a/LICENSE b/LICENSE index a6ddbed8..f39f8492 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,16 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +uMap lets you create maps with OpenStreetMap layers in a minute. +Copyright (C) 2024 Yohan Boniface & contributors +https://github.com/umap-project/umap/graphs/contributors - Copyright (C) 2013 Yohan Boniface +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. \ No newline at end of file +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . diff --git a/docker-compose.yml b/docker-compose.yml index 8c6d5f1a..e77ad38d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: depends_on: db: condition: service_healthy - image: umap/umap:1.3.2 + image: umap/umap:2.0.2 ports: - "${PORT-8000}:8000" environment: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 0151897c..8ed7fdfb 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -3,13 +3,11 @@ set -eo pipefail source /venv/bin/activate -# first wait for the database +# collect static files +umap collectstatic --noinput +# now wait for the database umap wait_for_database # then migrate the database umap migrate -# then collect static files -umap collectstatic --noinput -# compress static files -umap compress # run uWSGI exec uwsgi --ini docker/uwsgi.ini diff --git a/docs/changelog.md b/docs/changelog.md index 8ef9833c..377df7ea 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,68 +1,93 @@ # Changelog -## 2.0.0 - soon +## 2.0.1 - 2024-02-18 + +* Do not use the `compress` command anymore for the Docker image (#1620) + +## 2.0.0 - 2024-02-16 This release is inauguring a new era in versionning uMap: in the future, we'll take care of better documenting breaking changes, so expect more major releases from now on. More details on [how we version](https://docs.umap-project.org/en/master/release/#when-to-make-a-release). -The two main changes are: -- on the front-end side, we now use native ESM modules, so this may break on old browsers (see our [ESlint configuration](https://github.com/umap-project/umap/blob/a0634e5f55179fb52f7c00e39236b6339a7714b9/package.json#L68)) -- on the back-end, we upgraded to Django 5.x, which drops support for Python 3.8 and Python 3.9. +The main changes are: + +* on the front-end side, we now use native ESM modules, so this may break on old browsers (see our [ESlint configuration](https://github.com/umap-project/umap/blob/a0634e5f55179fb52f7c00e39236b6339a7714b9/package.json#L68)) +* on the back-end, we upgraded to Django 5.x, which drops support for Python 3.8 and Python 3.9. +* the OpenStreetMap OAuth1 client is not supported anymore (now deprecated by OpenStreetMap.org) +* license switched from WTFPL to AGPLv3: having an OSI valid licence was a request from our partners and sponsors (#1605) More details below! ### Breaking changes -- updrade to Django 5.x, which drops support for python < 3.10 -- remove `django-compressor`, so `umap compress` is not a valid command anymore (compress is now done in the `collectstatic` process itself) (#1544, #1539) -- remove support for settings starting with `LEAFLET_STORAGE_` (deprecated since 1.0.0) +* updrade to Django 5.x drops support for Python < 3.10 +* `django-compressor` has been removed, so `umap compress` is not a valid command anymore (compress is now done in the `collectstatic` process itself) (#1544, #1539) +* removed support for settings starting with `LEAFLET_STORAGE_` (deprecated since 1.0.0) +* removed support for deprecated OpenStreetMap OAuth1 backend in favour of OAuth2 (see below) +* `FROM_EMAIL` setting is replaced by `DEFAULT_FROM_EMAIL`, which is [Django standard](https://docs.djangoproject.com/en/5.0/ref/settings/#default-from-email) + +#### Migrate to OpenStreetMap OAuth2 + +* create a new app on OSM.org: https://www.openstreetmap.org/oauth2/applications/ +* add the key and secret in your settings (or as env vars): + * `SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY=xxxx` + * `SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET=xxxx` +* if you changed `AUTHENTICATION_BACKENDS`, you need to now use `"social_core.backends.openstreetmap_oauth2.OpenStreetMapOAuth2"` +* run the migration command, that will migrate all accounts from OAuth1 to Oauth2: + `umap migrate` ### New features -- Ability to clone, delete and download all maps from user’s dashboard (#1430) -- Add experimental "map preview" in `/map/` endpoint (#1573) -- Adapt browser counter to the currently displayed features (#1572) -- Set preconnect link for tilelayer (#1552) -- Create an oEmbed endpoint for maps `/map/oembed/` (#1526) -- Use SVG for default icon (circle) (#1562) -- introduce `UMAP_HOME_FEED` to control which maps are shown on the home page (#1531) +* Ability to clone, delete and download all maps from user’s dashboard (#1430) +* Add experimental "map preview" in `/map/` endpoint (#1573) +* Adapt features counter in the databrowser to the currently displayed features (#1572) +* Create an oEmbed endpoint for maps `/map/oembed/` (#1526) +* introduce `UMAP_HOME_FEED` to control which maps are shown on the home page (#1531) +* better algorithm (WCAG 21 based) to manage text and picto contrast (#1593) +* show last used pictograms in a separate tab (#1595) ### Bug fixes -- Uuse variable for color in browser if any (#1584) -- Non loaded layers should still be visible in legend and data browser (#1581) -- Do not try to reset tooltip of feature not on map (#1576) -- Empty file input when closing the importer panel (#1535) -- Honour datalayersControl=expanded in querystring (#1538) -- Fix icons for mailto and tel (#1547) -- Do not ask more classes than available values in choropleth mode (#1550) -- Build browser once features are on the map, not before (#1551) -- Replace `list.delete` call by the proper `remove` method -- Prevent datalayer to resetting to an old version on save (#1558) -- Messages coming from Django where never displayed in map view (#1588) -- Browser `inBbox` setting was not persistent (#1586) -- Popup was not opening on click on browser when `inBbox` was active (#1586) +* Use variable for color in browser if any (#1584) +* Non loaded layers should still be visible in legend and data browser (#1581) +* Do not try to reset tooltip of feature not on map (#1576) +* Empty file input when closing the importer panel (#1535) +* Honour datalayersControl=expanded in querystring (#1538) +* Fix icons for mailto and tel (#1547) +* Do not ask more classes than available values in choropleth mode (#1550) +* Build browser once features are on the map, not before (#1551) +* Replace `list.delete` call by the proper `remove` method +* Prevent datalayer to resetting to an old version on save (#1558) +* Messages coming from Django where never displayed in map view (#1588) +* Browser `inBbox` setting was not persistent (#1586) +* Popup was not opening on click on browser when `inBbox` was active (#1586) +* reset table editor properties after creating a new one (#1610) +* do not try to animate the panel (#1608) ### Internal changes -- Move XHR management to a module and use fetch (#1555) -- Use https://umap-project.org link in map footer (#1541) -- Add support for JS modules (+module for URLs handling) (#1463) -- Pin versions in pyproject.toml (#1514) -- Set a umap-fragment web component for lists (#1516) -- Load Leaflet as a module -- Replaced `L.U` global by `U` +* Move XHR management to a module and use fetch (#1555) +* Use https://umap-project.org link in map footer (#1541) +* Add support for JS modules (+module for URLs handling) (#1463) +* Pin versions in pyproject.toml (#1514) +* Set a umap-fragment web component for lists (#1516) +* Load Leaflet as a module +* Replaced `L.U` global by `U` +* Use SVG for default icon (circle) (#1562) +* Set preconnect link for tilelayer (#1552) ### Documentation -- Define an explicit release stragegy (#1567) +* Define an explicit release stragegy (#1567) ### Changed templates -- added `header.html` to add extra code in `` -- added `branding.html` with site logo -- `registration/login.html`, which is not loaded in ajax anymore (and include `branding.html`) -- `umap/content.html` the JS call to load more have changed -- `umap/navigation.html`: it now includes `branding.html` +* added `header.html` to add extra code in `` +* added `branding.html` with site logo +* `registration/login.html`, which is not loaded in ajax anymore (and include `branding.html`) +* `umap/content.html` the JS call to load more have changed +* `umap/navigation.html`: it now includes `branding.html` +* `umap/map_table.html`: total revamp +* `umap/user_dashboard.html`: improved table header (search + download all) + inline JS changed ## 1.13.2 - 2024-01-25 diff --git a/docs/config/settings.md b/docs/config/settings.md index 3e1114c1..589e51d5 100644 --- a/docs/config/settings.md +++ b/docs/config/settings.md @@ -39,7 +39,7 @@ documentation. In general, you'll need to add something like this in your local settings: ```python title="local_settings.py" -FROM_EMAIL = "youradmin@email.org" +DEFAULT_FROM_EMAIL = "youradmin@email.org" EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" EMAIL_HOST = "smtp.provider.org" EMAIL_PORT = 456 @@ -60,7 +60,7 @@ Can be set through env var: `ENABLE_ACCOUNT_LOGIN=1` User accounts can be managed via the Django admin page (`{SITE_URL}/admin`). The required superuser must be created on the command line with this command: `umap createsuperuser`. -#### FROM_EMAIL +#### DEFAULT_FROM_EMAIL See `EMAIL_BACKEND`. @@ -206,6 +206,7 @@ Link to show on the header under the "Feedback and help" label. #### UMAP_HOME_FEED Which feed to display on the home page. Three valid values: + - `"latest"`, which shows the latest maps (default) - `"highlighted"`, which shows the maps that have been starred by a staff member - `None`, which does not show any map on the home page @@ -262,8 +263,8 @@ Can be set to `X-Accel-Redirect` to enable the [NGINX X-Accel](https://www.nginx See the NGINX documentation in addition. -#### SOCIAL_AUTH_OPENSTREETMAP_KEY, SOCIAL_AUTH_OPENSTREETMAP_SECRET +#### SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY, SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET -If you use OpenStreetMap as OAuth provider, use those settings. +If you use OpenStreetMap as OAuth 2 provider, you can use those settings. Otherwise, use any valid [python-social-auth configuration](https://python-social-auth.readthedocs.io/en/latest/configuration/django.html). diff --git a/docs/deploy/docker.md b/docs/deploy/docker.md index 1ae44c33..51df4595 100644 --- a/docs/deploy/docker.md +++ b/docs/deploy/docker.md @@ -15,7 +15,7 @@ services: app: # Check https://hub.docker.com/r/umap/umap/tags to find the latest version - image: umap/umap:1.3.7 + image: umap/umap:2.0.2 ports: # modify the external port (8001, on the left) if desired, but make sure it matches SITE_URL, below - "8001:8000" @@ -35,4 +35,10 @@ services: volumes: umap_userdata: umap_db: -``` \ No newline at end of file +``` + +Note that you’ll have to set a [`SECRET_KEY`](https://docs.djangoproject.com/en/5.0/ref/settings/#secret-key) environment variable that must be secret and unique. One way to generate it is through the `secrets` module from Python: + +```sh +$ python3 -c 'import secrets; print(secrets.token_hex(100))' +``` diff --git a/docs/dev/frontend.md b/docs/dev/frontend.md index 7a5b99a9..1e3556fa 100644 --- a/docs/dev/frontend.md +++ b/docs/dev/frontend.md @@ -27,9 +27,9 @@ Here are the important concepts and files: - `umap.permissions.js` handles the permissions of the map. There is a different file handling the permissions of the datalayer: - `umap.datalayer.permissions.js`. -## Map (`L.U.Map`) +## Map (`U.Map`) -`L.U.Map` is the class that's called by the server templates (in `map_init.html` and `map_fragment.html` used when we display lists of maps, like the homepage). +`U.Map` is the class that's called by the server templates (in `map_init.html` and `map_fragment.html` used when we display lists of maps, like the homepage). It contains references to datalayers, and to the controls (the buttons that appears on the map) @@ -42,15 +42,15 @@ A map contains references to: - controls - datalayers -## DataLayers (`L.U.Datalayer`) +## DataLayers (`U.Datalayer`) The datalayers contains data, and a layer (a way to represent them). Each data layer contains a "layer", to know what type of layer it is. It's one of: -- Choropleth (`L.U.Layer.Choropleth`) -- Cluster (`L.U.Layer.Cluster`) -- Heat (`L.U.Layer.Heat`) +- Choropleth (`U.Layer.Choropleth`) +- Cluster (`U.Layer.Cluster`) +- Heat (`U.Layer.Heat`) When the data layers are initialized, they can have two states: - `loaded`: the object is loaded in memory. At this stage we have access to all the datalayer's metada (name, type, id) diff --git a/docs/requirements.txt b/docs/requirements.txt index 07f0f8dc..ecfda434 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ # Force rtfd to use a recent version of mkdocs mkdocs==1.5.3 pymdown-extensions==10.7 -mkdocs-material==9.5.7 +mkdocs-material==9.5.10 diff --git a/package.json b/package.json index 2b322055..715c152c 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "leaflet-formbuilder": "0.2.9", "leaflet-fullscreen": "1.0.2", "leaflet-hash": "0.2.1", - "leaflet-i18n": "0.3.3", + "leaflet-i18n": "0.3.4", "leaflet-iconlayers": "^0.2.0", "leaflet-loading": "0.1.24", "leaflet-measurable": "0.1.0", diff --git a/pyproject.toml b/pyproject.toml index 6c35b6ac..f552dc2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,20 +37,20 @@ dependencies = [ "requests==2.31.0", "rcssmin==1.1.2", "rjsmin==1.2.2", - "social-auth-core==4.5.2", + "social-auth-core==4.5.3", "social-auth-app-django==5.4.0", ] [project.optional-dependencies] dev = [ "hatch==1.9.3", - "ruff==0.2.0", + "ruff==0.2.2", "djlint==1.34.1", "mkdocs==1.5.3", - "mkdocs-material==9.5.7", + "mkdocs-material==9.5.10", "vermin==1.6.0", "pymdown-extensions==10.7", - "isort==5.12", + "isort==5.13.2", ] test = [ "factory-boy==3.2.1", @@ -61,9 +61,12 @@ test = [ "pytest-xdist>=3.5.0,<4", ] docker = [ - "uwsgi==2.0.23", + "uwsgi==2.0.24", ] +[project.scripts] +umap = "umap.bin:main" + [tool.hatch.build] artifacts = [ # Required because part of .gitignore (and thus excluded by hatch). @@ -78,8 +81,8 @@ include = [ [tool.hatch.build.targets.wheel] packages = ["umap"] -[project.scripts] -umap = "umap.bin:main" +[tool.hatch.metadata] +allow-direct-references = true [tool.hatch.version] path = "umap/__init__.py" diff --git a/umap/__init__.py b/umap/__init__.py index 1f3aabc7..311aff26 100644 --- a/umap/__init__.py +++ b/umap/__init__.py @@ -1 +1 @@ -VERSION = "2.0.0a2" +VERSION = "2.0.2" diff --git a/umap/locale/am_ET/LC_MESSAGES/django.mo b/umap/locale/am_ET/LC_MESSAGES/django.mo index df396cd8..4ece61ad 100644 Binary files a/umap/locale/am_ET/LC_MESSAGES/django.mo and b/umap/locale/am_ET/LC_MESSAGES/django.mo differ diff --git a/umap/locale/am_ET/LC_MESSAGES/django.po b/umap/locale/am_ET/LC_MESSAGES/django.po index 9e920ca8..705e254c 100644 --- a/umap/locale/am_ET/LC_MESSAGES/django.po +++ b/umap/locale/am_ET/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Alazar Tekle , 2015\n" "Language-Team: Amharic (Ethiopia) (http://app.transifex.com/openstreetmap/umap/language/am_ET/)\n" @@ -26,115 +26,115 @@ msgstr "በሚስጥር የመረሚያ መስመሩ ብቻ የሚታረም" msgid "Everyone can edit" msgstr "ሁሉም ማረም ይችላል" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "ስም" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "ዝርዝሮች" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "ፈቃዱ በዝርዝር ከተቀመጠ ገፅ ጛር አገናኝ" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "የድረ-ገፅ አድራሻ ተምሳሌ በኦ.ኤስ.ኤም. የታይል ፎርማት" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "በማረሚያ ሳጥኑ ውስጥ የታይል ሌየሮቹ ቅደም ተከተል" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "መገለጫ" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "መሀከል" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "ዙም" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "ጠቁም" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "በመጫን ላይ ያለውን ተጠቃሚ ጠቁም?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "የካርታውን ፈቃድ ከልስ" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "ፈቃድ" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "ባለቤት" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "አራሚዎች" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "ያለበትን ሁኔታ አርም" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "ያለበትን ሁኔታ አጋራ" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "ሁኔታዎች" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "ድቃይ" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "በመጫን ላይ አሳይ" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "ሌየሩ በመጫን ላይ አሳይ" @@ -152,28 +152,27 @@ msgstr "የ %(current_user)s'ን ካርታ አስስ" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "እባክዎ አቅራቢ ይምረጡ" @@ -255,8 +254,8 @@ msgstr "ካርታዎን ያካትቱ እና ይጋሩ" msgid "And it's open source!" msgstr "እንዲሁም ነፃ እና ክፍት ነው !" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "ካርታ ፍጠር" @@ -264,13 +263,13 @@ msgstr "ካርታ ፍጠር" msgid "Play with the demo" msgstr "በማሳያው ተለማመድ" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "ይህ ለሙከራ እና ፕሪ-ሮሊግ ሪሊዞች የሚያገለ msgid "Map of the uMaps" msgstr "የዩማፖች ካርታ" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "ካርታዎችን ተመልከት፣ ስሜትህን አነቃቃ!" @@ -291,75 +290,126 @@ msgstr "ካርታዎችን ተመልከት፣ ስሜትህን አነቃቃ!" msgid "You are logged in. Continuing..." msgstr "ገብተዋል። በመቀጠል ላይ ..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "በ" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "ተጨማሪ" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "ግባ" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "ግባ" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "ስለ" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "ውጣ" @@ -420,64 +470,78 @@ msgstr "ካርታዎች መሀከል ፈልግ" msgid "Search" msgstr "ፈልግ" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "ካርታውን አሳይ" -#: views.py:658 -msgid "Map has been updated!" -msgstr "ካርታው ታድሷል!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "የካርታ አራሚዎች በትክክል ታድሰዋል!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "ካርታውን የሚሰርዘው ባለቤቱ ብቻ ነው።" -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "ካርታዎ ተዳቅሏል! ይህንን ካርታ ከሌላ ኮምፒውተር ላይ ሆነው ለማረም ከፈለጉ የሚከተለውን አድራሻ ይጠቀሙ %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "እንኳን ደስ አለዎ ካርታዎ ተዳቅሏል!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "ሌየሩ በትክክል ተሰርዟ" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/bg/LC_MESSAGES/django.mo b/umap/locale/bg/LC_MESSAGES/django.mo index 847914ec..9fe16468 100644 Binary files a/umap/locale/bg/LC_MESSAGES/django.mo and b/umap/locale/bg/LC_MESSAGES/django.mo differ diff --git a/umap/locale/bg/LC_MESSAGES/django.po b/umap/locale/bg/LC_MESSAGES/django.po index 98b79ef8..28be430d 100644 --- a/umap/locale/bg/LC_MESSAGES/django.po +++ b/umap/locale/bg/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Пламен, 2021\n" "Language-Team: Bulgarian (http://app.transifex.com/openstreetmap/umap/language/bg/)\n" @@ -29,115 +29,115 @@ msgstr "Само може да се редактира с тайно редак msgid "Everyone can edit" msgstr "Всеки може да редактира" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "име" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "детайли" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Линк към страницата с подробно описание за лиценза." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL шаблон, използван формат OSM плочи" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Поръчка на tilelayers в полето за редактиране" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "описание" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "център" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "мащаб" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "локализирай" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Локализирай потребител при зареждане?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Избери лиценз за картата." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "лиценз" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "притежател" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "редактори" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "статус на редактиране" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "сподели статус" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "настройки" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Клониране на" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "покажи при зареждане" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Покажи този слой при зареждане" @@ -155,28 +155,27 @@ msgstr "Разгледай картите на %(current_user)s" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -198,23 +197,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Потр. име" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Парола" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Вход" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Моля изберете провайдер" @@ -258,8 +257,8 @@ msgstr "Вгради и сподели картата" msgid "And it's open source!" msgstr "И това е отворен код!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Създай карта" @@ -267,13 +266,13 @@ msgstr "Създай карта" msgid "Play with the demo" msgstr "Играй си с демото" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -286,7 +285,7 @@ msgstr "Това е само демо пример, използван за те msgid "Map of the uMaps" msgstr "Карта от картите на uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Вдъхнови се, разгледай други карти " @@ -294,75 +293,126 @@ msgstr "Вдъхнови се, разгледай други карти " msgid "You are logged in. Continuing..." msgstr "В процес на включване. Продължение..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "от" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Още" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Влизане" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Регистрация" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Относно" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Излизане" @@ -423,64 +473,78 @@ msgstr "Търсене на карти" msgid "Search" msgstr "Търсене" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Виж картата" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Карта е актуализирана!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Редакторите на картата актуализират с успех!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Само собственикът може да изтрие картата." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Вашата карта е клонирана! Ако искате да редактирате тази карта от друг компютър, моля използвайте този линк: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Поздравления, вашата карта е клонирана!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Слоят е изтрит успешно." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/br/LC_MESSAGES/django.mo b/umap/locale/br/LC_MESSAGES/django.mo index ea78a7a9..2a2c78ce 100644 Binary files a/umap/locale/br/LC_MESSAGES/django.mo and b/umap/locale/br/LC_MESSAGES/django.mo differ diff --git a/umap/locale/br/LC_MESSAGES/django.po b/umap/locale/br/LC_MESSAGES/django.po index 8c74c1a5..1f8a423f 100644 --- a/umap/locale/br/LC_MESSAGES/django.po +++ b/umap/locale/br/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Dren ar Frankig , 2023-2024\n" "Language-Team: Breton (http://app.transifex.com/openstreetmap/umap/language/br/)\n" @@ -256,8 +256,8 @@ msgstr "Enframmañ ha rannañ ho kartenn" msgid "And it's open source!" msgstr "Hag open source eo!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Krouiñ ur gartenn" @@ -300,96 +300,87 @@ msgstr "gant" msgid "More" msgstr "Muioc'h" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Anv" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "Rakwel" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Enrollet da ziwezhañ" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Perc'henner" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Oberoù" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "Digeriñ ar rakwel" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Rannañ" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Aozañ" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Pellgargañ" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "kentañ" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "kent" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "war-lerc'h" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "diwezhañ" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -480,11 +471,11 @@ msgstr "Kartennoù krouet da ziwezhañ" msgid "Search maps" msgstr "Klask kartennoù" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Klask" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Klask e-touez ma c'hartennoù" @@ -497,19 +488,16 @@ msgstr "" msgid "My profile" msgstr "Ma frofil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "N'ho peus kartenn ebet c'hoazh." @@ -521,48 +509,44 @@ msgstr "Diskouez ar gartenn" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Hizivaet eo bet ar gartenn!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Aozerien ar gartenn bet hizivaet gant berzh!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Al liamm uMap evit aozañ ho kartenn: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Setu ho liamm aozañ kuzh: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Postel kaset da %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "N'eus nemet perc'henner ar gartenn a c'hall he dilemel." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Eilet eo bet ho kartenn! M'ho peus c'hoant d'he c'hemmañ diwar un urzhiataer all, implijit al liamm-mañ: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Eilet eo bet ho kartenn gant berzh!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Gwiskad dilamet gant berzh." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Aotreoù hizivaet gant berzh!" diff --git a/umap/locale/ca/LC_MESSAGES/django.mo b/umap/locale/ca/LC_MESSAGES/django.mo index 4ae9193a..729e5fb9 100644 Binary files a/umap/locale/ca/LC_MESSAGES/django.mo and b/umap/locale/ca/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ca/LC_MESSAGES/django.po b/umap/locale/ca/LC_MESSAGES/django.po index 83f9d8c0..64718bdd 100644 --- a/umap/locale/ca/LC_MESSAGES/django.po +++ b/umap/locale/ca/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Joan Montané, 2023\n" "Language-Team: Catalan (http://app.transifex.com/openstreetmap/umap/language/ca/)\n" @@ -29,115 +29,115 @@ msgstr "Només es pot editar amb l'enllaç d'edició secret" msgid "Everyone can edit" msgstr "Tothom pot editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "El lloc és en mode lectura per manteniment" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nom" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalls" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Enllaç a una pàgina on es detalla la llicència." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "La plantilla de l'URL usa el format de tesel·les de l'OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Ordre de les capes de tessel·les al quadre d'edició" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "descripció" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centre" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "escala" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "ubica" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Voleu ubicar l'usuari en carregar?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Trieu la llicència del mapa." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "llicència" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "propietari" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editors" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "edita l'estat" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "comparteix l'estat" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "paràmetres" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Clon de" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "mostra en carregar" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Mostra aquesta capa en carregar." @@ -155,28 +155,27 @@ msgstr "Explora els mapes de %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s no té cap mapa." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -198,23 +197,23 @@ msgid "" "them in your site." msgstr "uMap us permet crear mapes amb capes d'OpenStreetMap en un minut i incrustar-los en el vostre lloc web." -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Inicieu sessió amb el vostre compte" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Nom d'usuari" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Contrasenya" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Inicia sessió" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Trieu un proveïdor" @@ -258,8 +257,8 @@ msgstr "Incrusteu i compartiu el vostre mapa" msgid "And it's open source!" msgstr "I és codi obert!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Crea un mapa" @@ -267,13 +266,13 @@ msgstr "Crea un mapa" msgid "Play with the demo" msgstr "Jugueu amb la demostració" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "Aquesta instància d'uMap actualment és en mode de només lectura, no es permet la creació o edició de mapes." -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -286,7 +285,7 @@ msgstr "Aquesta és una versió de demostració, usada per a fer proves i desple msgid "Map of the uMaps" msgstr "Mapa dels uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspireu-vos, exploreu mapes" @@ -294,75 +293,126 @@ msgstr "Inspireu-vos, exploreu mapes" msgid "You are logged in. Continuing..." msgstr "Heu iniciat sessió. S'està continuant..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "per" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Més" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "Mapes destacats" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Entra" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Crea un compte" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Quant a" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "Ajuda" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Canvia la contrasenya" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Surt" @@ -423,64 +473,78 @@ msgstr "Cerca mapes" msgid "Search" msgstr "Cerca" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Mostra el mapa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "S'ha actualitzat el mapa!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "S'han actualitzat els editors del mapa correctament!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "L'enllaç d'edició d'uMap per al vostre mapa: %(map_name)s" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Aquí teniu l'enllaç secret d'edició: %(link)s" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "S'ha enviat un correu a %(email)s" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Només el propietari pot suprimir el mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "S'ha clonat el vostre mapa! Si voleu editar aquest mapa en un altre ordinador, useu aquest enllaç: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Enhorabona, s'ha clonat el vostre mapa!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "S'ha suprimit la capa correctament." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.mo b/umap/locale/cs_CZ/LC_MESSAGES/django.mo index 990111a5..6c2c5ccb 100644 Binary files a/umap/locale/cs_CZ/LC_MESSAGES/django.mo and b/umap/locale/cs_CZ/LC_MESSAGES/django.mo differ diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.po b/umap/locale/cs_CZ/LC_MESSAGES/django.po index e947825d..a5ec83a4 100644 --- a/umap/locale/cs_CZ/LC_MESSAGES/django.po +++ b/umap/locale/cs_CZ/LC_MESSAGES/django.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Jiří Podhorecký, 2023\n" "Language-Team: Czech (Czech Republic) (http://app.transifex.com/openstreetmap/umap/language/cs_CZ/)\n" @@ -262,8 +262,8 @@ msgstr "Sdílejte a vložte svou mapu do jiných webů" msgid "And it's open source!" msgstr "A je to celé open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Vytvořit mapu" @@ -306,96 +306,87 @@ msgstr ", autor:" msgid "More" msgstr "Více" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Název" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Poslední uložení" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Vlastník" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Akce" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Sdílet" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Upravit" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Stažení" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -485,11 +476,11 @@ msgstr "Nedávno vytvořené mapy" msgid "Search maps" msgstr "Prohledávejte mapy" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Hledej" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Prohledávat moje mapy" @@ -502,19 +493,16 @@ msgstr "" msgid "My profile" msgstr "Můj profil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Zatím nemáte žádnou mapu." @@ -526,48 +514,44 @@ msgstr "Prohlídnout si tuto mapu" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Mapa byla aktualizována!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Seznam přispěvovatelů byl úspěšně upraven!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Odkaz na úpravu uMap pro vaši mapu: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Zde je váš tajný odkaz na úpravu: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "E-mail odeslán na %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Jen vlastník může vymzat tuto mapu." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Byla vytvořena kopie mapy! Pokud chcete upravovat tuto mapu z jiného počítače, použijte tento odkaz: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Gratulujeme, byla vytvořena kopie mapy!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Vrstva úspěšně vymazána." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Oprávnění úspěšně aktualizována!" diff --git a/umap/locale/da/LC_MESSAGES/django.mo b/umap/locale/da/LC_MESSAGES/django.mo index 71263c6f..c15e9c7b 100644 Binary files a/umap/locale/da/LC_MESSAGES/django.mo and b/umap/locale/da/LC_MESSAGES/django.mo differ diff --git a/umap/locale/da/LC_MESSAGES/django.po b/umap/locale/da/LC_MESSAGES/django.po index 50bea59b..b50a373c 100644 --- a/umap/locale/da/LC_MESSAGES/django.po +++ b/umap/locale/da/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Mikkel Kirkgaard Nielsen , 2018\n" "Language-Team: Danish (http://app.transifex.com/openstreetmap/umap/language/da/)\n" @@ -29,115 +29,115 @@ msgstr "Er kun redigerbart med et hemmeligt link" msgid "Everyone can edit" msgstr "Alle kan redigere" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Webstedet er skrivebeskyttet pga. vedligeholdelse" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "navn" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detaljer" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link til en side hvor der er flere oplysninger om licensen." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL-skabelon i OSM flise-format" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Rækkefølge af flise-lag i redigeringsboksen" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "beskrivelse" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "center" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "lokaliser" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Lokaliser brugeren ved indlæsning?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Vælg kortlicensen." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licens" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "ejer" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "redaktører" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "redigeringsstatus" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "delingsstatus" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "indstillinger" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kloning af" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "vis ved indlæsning" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Vis dette lag ved indlæsning." @@ -155,28 +155,27 @@ msgstr "Gennemse %(current_user)ss kort" msgid "%(current_user)s has no maps." msgstr "%(current_user)s har ingen kort." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -198,23 +197,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Log på din konto" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Brugernavn" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Adgangskode" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Log ind" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Vælg en udbyder" @@ -258,8 +257,8 @@ msgstr "Indlejr og del dit kort" msgid "And it's open source!" msgstr "Og det er open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Lav et kort" @@ -267,13 +266,13 @@ msgstr "Lav et kort" msgid "Play with the demo" msgstr "Leg med demoen" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -286,7 +285,7 @@ msgstr "Dette er en demo-instans som bruges til test og at forhåndsudrulle frig msgid "Map of the uMaps" msgstr "Kort over uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Bliv inspireret, gennemse kort" @@ -294,75 +293,126 @@ msgstr "Bliv inspireret, gennemse kort" msgid "You are logged in. Continuing..." msgstr "Du er logget ind. Fortsætter..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "af" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Mere" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Log ind" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Opret konto" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Om" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Skift adgangskode" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Log ud" @@ -423,64 +473,78 @@ msgstr "Søg i kortene" msgid "Search" msgstr "Søg" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Vis kortet" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Kortet blev opdateret!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Kortredaktører blev opdateret!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Kun ejeren kan slette kortet." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Dit kort er klonet! Hvis du ønsker at redigere kortet fra en anden computer, så brug følgende link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Tillykke, dit kort er klonet!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Lag blev slettet." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/de/LC_MESSAGES/django.mo b/umap/locale/de/LC_MESSAGES/django.mo index 0a33d264..bfbb96c6 100644 Binary files a/umap/locale/de/LC_MESSAGES/django.mo and b/umap/locale/de/LC_MESSAGES/django.mo differ diff --git a/umap/locale/de/LC_MESSAGES/django.po b/umap/locale/de/LC_MESSAGES/django.po index 03f94e3c..96afb989 100644 --- a/umap/locale/de/LC_MESSAGES/django.po +++ b/umap/locale/de/LC_MESSAGES/django.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: YOHAN BONIFACE , 2012\n" "Language-Team: German (http://app.transifex.com/openstreetmap/umap/language/de/)\n" @@ -34,115 +34,115 @@ msgstr "Nur mit geheimem Bearbeitungslink zu bearbeiten" msgid "Everyone can edit" msgstr "Jeder kann bearbeiten" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Die Seite ist wegen Wartungsarbeiten im Nur-Lesen-Modus." -#: models.py:48 +#: models.py:50 msgid "name" msgstr "Name" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "Details" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Verlinke auf eine Seite mit der Lizenz." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Das URL-Template nutzt das OSM Tile Format" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Reihenfolge der Karten-Ebenen in der Bearbeiten-Box" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "Beschreibung" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "Mittelpunkt" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "Zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "lokalisiere" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Standort des Benutzers beim Seitenaufruf bestimmen?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Kartenlizenz auswählen" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "Lizenz" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "Ersteller" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "Bearbeiter" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "Bearbeitungsstatus" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "Teilen-Status" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "Einstellungen" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Duplikat von" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "Beim Seitenaufruf einblenden" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Diese Ebene beim Seitenaufruf einblenden." @@ -160,28 +160,27 @@ msgstr "Schaue dir %(current_user)s's Karten an" msgid "%(current_user)s has no maps." msgstr "%(current_user)s hat keine Karten." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -203,23 +202,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Bitte melden Sie sich mit Ihrem Konto an" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Benutzername" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Passwort" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Anmeldung" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Bitte wähle einen Anbieter" @@ -263,8 +262,8 @@ msgstr "Teile und binde deine Karte ein" msgid "And it's open source!" msgstr "Und es ist Open Source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Erstelle eine Karte" @@ -272,13 +271,13 @@ msgstr "Erstelle eine Karte" msgid "Play with the demo" msgstr "Spiele mit der Demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -291,7 +290,7 @@ msgstr "Dies ist eine Demo-Instanz, die für Tests und Vorveröffentlichungen ve msgid "Map of the uMaps" msgstr "Karte aller „uMap“-Karten" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Lass dich inspirieren, schau dir diese Karten an." @@ -299,75 +298,126 @@ msgstr "Lass dich inspirieren, schau dir diese Karten an." msgid "You are logged in. Continuing..." msgstr "Du bist eingeloggt. Weiterleitung..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "von" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Mehr" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Einloggen" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Anmelden" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Über" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "Hilfe" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Passwort ändern" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Ausloggen" @@ -428,64 +478,78 @@ msgstr "Karten suchen" msgid "Search" msgstr "Suchen" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Diese Karte anzeigen" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Karte wurde aktualisiert!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Bearbeiter erfolgreich geändert" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Nur der Ersteller kann die Karte löschen." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Deine Karte wurde kopiert! Wenn du diese Karte von einem anderen Computer aus bearbeiten möchtest, benutze bitte diesen Link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Glückwunsch, deine Karte wurde kopiert!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Ebene erfolgreich gelöscht." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/el/LC_MESSAGES/django.mo b/umap/locale/el/LC_MESSAGES/django.mo index 4f28c764..e1de85a7 100644 Binary files a/umap/locale/el/LC_MESSAGES/django.mo and b/umap/locale/el/LC_MESSAGES/django.mo differ diff --git a/umap/locale/el/LC_MESSAGES/django.po b/umap/locale/el/LC_MESSAGES/django.po index af15fbfd..4cac7736 100644 --- a/umap/locale/el/LC_MESSAGES/django.po +++ b/umap/locale/el/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Yannis Kaskamanidis , 2021,2023\n" "Language-Team: Greek (http://app.transifex.com/openstreetmap/umap/language/el/)\n" @@ -259,8 +259,8 @@ msgstr "Ενσωματώστε και διαμοιραστείτε τον χάρ msgid "And it's open source!" msgstr "Και είναι ανοικτού κώδικα!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Δημιουργία χάρτη" @@ -303,96 +303,87 @@ msgstr "από" msgid "More" msgstr "Περισσότερα" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Όνομα" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Τελευταία αποθήκευση" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Κάτοχος" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Ενέργειες" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Διαμοιρασμός" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Επεξεργασία" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Λήψη" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -480,11 +471,11 @@ msgstr "Χάρτες που δημιουργήθηκαν τελευταίοι" msgid "Search maps" msgstr "Αναζήτηση χαρτών" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Αναζήτηση" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Αναζήτηση στους χάρτες μου" @@ -497,19 +488,16 @@ msgstr "" msgid "My profile" msgstr "Το προφίλ μου" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Δεν έχετε ακόμη χάρτη." @@ -521,48 +509,44 @@ msgstr "Προβολή του χάρτη" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Ο χάρτης ενημερώθηκε!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Η ενημέρωση των συντακτών χάρτη ήταν επιτυχής!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Ο uMap σύνδεσμος επεξεργασίας του χάρτη σας: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Εδώ είναι ο μυστικός σύνδεσμος επεξεργασίας: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Μήνυμα email στάλθηκε στο %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Μονό ο ιδιοκτήτης μπορεί να διαγράψει αυτό τον χάρτη." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Ο χάρτης κλωνοποιήθηκε! Αν θέλετε να τον επεξεργαστείτε από κάποιον άλλο υπολογιστή, παρακαλώ χρησιμοποιήστε αυτόν τον σύνδεσμο: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Συγχαρητήρια ο χάρτης σας κλωνοποιήθηκε!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Το επίπεδο διαγράφηκε με επιτυχία." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Τα δικαιώματα ενημερώθηκαν με επιτυχία!" diff --git a/umap/locale/en/LC_MESSAGES/django.po b/umap/locale/en/LC_MESSAGES/django.po index e8b7dabb..043f6c90 100644 --- a/umap/locale/en/LC_MESSAGES/django.po +++ b/umap/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 17:17+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -253,7 +253,7 @@ msgstr "" msgid "And it's open source!" msgstr "" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 #: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "" @@ -503,48 +503,44 @@ msgstr "" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "" -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "" -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/es/LC_MESSAGES/django.mo b/umap/locale/es/LC_MESSAGES/django.mo index 8d8871b0..73f8862f 100644 Binary files a/umap/locale/es/LC_MESSAGES/django.mo and b/umap/locale/es/LC_MESSAGES/django.mo differ diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po index 652c9982..a92aafda 100644 --- a/umap/locale/es/LC_MESSAGES/django.po +++ b/umap/locale/es/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Eric Armijo, 2023\n" "Language-Team: Spanish (http://app.transifex.com/openstreetmap/umap/language/es/)\n" @@ -260,8 +260,8 @@ msgstr "Embebe y comparte tu mapa" msgid "And it's open source!" msgstr "Y es de código abierto!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Crea un mapa" @@ -304,96 +304,87 @@ msgstr "por" msgid "More" msgstr "Más" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Nombre" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Último guardado" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Dueño" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Acciones" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Compartir" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Editar" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Descargar" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -482,11 +473,11 @@ msgstr "Últimos mapas creados" msgid "Search maps" msgstr "Buscar mapas" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Buscar" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Buscar en mis mapas" @@ -499,19 +490,16 @@ msgstr "" msgid "My profile" msgstr "Mi perfil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Aún no tiene mapa." @@ -523,48 +511,44 @@ msgstr "Ver el mapa" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "¡El mapa ha sido actualizado!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "¡Los editores del mapas han sido actualizados con éxito!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "El enlace de edición de uMap para tu mapa: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Aquí está tu enlace secreto de edición: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Correo electrónico enviado a %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Sólo el propietario puede borrar el mapa." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "¡Tu mapa ha sido clonado! Si quieres editar este mapa desde otro ordenador, usa este enlace: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "¡Enhorabuena! ¡Tu mapa ha sido clonado!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Se eliminó la capa con éxito." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "¡Permisos actualizados con éxito!" diff --git a/umap/locale/et/LC_MESSAGES/django.mo b/umap/locale/et/LC_MESSAGES/django.mo index 91a69658..62f99f85 100644 Binary files a/umap/locale/et/LC_MESSAGES/django.mo and b/umap/locale/et/LC_MESSAGES/django.mo differ diff --git a/umap/locale/et/LC_MESSAGES/django.po b/umap/locale/et/LC_MESSAGES/django.po index 2a1d2bc6..f3bad9c1 100644 --- a/umap/locale/et/LC_MESSAGES/django.po +++ b/umap/locale/et/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Moon Ika, 2020\n" "Language-Team: Estonian (http://app.transifex.com/openstreetmap/umap/language/et/)\n" @@ -27,115 +27,115 @@ msgstr "Muudetav ainult salajase muutmislingiga" msgid "Everyone can edit" msgstr "Igaüks saab muuta" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Sait on hoolduseks kirjutuskaitstud" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nimi" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detailid" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link litsentsi selgitavale lehele." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "kirjeldus" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "tsentreeri" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "suurenda" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "määra asukoht" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Määra kasutaja asukoht laadimisel?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Vali kaardi litsents." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "litsents" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "omanik" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "toimetajad" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "muutmise staatus" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "jagamise staatus" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "seaded" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Koopia" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "kuva laadimisel" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Kuva seda kihti laadimisel" @@ -153,28 +153,27 @@ msgstr "Sirvi kasutaja %(current_user)s kaarte" msgid "%(current_user)s has no maps." msgstr "Kasutajal %(current_user)s pole kaarte." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Logi palun oma kontoga sisse" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Kasutajanimi" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Salasõna" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Logi sisse" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Vali palun teenusepakkuja" @@ -256,8 +255,8 @@ msgstr "Manusta ja jaga oma kaarti" msgid "And it's open source!" msgstr "Ja see kõik on avatud lähtekoodiga!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Loo kaart" @@ -265,13 +264,13 @@ msgstr "Loo kaart" msgid "Play with the demo" msgstr "Mängi demoga" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "" msgid "Map of the uMaps" msgstr "uMaps'i kaart" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Sirvi kaarte ja ammuta inspiratsiooni" @@ -292,75 +291,126 @@ msgstr "Sirvi kaarte ja ammuta inspiratsiooni" msgid "You are logged in. Continuing..." msgstr "Oled sisse logitud. Jätkamine..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "kasutajalt" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Rohkem" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Logi sisse" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Loo konto" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Teave" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Muuda salasõna" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Logi välja" @@ -421,64 +471,78 @@ msgstr "Otsi kaarte" msgid "Search" msgstr "Otsi" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Vaata kaarti" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Kaart on uuendatud!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Kaardi toimetajaid uuendati edukalt!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Kaarti saab kustutada vaid selle omanik." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Sinu kaart on kopeeritud! Kui sa soovid oma kaarti muuta teisest arvutist, kasuta palun seda linki: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Sinu kaart on kopeeritud!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Kiht on kustutatud." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/eu/LC_MESSAGES/django.mo b/umap/locale/eu/LC_MESSAGES/django.mo index 5f11b288..8d648c22 100644 Binary files a/umap/locale/eu/LC_MESSAGES/django.mo and b/umap/locale/eu/LC_MESSAGES/django.mo differ diff --git a/umap/locale/eu/LC_MESSAGES/django.po b/umap/locale/eu/LC_MESSAGES/django.po index dd1a42fe..e0a681b2 100644 --- a/umap/locale/eu/LC_MESSAGES/django.po +++ b/umap/locale/eu/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Mikel Larreategi , 2023\n" "Language-Team: Basque (http://app.transifex.com/openstreetmap/umap/language/eu/)\n" @@ -26,115 +26,115 @@ msgstr "Editatzeko esteka sekretuarekin bakarrik editatu daiteke" msgid "Everyone can edit" msgstr "Edonork editatu dezake" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Webgunea irakurtzeko moduan dago mantentze-lanak direla-eta" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "izena" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "xehetasunak" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Esteka egin lizentzia zehazten den orrialde batera." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URLaren txantiloia OSMren laukitxoen formatua erabiliz" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Edizio kutxan laukitxo-geruzek izango duten ordena" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "deskribapena" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "erdiko puntua" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zooma" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "kokatu" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Kokatu erabiltzailea mapa kargatzen denean?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Aukeratu maparen lizentzia." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "lizentzia" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "jabea" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editoreak" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "editatu egoera" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "partekatu egoera" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "ezarpenak" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Beste honen klona" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "erakutsi kargatzean" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Erakutsi geruza hau kargatzean" @@ -152,28 +152,27 @@ msgstr "Arakatu %(current_user)s erabiltzailearen mapak" msgid "%(current_user)s has no maps." msgstr "%(current_user)s erabiltzaileak ez du maparik." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Sartu zure kontua erabiliz" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Erabiltzailea" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Pasahitza" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Sartu" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Aukeratu hornitzaile bat" @@ -255,8 +254,8 @@ msgstr "Txertatu eta partekatu zure mapa" msgid "And it's open source!" msgstr "Eta software librea da!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Sortu mapa bat" @@ -264,13 +263,13 @@ msgstr "Sortu mapa bat" msgid "Play with the demo" msgstr "Jolastu probatako ingurunean" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "Hau probatako ingurunea da, testak egin eta argitaratu aurreko bertsioak msgid "Map of the uMaps" msgstr "uMapen mapa" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspira zaitez dauden mapak arakatzen" @@ -291,75 +290,126 @@ msgstr "Inspira zaitez dauden mapak arakatzen" msgid "You are logged in. Continuing..." msgstr "Sartu egin zara. Jarraitu..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "nork eginda" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Gehiago" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Sartu" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Izena eman" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Honi buruz" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "Laguntza" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Aldatu pasahitza" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Irten" @@ -420,64 +470,78 @@ msgstr "Bilatu mapak" msgid "Search" msgstr "Bilatu" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Mapa ikusi" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Mapa eguneratu egin da!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Maparen editoreak ondo eguneratu dira!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Jabeak bakarrik ezabatu dezake mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Zure mapa klonatu egin da! Mapa hau beste nabigatzaile batetik editatzeko erabili esteka hau: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Zorionak, zure mapa ondo klonatu da!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Geruza ondo ezabatu da." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/fa_IR/LC_MESSAGES/django.mo b/umap/locale/fa_IR/LC_MESSAGES/django.mo index 49dca6ec..1169906f 100644 Binary files a/umap/locale/fa_IR/LC_MESSAGES/django.mo and b/umap/locale/fa_IR/LC_MESSAGES/django.mo differ diff --git a/umap/locale/fa_IR/LC_MESSAGES/django.po b/umap/locale/fa_IR/LC_MESSAGES/django.po index e76e5a4e..ac294727 100644 --- a/umap/locale/fa_IR/LC_MESSAGES/django.po +++ b/umap/locale/fa_IR/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: *Sociologist Abedi*, 2021,2023\n" "Language-Team: Persian (Iran) (http://app.transifex.com/openstreetmap/umap/language/fa_IR/)\n" @@ -29,115 +29,115 @@ msgstr "فقط با لینک ویرایش مخفی قابل ویرایش است" msgid "Everyone can edit" msgstr "همه می‌توانند ویرایش کنند" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "سایت در حال حاضر برای نگهداری فقط خواندنی است" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "نام" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "جزئیات" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "پیوندی به صفحه ای که مجوز در آن دقیق است." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "قالب آدرس اینترنتی با استفاده از قالب کاشی OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "ترتیب لایه های کاشی در جعبه ویرایش" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "توضیحات" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "مرکز" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "بزرگ‌نمایی" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "مکان یابی" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "کاربر را در حال بارگیری مکان یابی کنید؟" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "مجوز نقشه را انتخاب کنید." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "مجوز" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "مالک" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "ویراستاران" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "ویرایش وضعیت" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "وضعیت اشتراک گذاری" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "تنظیمات" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "کلون از" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "نمایش روی بارگذاری" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "این لایه را روی بارگذاری نمایش دهید." @@ -155,28 +155,27 @@ msgstr "نقشه‌های %(current_user)s را مرور کنید" msgid "%(current_user)s has no maps." msgstr "%(current_user)s هیچ نقشه‌ای ندارد" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -198,23 +197,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "لطفا با حساب کاربری خود وارد شوید" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "نام کاربری" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "رمز عبور" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "ورود" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "لطفا ارائه دهنده را انتخاب کنید" @@ -258,8 +257,8 @@ msgstr "نقشه خود را جاسازی کرده و به اشتراک بگذا msgid "And it's open source!" msgstr "و متن باز است!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "ایجاد نقشه" @@ -267,13 +266,13 @@ msgstr "ایجاد نقشه" msgid "Play with the demo" msgstr "با نسخه ی نمایشی کار کنید" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -286,7 +285,7 @@ msgstr "این یک نمونه آزمایشی است که برای آزمایش msgid "Map of the uMaps" msgstr "نقشه uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "الهام بگیرید، نقشه‌ها را مرور کنید" @@ -294,75 +293,126 @@ msgstr "الهام بگیرید، نقشه‌ها را مرور کنید" msgid "You are logged in. Continuing..." msgstr "شما وارد سیستم شده اید. ادامه..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "توسط" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "بیشتر" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "ورود" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "ثبت نام" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "درباره" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "راهنما" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "رمز عبور را تغییر دهید" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "خروج" @@ -423,64 +473,78 @@ msgstr "جستجوی نقشه‌ها" msgid "Search" msgstr "جستجو" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "مشاهده نقشه" -#: views.py:658 -msgid "Map has been updated!" -msgstr "نقشه به روز شده است!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "ویراستاران نقشه با موفقیت به روز شد!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "فقط مالک آن می‌تواند نقشه را حذف کند." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "نقشه شما شبیه سازی شده است! اگر می خواهید این نقشه را از رایانه دیگری ویرایش کنید، لطفاً از این پیوند استفاده کنید: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "تبریک می گویم، نقشه شما شبیه سازی شده است!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "لایه با موفقیت حذف شد." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/fi/LC_MESSAGES/django.mo b/umap/locale/fi/LC_MESSAGES/django.mo index 11f56a9d..753cd8b7 100644 Binary files a/umap/locale/fi/LC_MESSAGES/django.mo and b/umap/locale/fi/LC_MESSAGES/django.mo differ diff --git a/umap/locale/fi/LC_MESSAGES/django.po b/umap/locale/fi/LC_MESSAGES/django.po index 34e2ff43..9b0a9d42 100644 --- a/umap/locale/fi/LC_MESSAGES/django.po +++ b/umap/locale/fi/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Jaakko Helleranta , 2013\n" "Language-Team: Finnish (http://app.transifex.com/openstreetmap/umap/language/fi/)\n" @@ -30,115 +30,115 @@ msgstr "Muokattavissa vain salaisella muokkauslinkillä" msgid "Everyone can edit" msgstr "Kuka tahansa saa muokata" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nimi" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "tarkemmat tiedot" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Linkki sivulle, jossa lisenssi on määritetty yksityiskohtaisesti." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "OSM-karttatiiliformaattia mukaileva URL-sapluuna" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Taustakarttojen järjestys muokkauslaatikossa" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "kuvaus" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "keskitä" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoomaa" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "paikanna" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Paikanna käyttäjä sivua ladattaessa?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Valitse kartan lisenssi" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "lisenssi" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "omistaja" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "julkaisija" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "muokkaa tilaa" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "jaa status" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "asetukset" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kloonattu kartasta" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "näytä ladattaessa" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Näytä tämä kerros ladattaessa." @@ -156,28 +156,27 @@ msgstr "Selaa %(current_user)s:n karttoja" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -199,23 +198,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Valitse mieleisesi palveluntarjoaja" @@ -259,8 +258,8 @@ msgstr "Jaa karttasi muille ja/tai liitä se muihin sivustoihin" msgid "And it's open source!" msgstr "Avoin lähdekoodi rulettaa!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Luo uusi kartta" @@ -268,13 +267,13 @@ msgstr "Luo uusi kartta" msgid "Play with the demo" msgstr "Tongi demoa sielusi kyllyydestä!" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -287,7 +286,7 @@ msgstr "Tämä on uMapin demo-instanssi, jota käytetään testaamiseen ja väli msgid "Map of the uMaps" msgstr "Kartta uMapeista" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspiroidu selaamalla karttoja" @@ -295,75 +294,126 @@ msgstr "Inspiroidu selaamalla karttoja" msgid "You are logged in. Continuing..." msgstr "Sisäänkirjautumisesi onnistui. Jatketahan..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "taholta" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Lisää" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Kirjaudu palveluun" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Kirjaudu palveluun" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Tietoja" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Kirjaudu ulos palvelusta" @@ -424,64 +474,78 @@ msgstr "Etsi karttoja" msgid "Search" msgstr "Etsi" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Katso karttaa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Kartta on päivitetty!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Kartan toimittajat päivitetty onnistuneesti!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Vain kartan omistaja voi poistaa kartan." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Karttasi on kloonattu! Jos haluat muokata tätä karttaa joltain muulta tietokoneelta, käytä tätä linkkiä: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Onneksi olkoon! Karttasi on kloonattu!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Kerros onnistuneesti poistettu. Pysyvästi." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo index 5570fda8..ba7078bb 100644 Binary files a/umap/locale/fr/LC_MESSAGES/django.mo and b/umap/locale/fr/LC_MESSAGES/django.mo differ diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po index 1c124bcc..5b581127 100644 --- a/umap/locale/fr/LC_MESSAGES/django.po +++ b/umap/locale/fr/LC_MESSAGES/django.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 15:19+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: yohanboniface , 2013-2014,2018-2019,2023-2024\n" "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n" @@ -269,8 +269,8 @@ msgstr "Exporter et partager votre carte" msgid "And it's open source!" msgstr "Et c'est open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Créer une carte" @@ -482,11 +482,11 @@ msgstr "Dernières cartes créées." msgid "Search maps" msgstr "Chercher des cartes" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Chercher" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Chercher dans mes cartes" @@ -499,16 +499,16 @@ msgstr "Mes cartes (%(count)s)" msgid "My profile" msgstr "Mon profil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "Titre de la carte" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format msgid "Download %(count)s maps" msgstr "Télécharger %(count)s cartes" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Vous n'avez pas encore de carte." @@ -520,48 +520,44 @@ msgstr "Voir la carte" msgid "See full screen" msgstr "Plein écran" -#: views.py:779 -msgid "Map has been updated!" -msgstr "La carte a été mise à jour !" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Éditeurs de la carte mis à jour !" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "La lien d'édition uMap pour votre carte %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Voici votre lien d'édition secret: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Courriel envoyé à %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Seul le créateur de la carte peut la supprimer." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Votre carte a été dupliquée ! Si vous souhaitez la modifier depuis un autre ordinateur, veuillez utiliser ce lien : %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Votre carte a été dupliquée !" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Calque supprimé." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Les permissions ont bien été modifiées !" diff --git a/umap/locale/gl/LC_MESSAGES/django.mo b/umap/locale/gl/LC_MESSAGES/django.mo index d3d8cf9a..ed6cd4a8 100644 Binary files a/umap/locale/gl/LC_MESSAGES/django.mo and b/umap/locale/gl/LC_MESSAGES/django.mo differ diff --git a/umap/locale/gl/LC_MESSAGES/django.po b/umap/locale/gl/LC_MESSAGES/django.po index 955c4b3a..ec9e1602 100644 --- a/umap/locale/gl/LC_MESSAGES/django.po +++ b/umap/locale/gl/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Rafael Ávila Coya , 2014\n" "Language-Team: Galician (http://app.transifex.com/openstreetmap/umap/language/gl/)\n" @@ -30,115 +30,115 @@ msgstr "Só pode editarse ca ligazón secreta de edición" msgid "Everyone can edit" msgstr "Calquera pode editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "O sitio está só para o mantemento" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nome" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalles" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Ligazón a unha páxina web onde se detalla a licenza." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Modelo de URL que usa o formato de teselas de OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Orde das capas base na caixa de edición" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "descrición" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centrar" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "achegar/afastar" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "localizar" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Localizar o usuario na carga?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Escolle a licenza do mapa." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licenza" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "dono" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editores" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "estado da edición" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "compartir o estado" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "axustes" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Clon de" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "amosar na carga" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Amosar esta capa na carga." @@ -156,28 +156,27 @@ msgstr "Navegador %(current_user)s dos mapas" msgid "%(current_user)s has no maps." msgstr "%(current_user)s non ten mapas." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -199,23 +198,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Fai o favor de loguearte ca túa conta" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Nome de usuario" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Contrasinal" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Sesión iniciada" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Escolle un fornecedor" @@ -259,8 +258,8 @@ msgstr "Inserir en páxina e compartir o teu mapa" msgid "And it's open source!" msgstr "E isto é de código aberto!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Facer un mapa" @@ -268,13 +267,13 @@ msgstr "Facer un mapa" msgid "Play with the demo" msgstr "Xogar ca versión de proba" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -287,7 +286,7 @@ msgstr "Esta é unha instancia de proba, empregada para probas e lanzamentos pre msgid "Map of the uMaps" msgstr "Mapa do uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspírate e procura mapas" @@ -295,75 +294,126 @@ msgstr "Inspírate e procura mapas" msgid "You are logged in. Continuing..." msgstr "Iniciaches a sesión. Estase a continuar..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "por" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Máis" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Iniciar a sesión" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Rexistrarse" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Acerca de" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Mudar contrasinal" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Saír" @@ -424,64 +474,78 @@ msgstr "Procurar mapas" msgid "Search" msgstr "Procurar" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Ollar o mapa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "O mapa foi actualizado!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "O editores do mapa foron actualizados de xeito exitoso!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Só o seu dono pode eliminar o mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "O teu mapa foi clonado! Se desexas editar este mapa dende outra computadora, emprega esta ligazón: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Parabéns! O teu mapa foi clonado!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "A capa foi eliminada de xeito exitoso." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/he/LC_MESSAGES/django.mo b/umap/locale/he/LC_MESSAGES/django.mo index b6bb77bd..18884b77 100644 Binary files a/umap/locale/he/LC_MESSAGES/django.mo and b/umap/locale/he/LC_MESSAGES/django.mo differ diff --git a/umap/locale/he/LC_MESSAGES/django.po b/umap/locale/he/LC_MESSAGES/django.po index 5f0d456a..8a0542c9 100644 --- a/umap/locale/he/LC_MESSAGES/django.po +++ b/umap/locale/he/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Yaron Shahrabani , 2020\n" "Language-Team: Hebrew (http://app.transifex.com/openstreetmap/umap/language/he/)\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n" +"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n" #: forms.py:44 forms.py:70 msgid "Only editable with secret edit link" @@ -26,115 +26,115 @@ msgstr "רק למי שיש את קישור העריכה הסודי יכול לע msgid "Everyone can edit" msgstr "לכולם יש הרשאות לערוך" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "האתר הוא לקריאה בלבד לצורך תחזוקה" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "שם" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "פרטים" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "קישור לעמוד בו הרישיון מפורט." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "תבנית כתובת עם תבנית האריחים של OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "סדר שכבת האריחים בתיבת העריכה" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "תיאור" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "מרכז" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "תקריב" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "איתור" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "לאתר משתמש עם הטעינה?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "נא לבחור את רישיון המפה." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "רישיון" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "בעלות" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "עורכים" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "מצב עריכה" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "מצב שיתוף" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "הגדרות" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "עותק של" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "הצגה עם הטעינה" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "הצגת השכבה הזאת עם הטעינה." @@ -152,28 +152,27 @@ msgstr "עיון במפות של %(current_user)s" msgid "%(current_user)s has no maps." msgstr "למשתמש %(current_user)s אין מפות." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "נא להיכנס עם החשבון שלך" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "שם משתמש" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "ססמה" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "כניסה" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "נא לבחור ספק" @@ -255,8 +254,8 @@ msgstr "הטמעה ושיתוף של המפה שלך" msgid "And it's open source!" msgstr "וכל זה בקוד פתוח!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "יצירת מפה" @@ -264,13 +263,13 @@ msgstr "יצירת מפה" msgid "Play with the demo" msgstr "משחק עם ההדגמה" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "זה עותק לדוגמה, משמש לבדיקות ולמהדורות msgid "Map of the uMaps" msgstr "המפות של uMap" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "מפות שתענקנה לך השראה" @@ -291,75 +290,126 @@ msgstr "מפות שתענקנה לך השראה" msgid "You are logged in. Continuing..." msgstr "נכנסת למערכת. ממשיכים הלאה…" -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "מאת" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "עוד" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "כניסה" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "הרשמה" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "על אודות" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "החלפת ססמה" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "יציאה" @@ -404,7 +454,6 @@ msgid_plural "%(count)s maps found:" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" #: templates/umap/search.html:18 msgid "No map found." @@ -422,64 +471,78 @@ msgstr "חיפוש במפות" msgid "Search" msgstr "חיפוש" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "הצגת המפה" -#: views.py:658 -msgid "Map has been updated!" -msgstr "המפה עודכנה!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "עורכי המפה עודכנו בהצלחה!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "רק לבעלים יש אפשרות למחוק את המפה." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "המפה שלך שוכפלה! אם מעניין אותך לערוך את המפה הזאת ממחשב אחר, נא להשתמש בקישור הבא: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "ברכותינו, המפה שלך שוכפלה!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "השכבה נמחקה בהצלחה." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/hu/LC_MESSAGES/django.mo b/umap/locale/hu/LC_MESSAGES/django.mo index af19e052..f423bab3 100644 Binary files a/umap/locale/hu/LC_MESSAGES/django.mo and b/umap/locale/hu/LC_MESSAGES/django.mo differ diff --git a/umap/locale/hu/LC_MESSAGES/django.po b/umap/locale/hu/LC_MESSAGES/django.po index 7b1a9106..83e6f72d 100644 --- a/umap/locale/hu/LC_MESSAGES/django.po +++ b/umap/locale/hu/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Gábor Babos , 2017-2019,2023-2024\n" "Language-Team: Hungarian (http://app.transifex.com/openstreetmap/umap/language/hu/)\n" @@ -155,7 +155,7 @@ msgstr "%(current_user)s felhasználónak nincs térképe." #: templates/auth/user_form.html:6 msgid "My Maps" -msgstr "" +msgstr "Térképeim" #: templates/auth/user_form.html:7 msgid "My Profile" @@ -255,8 +255,8 @@ msgstr "Ágyazza be és ossza meg a térképét" msgid "And it's open source!" msgstr "És mindezt nyílt forráskóddal!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Térkép készítése" @@ -299,97 +299,88 @@ msgstr "– készítette:" msgid "More" msgstr "Még több" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Név" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "Előnézet" -#: templates/umap/map_table.html:7 -msgid "Who can see" -msgstr "" - #: templates/umap/map_table.html:8 -msgid "Who can edit" -msgstr "" +msgid "Who can see" +msgstr "Ki láthatja?" #: templates/umap/map_table.html:9 +msgid "Who can edit" +msgstr "Ki szerkesztheti?" + +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Utolsó mentés" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Tulajdonos" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Műveletek" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "Előnézet" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Megoszt" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Szerk." -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Letölt" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" -msgstr "" +msgstr "Másolat készítése" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" -msgstr "" +msgstr "Törlés" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "első" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "előző" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " -msgstr "" +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "%(maps_number)s / %(num_pages)s oldal" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "következő" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "utolsó" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " -msgstr "" +msgid "Lines per page: %(per_page)s" +msgstr "Sorok oldalanként: %(per_page)s" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " -msgstr "" +msgid "%(count)s maps" +msgstr "%(count)s térkép" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 msgid "My Dashboard" @@ -476,36 +467,33 @@ msgstr "Legutóbb létrehozott térképek" msgid "Search maps" msgstr "Térképek keresése" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Keresés" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Saját térkép keresése" #: templates/umap/user_dashboard.html:11 #, python-format msgid "My Maps (%(count)s)" -msgstr "" +msgstr "Térképeim (%(count)s)" #: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "Saját profil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" -msgstr "" +msgstr "Térkép címe" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " -msgstr "" +msgid "Download %(count)s maps" +msgstr "%(count)s térkép letöltése" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Önnek még nincs térképe." @@ -515,50 +503,46 @@ msgstr "Térkép megtekintése" #: views.py:704 msgid "See full screen" -msgstr "" +msgstr "Teljes képernyős nézet megtekintése" -#: views.py:779 -msgid "Map has been updated!" -msgstr "A térkép frissült." - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "A térképszerkesztők sikeresen frissültek." -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "A térképéhez tartozó uMap szerkesztési link: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Az Ön titkos szerkesztési linkje: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "E-mail elküldve ide: %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "A térképet csak a tulajdonosa törölheti." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Elkészült a térképe másolata. Ha egy másik számítógépről szeretné szerkeszteni, ezt a linket használja: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Gratulálunk, elkészült a térképe másolata!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "A réteg sikeresen törlődött." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Az engedélyek sikeresen frissültek!" diff --git a/umap/locale/is/LC_MESSAGES/django.mo b/umap/locale/is/LC_MESSAGES/django.mo index d9cc4fc6..3b6e2168 100644 Binary files a/umap/locale/is/LC_MESSAGES/django.mo and b/umap/locale/is/LC_MESSAGES/django.mo differ diff --git a/umap/locale/is/LC_MESSAGES/django.po b/umap/locale/is/LC_MESSAGES/django.po index 4202b9b1..4fa6f72f 100644 --- a/umap/locale/is/LC_MESSAGES/django.po +++ b/umap/locale/is/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Sveinn í Felli , 2020\n" "Language-Team: Icelandic (http://app.transifex.com/openstreetmap/umap/language/is/)\n" @@ -26,115 +26,115 @@ msgstr "Aðeins breytanlegt með leynilegum breytingatengli" msgid "Everyone can edit" msgstr "Allir geta breytt" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Vefsvæðið er núna skrifvarið vegna viðhaldsvinnu" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nafn" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "nánar" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Tengill á síðu þar sem notkunarleyfi er útskýrt." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL-sniðmát sem notar OSM-kortatíglasnið" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Röð kortatíglalaga í breytingareitnum" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "lýsing" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "miðja" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "aðdráttur" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "staðsetja" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Staðsetja notanda við innhleðslu?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Veldu notkunarleyfi fyrir kortið." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "notkunarleyfi" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "eigandi" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "ritstjórar" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "staða vinnslu" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "staða deilingar" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "stillingar" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Klón af" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "birta við innhleðslu" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Birta þetta lag við innhleðslu." @@ -152,28 +152,27 @@ msgstr "Skoða landakort frá %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s er ekki með nein landakort." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Skráðu þig inn í notandaaðganginn þinn" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Notandanafn" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Lykilorð" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Innskráning" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Veldu þjónustuveitu" @@ -255,8 +254,8 @@ msgstr "Settu þetta inn á vefsíðu og deildu kortinu þínu" msgid "And it's open source!" msgstr "And it's open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Útbúðu landakort" @@ -264,13 +263,13 @@ msgstr "Útbúðu landakort" msgid "Play with the demo" msgstr "Leiktu þér með sýnisútgáfuna" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "Þetta er sýnitilvik, notað fyrir prófanir og skoðun á eiginleikum msgid "Map of the uMaps" msgstr "Kort í uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Fáðu hugmyndir, skoðaðu önnur landakort" @@ -291,75 +290,126 @@ msgstr "Fáðu hugmyndir, skoðaðu önnur landakort" msgid "You are logged in. Continuing..." msgstr "Þú ert skráð/ur inn. Held áfram..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "eftir" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Meira" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Skrá inn" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Nýskrá" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Um hugbúnaðinn" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Breyta lykilorði" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Skrá út" @@ -420,64 +470,78 @@ msgstr "Leita í landakortum" msgid "Search" msgstr "Leita" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Skoða kortið" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Kortið hefur verið uppfært!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Tókst að uppfæra vinnslu korta!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Aðeins eigandinn getur eytt landakortinu." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Það tókst að klóna landakortið þitt! Ef þú ætlar að breyta þessu landakorti úr annarri tölvu, ættirðu að nota þennan tengil: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Til hamingju, það tókst að klóna landakortið þitt!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Tókst að eyða lagi." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/it/LC_MESSAGES/django.mo b/umap/locale/it/LC_MESSAGES/django.mo index 961a1e68..8cee973d 100644 Binary files a/umap/locale/it/LC_MESSAGES/django.mo and b/umap/locale/it/LC_MESSAGES/django.mo differ diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po index 1cc13f27..c1a787c5 100644 --- a/umap/locale/it/LC_MESSAGES/django.po +++ b/umap/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ # Marco , 2017 # lucacorsato , 2014 # lucacorsato , 2014 -# Marco , 2017-2019 +# Marco , 2017-2019,2024 # Marco , 2018 # Maurizio Napolitano , 2013,2017,2023 # Mirco Zorzo , 2020 @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" -"Last-Translator: Francesco Piero Paolicelli , 2023\n" +"Last-Translator: Marco , 2017-2019,2024\n" "Language-Team: Italian (http://app.transifex.com/openstreetmap/umap/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,7 +166,7 @@ msgstr "%(current_user)s non ha mappe." #: templates/auth/user_form.html:6 msgid "My Maps" -msgstr "" +msgstr "Le mie mappe" #: templates/auth/user_form.html:7 msgid "My Profile" @@ -266,8 +266,8 @@ msgstr "Includi nel suo sito e condividi la mappa creata" msgid "And it's open source!" msgstr "Ed è software libero!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Crea una mappa" @@ -310,97 +310,88 @@ msgstr "di" msgid "More" msgstr "Altre mappe" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Nome" -#: templates/umap/map_table.html:6 -msgid "Preview" -msgstr "" - #: templates/umap/map_table.html:7 -msgid "Who can see" -msgstr "" +msgid "Preview" +msgstr "Anteprima" #: templates/umap/map_table.html:8 -msgid "Who can edit" -msgstr "" +msgid "Who can see" +msgstr "Chi può vedere" #: templates/umap/map_table.html:9 +msgid "Who can edit" +msgstr "Chi può modificare" + +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Ultimo salvataggio" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Proprietario" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Azioni" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" -msgstr "" +msgstr "Apri anteprima" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Condividi" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Modifica" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Download" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" -msgstr "" +msgstr "Clona" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" -msgstr "" +msgstr "Elimina" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" -msgstr "" +msgstr "primo" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" -msgstr "" +msgstr "precedente" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " -msgstr "" +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "Pagina %(maps_number)s di %(num_pages)s" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" -msgstr "" +msgstr "prossimo" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" -msgstr "" +msgstr "ultimo" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " -msgstr "" +msgid "Lines per page: %(per_page)s" +msgstr "Linee per pagina: %(per_page)s" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " -msgstr "" +msgid "%(count)s maps" +msgstr "%(count)s mappe" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 msgid "My Dashboard" @@ -488,36 +479,33 @@ msgstr "Ultime mappe create" msgid "Search maps" msgstr "Cerca mappe" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Cerca" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Cerca nelle mie mappe" #: templates/umap/user_dashboard.html:11 #, python-format msgid "My Maps (%(count)s)" -msgstr "" +msgstr "Le mie mappe (%(count)s)" #: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "Mio profilo" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" -msgstr "" +msgstr "Titolo della mappa" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " -msgstr "" +msgid "Download %(count)s maps" +msgstr "Scarica %(count)s mappe" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Non hai ancora alcuna mappa." @@ -527,50 +515,46 @@ msgstr "Visualizza la mappa" #: views.py:704 msgid "See full screen" -msgstr "" +msgstr "Vedi a schermo interno" -#: views.py:779 -msgid "Map has been updated!" -msgstr "La mappa è stata aggiornata!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Aggiornato l'elenco degli editor abilitati alla modifica della mappa!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Link uMap per la modifica della tua mappa: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Qui il tuo link segreto: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Email inviata a %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Solo il proprietario può eliminare la mappa." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "La mappa è stata clonata! Per modificarla usando un altro computer, si deve utilizzare questo link: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Perfetto, la tua mappa è stata clonata!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Layer eliminato correttamente" -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Autorizzazioni aggiornate con successo!" diff --git a/umap/locale/ja/LC_MESSAGES/django.mo b/umap/locale/ja/LC_MESSAGES/django.mo index dc337395..040ac89c 100644 Binary files a/umap/locale/ja/LC_MESSAGES/django.mo and b/umap/locale/ja/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ja/LC_MESSAGES/django.po b/umap/locale/ja/LC_MESSAGES/django.po index bfec8be1..b209e3a7 100644 --- a/umap/locale/ja/LC_MESSAGES/django.po +++ b/umap/locale/ja/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: tomoya muramoto , 2016,2021\n" "Language-Team: Japanese (http://app.transifex.com/openstreetmap/umap/language/ja/)\n" @@ -27,115 +27,115 @@ msgstr "非公開の編集リンクからのみ編集可能" msgid "Everyone can edit" msgstr "だれでも編集可能" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "メンテナンス中のため現在読み込み専用です。" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "名称" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "詳細" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "ライセンス詳細ページへのリンク" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "OSMタイルフォーマットを利用したURLテンプレート" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "編集ボックス内のタイルレイヤ並び順" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "概要" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "中心点" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "ズーム" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "現在地" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "読み込み時に現在地を表示？" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "マップのライセンスを選択" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "ライセンス" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "所有者" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "編集者" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "編集ステータス" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "共有状況" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "設定" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "複製元" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "読み込み時に表示" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "読み込み時にこのレイヤを表示" @@ -153,28 +153,27 @@ msgstr "%(current_user)sのマップを閲覧" msgid "%(current_user)s has no maps." msgstr "%(current_user)s はまだ地図を作成していません。" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "アカウントでログインしてください" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "ユーザー名" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "パスワード" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "ログイン" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "連携アカウント選択" @@ -256,8 +255,8 @@ msgstr "サイトへのマップ表示と共有" msgid "And it's open source!" msgstr "uMapは オープンソースです！" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "マップを作成" @@ -265,13 +264,13 @@ msgstr "マップを作成" msgid "Play with the demo" msgstr "デモを表示" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "これはリリース前テストと試運転用のデモサーバです msgid "Map of the uMaps" msgstr "Map of the uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Get inspired, browse maps" @@ -292,75 +291,126 @@ msgstr "Get inspired, browse maps" msgid "You are logged in. Continuing..." msgstr "ログインしました" -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "by" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "さらに表示" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "ログイン" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "サインイン" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "uMapについて" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "パスワードを変更" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "ログアウト" @@ -420,64 +470,78 @@ msgstr "地図を検索" msgid "Search" msgstr "検索" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "マップ表示" -#: views.py:658 -msgid "Map has been updated!" -msgstr "マップが更新されました！" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "マップ編集者の更新が完了しました！" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "マップを削除できるのは所有者だけです" -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "マップの複製が完了しました！ このマップを他の端末から編集する場合、以下のリンクを使用してください: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "マップの複製が完了しました！" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "レイヤ削除完了" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/ko/LC_MESSAGES/django.mo b/umap/locale/ko/LC_MESSAGES/django.mo index 9be92f5c..0b64850f 100644 Binary files a/umap/locale/ko/LC_MESSAGES/django.mo and b/umap/locale/ko/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ko/LC_MESSAGES/django.po b/umap/locale/ko/LC_MESSAGES/django.po index 8bcd40ef..6ac7dfbf 100644 --- a/umap/locale/ko/LC_MESSAGES/django.po +++ b/umap/locale/ko/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Dongha Hwang , 2019\n" "Language-Team: Korean (http://app.transifex.com/openstreetmap/umap/language/ko/)\n" @@ -26,115 +26,115 @@ msgstr "비공개 편집 링크를 가진 사람만 편집할 수 있음" msgid "Everyone can edit" msgstr "누구나 편집할 수 있음" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "유지보수 중입니다. 읽기 전용으로 구동 중입니다." -#: models.py:48 +#: models.py:50 msgid "name" msgstr "이름" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "세부 정보" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "라이선스가 명시된 페이지로 이동하는 링크입니다." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "오픈스트리트맵 타일 포맷을 이용한 URL 템플릿" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "편집 창에서 타일 레이어의 순서" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "설명" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "중앙" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "줌" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "위치" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "불러오면서 위치를 잡으시겠습니까?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "지도의 라이선스를 선택해 주세요." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "라이선스" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "소유주" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "편집자" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "편집 상태" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "공유 상태" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "설정" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "원본:" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "불러오면서 표시" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "불러오면서 동시에 이 레이어를 띄웁니다." @@ -152,28 +152,27 @@ msgstr "%(current_user)s의 지도 탐색" msgid "%(current_user)s has no maps." msgstr "%(current_user)s은/는 지도를 만들지 않았습니다." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "로그인해 주세요" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "사용자명" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "비밀번호" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "로그인" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "제공자를 선택해 주세요" @@ -255,8 +254,8 @@ msgstr "지도를 삽입하고 공유하기" msgid "And it's open source!" msgstr "게다가 오픈소스입니다!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "지도 제작" @@ -264,13 +263,13 @@ msgstr "지도 제작" msgid "Play with the demo" msgstr "데모 사용해 보기" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "현재 테스트/맛보기용 데모 버전을 사용하고 있습니다 msgid "Map of the uMaps" msgstr "uMap의 지도" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "푹 빠져 보세요, 지도를 검색해 보세요" @@ -291,75 +290,126 @@ msgstr "푹 빠져 보세요, 지도를 검색해 보세요" msgid "You are logged in. Continuing..." msgstr "로그인되었습니다. 잠시만 기다려 주세요..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "제작:" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "더 보기" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "로그인" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "로그인" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "정보" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "비밀번호 변경" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "로그아웃" @@ -419,64 +469,78 @@ msgstr "지도 검색" msgid "Search" msgstr "검색" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "지도 보기" -#: views.py:658 -msgid "Map has been updated!" -msgstr "지도가 업데이트되었습니다!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "지도 편집자가 성공적으로 업데이트되었습니다!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "소유주만 지도를 삭제할 수 있습니다." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "지도가 복제되었습니다! 다른 컴퓨터에서 지도를 편집하고 싶다면 다음 링크를 사용하세요: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "축하드립니다, 지도가 복제되었습니다!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "레이어가 성공적으로 삭제되었습니다." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/lt/LC_MESSAGES/django.mo b/umap/locale/lt/LC_MESSAGES/django.mo index 3d43d340..d10eb227 100644 Binary files a/umap/locale/lt/LC_MESSAGES/django.mo and b/umap/locale/lt/LC_MESSAGES/django.mo differ diff --git a/umap/locale/lt/LC_MESSAGES/django.po b/umap/locale/lt/LC_MESSAGES/django.po index 6680b63f..dee83984 100644 --- a/umap/locale/lt/LC_MESSAGES/django.po +++ b/umap/locale/lt/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Ugne Urbelyte , 2017\n" "Language-Team: Lithuanian (http://app.transifex.com/openstreetmap/umap/language/lt/)\n" @@ -27,115 +27,115 @@ msgstr "Redaguojamas tik su slapta nuoroda" msgid "Everyone can edit" msgstr "Visi gali redaguoti" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "vardas" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "išsamiau" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Licenzijos aprašymo nuoroda." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL šablonas OSM kaladėlių formatui" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Žemėlapio sluoksnių tvarka redagavimo lange" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "aprašymas" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centras" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "mastelis" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "nustatyti padėtį" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Nustatyti padėti užsikrovus?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Pasirinkite žemėlapio licenziją." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licenzija" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "savininkas" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "redaktoriai" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "keisti būseną" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "pasidalinti būsena" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "nustatymai" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kopija" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "rodyti pasikrovus" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Rodyti šį sluoksnį pasrikrovus." @@ -153,28 +153,27 @@ msgstr "Peržiūrėti %(current_user)s žemėlapius" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Prisijungti prie savo paskyros" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Vartotojo vardas" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Slaptažodis" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Prisijungti" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Pasirinkite teikėją" @@ -256,8 +255,8 @@ msgstr "Įterpti ir dalintis savo žemėlapiu" msgid "And it's open source!" msgstr "Juk tai atviras kodas!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Kurti žemėlapį" @@ -265,13 +264,13 @@ msgstr "Kurti žemėlapį" msgid "Play with the demo" msgstr "Išbandyti demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "Tai demonstracinė versija, naudojama testavimui ir naujų versijų demo msgid "Map of the uMaps" msgstr "uMap žemėlapis" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Peržiūrėkite žemėlapius, raskite įkvėpimą" @@ -292,75 +291,126 @@ msgstr "Peržiūrėkite žemėlapius, raskite įkvėpimą" msgid "You are logged in. Continuing..." msgstr "Sėkmingai prisijungėte. Kraunasi..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "pagal" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Daugiau" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Prisijungti" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Užsiregistruoti" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Apie" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Keisti slaptažodį" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Atsijungti" @@ -423,64 +473,78 @@ msgstr "Ieškoti žemėlapių" msgid "Search" msgstr "Ieškoti" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Peržiūrėti žemėlapį" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Žemėlapis atnaujintas!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Žemėlapio keitėjai atnaujinti!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Tik savininkas gali ištrinti žemėlapį." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Jūsų žemėlapis nukopijuotas! Jei norite redaguoti jį iš kito kompiuterio, pasinaudokite šia nuoroda: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Sveikinam, Jūsų žemėlapis buvo nukopijuotas!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Sluoksnis sėkmingai ištrintas." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/ms/LC_MESSAGES/django.mo b/umap/locale/ms/LC_MESSAGES/django.mo index 63552a51..c9f95059 100644 Binary files a/umap/locale/ms/LC_MESSAGES/django.mo and b/umap/locale/ms/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ms/LC_MESSAGES/django.po b/umap/locale/ms/LC_MESSAGES/django.po index 014c26c9..bb1ef63f 100644 --- a/umap/locale/ms/LC_MESSAGES/django.po +++ b/umap/locale/ms/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) , 2021,2023\n" "Language-Team: Malay (http://app.transifex.com/openstreetmap/umap/language/ms/)\n" @@ -255,8 +255,8 @@ msgstr "Benam dan kongsi peta anda" msgid "And it's open source!" msgstr "Dan ia bersumber terbuka!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Cipta peta" @@ -299,96 +299,87 @@ msgstr "oleh" msgid "More" msgstr "Lebih lagi" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Nama" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Simpan kali terakhir" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Pemilik" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Tindakan" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Kongsi" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Sunting" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Muat turun" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -475,11 +466,11 @@ msgstr "Peta dicipta baru-baru ini" msgid "Search maps" msgstr "Cari peta" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Cari" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Gelintar peta saya" @@ -492,19 +483,16 @@ msgstr "" msgid "My profile" msgstr "Profil saya" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Anda belum ada peta." @@ -516,48 +504,44 @@ msgstr "Lihat peta" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Peta telah dikemas kini!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Penyunting peta telah dikemas kini dengan jayanya!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Pautan suntingan uMap untuk peta anda: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Ini pautan suntingan rahsia anda: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "E-mel telah dihantar ke %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Hanya pemiliknya sahaja mampu memadamkan peta." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Peta anda telah diklon! Jika anda ingin menyunting peta ini dari komputer lain, sila gunakan pautan ini: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Tahniah, peta anda telah berjaya diklon!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Lapisan telah berjaya dipadamkan." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "Kebenaran telah dikemas kini dengan jayanya!" diff --git a/umap/locale/nl/LC_MESSAGES/django.mo b/umap/locale/nl/LC_MESSAGES/django.mo index c590423a..da5fbaae 100644 Binary files a/umap/locale/nl/LC_MESSAGES/django.mo and b/umap/locale/nl/LC_MESSAGES/django.mo differ diff --git a/umap/locale/nl/LC_MESSAGES/django.po b/umap/locale/nl/LC_MESSAGES/django.po index 13662262..fa9e0260 100644 --- a/umap/locale/nl/LC_MESSAGES/django.po +++ b/umap/locale/nl/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: danieldegroot2 , 2022\n" "Language-Team: Dutch (http://app.transifex.com/openstreetmap/umap/language/nl/)\n" @@ -28,115 +28,115 @@ msgstr "Alleen te bewerken met een geheime link" msgid "Everyone can edit" msgstr "Iedereen kan wijzigingen maken" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Site is 'alleen lezen' wegens onderhoud" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "naam" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "details" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link naar pagina waar de licentie details staan" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL-sjabloon met OSM tegel-formaat" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Volgorde van de tegel-lagen in het bewerkingsvak." -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "omschrijving" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centreer" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "zoek" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Gebruiker zoeken tijdens laden?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Kies de kaartlicentie" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "Licentie" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "eigenaar" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editors" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "wijzig status" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "deel status" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "instellingen" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kopie van" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "toon tijdens laden" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Toon deze laag tijdens laden." @@ -154,28 +154,27 @@ msgstr "Toon %(current_user)s's kaarten" msgid "%(current_user)s has no maps." msgstr "%(current_user)sheeft geen kaarten." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Log in met uw account" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Gebruikersnaam" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Wachtwoord" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Inloggen" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Kies een provider" @@ -257,8 +256,8 @@ msgstr "Kaart insluiten en delen" msgid "And it's open source!" msgstr "En het is open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Maak een kaart" @@ -266,13 +265,13 @@ msgstr "Maak een kaart" msgid "Play with the demo" msgstr "Speel met de demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "Dit is een demo-versie, gebruikt voor tests en pre-rolling releases. Als msgid "Map of the uMaps" msgstr "Kaart van de uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Laat u inspireren, blader door kaarten" @@ -293,75 +292,126 @@ msgstr "Laat u inspireren, blader door kaarten" msgid "You are logged in. Continuing..." msgstr "U bent ingelogd. Ga verder..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "door" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Meer" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Inloggen" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Aanmelden" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Over" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Wijzig wachtwoord" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Uitloggen" @@ -422,64 +472,78 @@ msgstr "Zoek kaarten" msgid "Search" msgstr "Zoeken" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Bekijk de kaart" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Kaart is bijgewerkt!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Kaarteditors met succes bijgewerkt!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Kaart kan alleen door eigenaar worden verwijderd." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Uw kaart is gekopieerd! Als u deze kaart wilt wijzigen vanaf een andere computer, gebruik dan deze link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Gefeliciteerd, uw kaart is gekopieerd!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Laag is verwijderd." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/pl/LC_MESSAGES/django.mo b/umap/locale/pl/LC_MESSAGES/django.mo index 175507f2..15b0a4e1 100644 Binary files a/umap/locale/pl/LC_MESSAGES/django.mo and b/umap/locale/pl/LC_MESSAGES/django.mo differ diff --git a/umap/locale/pl/LC_MESSAGES/django.po b/umap/locale/pl/LC_MESSAGES/django.po index ea1bc466..fe319e68 100644 --- a/umap/locale/pl/LC_MESSAGES/django.po +++ b/umap/locale/pl/LC_MESSAGES/django.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Bartosz Racławski , 2023\n" "Language-Team: Polish (http://app.transifex.com/openstreetmap/umap/language/pl/)\n" @@ -263,8 +263,8 @@ msgstr "Umieszczaj mapy w sieci i dziel się nimi" msgid "And it's open source!" msgstr "I to wszystko na wolnej licencji!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Stwórz mapę" @@ -307,96 +307,87 @@ msgstr "przez" msgid "More" msgstr "Więcej" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Nazwa" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Ostatni zapis" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Właściciel" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Akcje" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Udostępnij" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Edytuj" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Pobierz" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -486,11 +477,11 @@ msgstr "Ostatnio utworzone mapy" msgid "Search maps" msgstr "Znajdź mapy" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Szukaj" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Przeszukaj moje mapy" @@ -503,19 +494,16 @@ msgstr "" msgid "My profile" msgstr "Mój profil" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Nie masz jeszcze żadnej mapy." @@ -527,48 +515,44 @@ msgstr "Zobacz mapę" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Mapa została zaktualizowana!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Edytorzy mapy zaktualizowani pomyślnie!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Link uMap do edytowania twojej mapy: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Oto twój sekretny link do edycji: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Email wysłany do %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Tylko właściciel może usunąć mapę." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Twoja mapa została skopiowana! Jeśli chcesz edytować ją z innego komputera, użyj odnośnika: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Gratulacje, twoja mapa została skopiowana!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Warstwa usunięta pomyślnie." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/pt/LC_MESSAGES/django.mo b/umap/locale/pt/LC_MESSAGES/django.mo index 364b4509..29f8de58 100644 Binary files a/umap/locale/pt/LC_MESSAGES/django.mo and b/umap/locale/pt/LC_MESSAGES/django.mo differ diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po index a06e321e..2d765f7d 100644 --- a/umap/locale/pt/LC_MESSAGES/django.po +++ b/umap/locale/pt/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Joao Ponce de Leao Paulouro , 2014\n" "Language-Team: Portuguese (http://app.transifex.com/openstreetmap/umap/language/pt/)\n" @@ -27,115 +27,115 @@ msgstr "Unicamente editável através de link secreto" msgid "Everyone can edit" msgstr "Todos podem editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "O site está em modo de leitura para manutenção" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nome" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalhes" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link para uma página detalhando a licença." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Modelo de URL no formato de telas OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Ordem das camadas na caixa de edição" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "descrição" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centro" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "localizar" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Localizar utilizador no início?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Escolha uma licença para o mapa." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licença" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "proprietário" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editores" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "editar estado" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "partilhar estado" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "parâmetros" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Clone de" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "mostrar no início" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Apresentar esta camada ao carregar." @@ -153,28 +153,27 @@ msgstr "Consulte os mapas de %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s não tem mapas." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Por favor entre na sua conta" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Nome de utilizador" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Palavra-passe" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Entrar" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Por favor escolha um fornecedor" @@ -256,8 +255,8 @@ msgstr "Exportar e partilhar o seu mapa" msgid "And it's open source!" msgstr "E está disponível em código aberto!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Criar um mapa" @@ -265,13 +264,13 @@ msgstr "Criar um mapa" msgid "Play with the demo" msgstr "Testar a demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "Esta é uma versão de demonstração, utilizada para testes e pré-lan msgid "Map of the uMaps" msgstr "Mapa dos uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspire-se, explore os mapas" @@ -292,75 +291,126 @@ msgstr "Inspire-se, explore os mapas" msgid "You are logged in. Continuing..." msgstr "Sucesso na identificação. Continuando..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "por" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Mais" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Entrar" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Criar conta" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Sobre" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Alterar palavra-passe" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Sair" @@ -422,64 +472,78 @@ msgstr "Procurar mapas" msgid "Search" msgstr "Procurar" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Ver o mapa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "O mapa foi atualizado!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Os editores do mapa foram atualizados com sucesso!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Só o proprietário pode eliminar o mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "O seu mapa foi clonado! Se quiser editar este mapa noutro computador, por favor utilize este link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Parabéns, o seu mapa foi clonado!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Camada eliminada com sucesso." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/pt_BR/LC_MESSAGES/django.mo b/umap/locale/pt_BR/LC_MESSAGES/django.mo index 99c2a43b..b0c4839f 100644 Binary files a/umap/locale/pt_BR/LC_MESSAGES/django.mo and b/umap/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/umap/locale/pt_BR/LC_MESSAGES/django.po b/umap/locale/pt_BR/LC_MESSAGES/django.po index 7f06e4f9..8ecbdfb9 100644 --- a/umap/locale/pt_BR/LC_MESSAGES/django.po +++ b/umap/locale/pt_BR/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Rui , 2016,2018\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/openstreetmap/umap/language/pt_BR/)\n" @@ -28,115 +28,115 @@ msgstr "Unicamente editável através de link secreto" msgid "Everyone can edit" msgstr "Todos podem editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "O site está em modo de leitura para manutenção" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nome" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalhes" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link para uma página detalhando a licença." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Modelo de URL no formato de telas OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Ordem das camadas na caixa de edição" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "descrição" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centro" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "localizar" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Localizar usuário no início?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Escolha uma licença para o mapa." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licença" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "proprietário" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editores" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "editar estado" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "partilhar estado" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "parâmetros" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Clone de" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "mostrar no início" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Apresentar esta camada ao carregar." @@ -154,28 +154,27 @@ msgstr "Consulte os mapas de %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s não tem mapas." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Por favor entre na sua conta" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Nome de usuário" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Palavra-passe" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Entrar" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Por favor escolha um fornecedor" @@ -257,8 +256,8 @@ msgstr "Exportar e partilhar o seu mapa" msgid "And it's open source!" msgstr "E está disponível em código aberto!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Criar um mapa" @@ -266,13 +265,13 @@ msgstr "Criar um mapa" msgid "Play with the demo" msgstr "Testar a demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "Esta é uma versão de demonstração, utilizada para testes e pré-lan msgid "Map of the uMaps" msgstr "Mapa dos uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspire-se, explore os mapas" @@ -293,75 +292,126 @@ msgstr "Inspire-se, explore os mapas" msgid "You are logged in. Continuing..." msgstr "Sucesso na identificação. Continuando..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "por" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Mais" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Entrar" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Criar conta" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Sobre" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Alterar palavra-passe" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Sair" @@ -423,64 +473,78 @@ msgstr "Procurar mapas" msgid "Search" msgstr "Procurar" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Ver o mapa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "O mapa foi atualizado!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Os editores do mapa foram atualizados com sucesso!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Só o proprietário pode eliminar o mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "O seu mapa foi clonado! Se quiser editar este mapa noutro computador, por favor utilize este link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Parabéns, o seu mapa foi clonado!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Camada eliminada com sucesso." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/pt_PT/LC_MESSAGES/django.mo b/umap/locale/pt_PT/LC_MESSAGES/django.mo index 79b3e6b7..106f7a21 100644 Binary files a/umap/locale/pt_PT/LC_MESSAGES/django.mo and b/umap/locale/pt_PT/LC_MESSAGES/django.mo differ diff --git a/umap/locale/pt_PT/LC_MESSAGES/django.po b/umap/locale/pt_PT/LC_MESSAGES/django.po index 6105dd37..3a905d36 100644 --- a/umap/locale/pt_PT/LC_MESSAGES/django.po +++ b/umap/locale/pt_PT/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Joao Ponce de Leao Paulouro , 2014\n" "Language-Team: Portuguese (Portugal) (http://app.transifex.com/openstreetmap/umap/language/pt_PT/)\n" @@ -27,115 +27,115 @@ msgstr "Unicamente editável através de link secreto" msgid "Everyone can edit" msgstr "Todos podem editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "O site está em modo de leitura para manutenção" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nome" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalhes" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Link para uma página detalhando a licença." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Modelo de URL no formato de telas OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Ordem das camadas na caixa de edição" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "descrição" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "centro" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "zoom" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "localizar" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Localizar usuário no início?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Escolha uma licença para o mapa." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licença" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "proprietário" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editores" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "editar estado" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "partilhar estado" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "parâmetros" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Clone de" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "mostrar no início" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Apresentar esta camada ao carregar." @@ -153,28 +153,27 @@ msgstr "Consulte os mapas de %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s não tem mapas." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Por favor entre na sua conta" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Nome de utilizador" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Palavra-passe" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Entrar" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Por favor escolha um fornecedor" @@ -256,8 +255,8 @@ msgstr "Exportar e partilhar o seu mapa" msgid "And it's open source!" msgstr "E está disponível em código aberto!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Criar um mapa" @@ -265,13 +264,13 @@ msgstr "Criar um mapa" msgid "Play with the demo" msgstr "Testar a demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "Esta é uma versão de demonstração, utilizada para testes e pré-lan msgid "Map of the uMaps" msgstr "Mapa dos uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inspire-se, explore os mapas" @@ -292,75 +291,126 @@ msgstr "Inspire-se, explore os mapas" msgid "You are logged in. Continuing..." msgstr "Sucesso na identificação. Continuando..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "por" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Mais" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Entrar" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Criar conta" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Sobre" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Alterar palavra-passe" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Sair" @@ -422,64 +472,78 @@ msgstr "Procurar mapas" msgid "Search" msgstr "Procurar" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Ver o mapa" -#: views.py:658 -msgid "Map has been updated!" -msgstr "O mapa foi atualizado!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Os editores do mapa foram atualizados com sucesso!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Só o proprietário pode eliminar o mapa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "O seu mapa foi clonado! Se quiser editar este mapa noutro computador, por favor utilize este link: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Parabéns, o seu mapa foi clonado!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Camada eliminada com sucesso." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/ro/LC_MESSAGES/django.mo b/umap/locale/ro/LC_MESSAGES/django.mo index 3a02b5e4..a54079ac 100644 Binary files a/umap/locale/ro/LC_MESSAGES/django.mo and b/umap/locale/ro/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ro/LC_MESSAGES/django.po b/umap/locale/ro/LC_MESSAGES/django.po index 79eef69b..e38ba4ba 100644 --- a/umap/locale/ro/LC_MESSAGES/django.po +++ b/umap/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-08-25 08:16+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: cip , 2018-2019\n" "Language-Team: Romanian (http://app.transifex.com/openstreetmap/umap/language/ro/)\n" @@ -18,124 +18,123 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: forms.py:43 -#, python-format -msgid "Secret edit link is %s" -msgstr "" - -#: forms.py:47 -msgid "Everyone can edit" -msgstr "" - -#: forms.py:48 +#: forms.py:44 forms.py:70 msgid "Only editable with secret edit link" msgstr "" -#: middleware.py:14 +#: forms.py:45 forms.py:71 +msgid "Everyone can edit" +msgstr "" + +#: forms.py:69 models.py:371 +msgid "Inherit" +msgstr "" + +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "nume" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "detalii" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "" -#: models.py:142 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:307 +#: models.py:155 models.py:378 msgid "description" msgstr "" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licență" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "" -#: models.py:181 +#: models.py:184 models.py:392 msgid "edit status" msgstr "" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "" -#: models.py:189 models.py:316 +#: models.py:192 models.py:387 msgid "settings" msgstr "setări" -#: models.py:262 +#: models.py:320 msgid "Clone of" msgstr "" -#: models.py:311 +#: models.py:382 msgid "display on load" msgstr "" -#: models.py:312 +#: models.py:383 msgid "Display this layer on load." msgstr "" @@ -153,28 +152,27 @@ msgstr "" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Parola" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "" @@ -256,8 +254,8 @@ msgstr "" msgid "And it's open source!" msgstr "" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Creați o hartă" @@ -265,13 +263,13 @@ msgstr "Creați o hartă" msgid "Play with the demo" msgstr "" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +282,7 @@ msgstr "" msgid "Map of the uMaps" msgstr "" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "" @@ -292,75 +290,126 @@ msgstr "" msgid "You are logged in. Continuing..." msgstr "" -#: templates/umap/map_list.html:9 views.py:300 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Despre" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Schimbă parola" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "" @@ -422,60 +471,78 @@ msgstr "Caută hărți" msgid "Search" msgstr "Caută" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:305 +#: views.py:346 msgid "View the map" msgstr "" -#: views.py:628 -msgid "Map has been updated!" -msgstr "Harta a fost actualizată!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:653 +#: views.py:803 msgid "Map editors updated with success!" msgstr "" -#: views.py:691 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:694 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:700 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:711 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "" -#: views.py:734 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "" -#: views.py:739 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "" -#: views.py:922 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "" + +#: views.py:1152 +msgid "Permissions updated with success!" +msgstr "" diff --git a/umap/locale/ru/LC_MESSAGES/django.mo b/umap/locale/ru/LC_MESSAGES/django.mo index e7713462..8441a35c 100644 Binary files a/umap/locale/ru/LC_MESSAGES/django.mo and b/umap/locale/ru/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ru/LC_MESSAGES/django.po b/umap/locale/ru/LC_MESSAGES/django.po index 6535ea43..6ce7740d 100644 --- a/umap/locale/ru/LC_MESSAGES/django.po +++ b/umap/locale/ru/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Кругликов Илья , 2014,2016\n" "Language-Team: Russian (http://app.transifex.com/openstreetmap/umap/language/ru/)\n" @@ -31,115 +31,115 @@ msgstr "Редактирование возможно только при нал msgid "Everyone can edit" msgstr "Все могут редактировать" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Сайт доступен только для обслуживания" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "название" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "подробности" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Ссылка на страницу с описанием лицензии" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "шаблон ссылки использует формат слоя OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Расположите слои карт в окне редактирования" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "описание" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "центр" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "масштаб" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "геолокация" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Использовать геолокацию при загрузке?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Выберите лицензию для карты." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "лицензия" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "владелец" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "редакторы" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "статус редактирования" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "статус совместного использования" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "настройки" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Копия" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "показывать при загрузке" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Показать этот слой при загрузке." @@ -157,28 +157,27 @@ msgstr "Просмотр карт пользователя %(current_user)s" msgid "%(current_user)s has no maps." msgstr "У пользователя %(current_user)sнет карт." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -200,23 +199,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Войдите, используя свою учётную запись" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Имя пользователя" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Пароль" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Войти" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Выберите провайдера аутентификации" @@ -260,8 +259,8 @@ msgstr "Встраивайте вашу карту и делитесь ей" msgid "And it's open source!" msgstr "И это открытое ПО!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Создать карту" @@ -269,13 +268,13 @@ msgstr "Создать карту" msgid "Play with the demo" msgstr "Пробная карта" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -288,7 +287,7 @@ msgstr "Это демонстрационный сайт, использующи msgid "Map of the uMaps" msgstr "Карты uMap" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Смотрите чужие карты и вдохновляйтесь" @@ -296,75 +295,126 @@ msgstr "Смотрите чужие карты и вдохновляйтесь" msgid "You are logged in. Continuing..." msgstr "Вы вошли. Продолжим..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "от" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Ещё" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Войти" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Зарегистрироваться" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "О проекте" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Сменить пароль" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Выйти" @@ -427,64 +477,78 @@ msgstr "Поиск карт" msgid "Search" msgstr "Найти" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Посмотреть карту" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Карта обновлена!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Редакторы карты успешно обновлены!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Только владелец карты может удалить её." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Карта была скопирована. Если вы хотите редактировать её на другом компьютере, используйте эту ссылку: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Поздравляем, ваша карта скопирована!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Слой удалён." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/sk_SK/LC_MESSAGES/django.mo b/umap/locale/sk_SK/LC_MESSAGES/django.mo index 2bddca93..a5fb88da 100644 Binary files a/umap/locale/sk_SK/LC_MESSAGES/django.mo and b/umap/locale/sk_SK/LC_MESSAGES/django.mo differ diff --git a/umap/locale/sk_SK/LC_MESSAGES/django.po b/umap/locale/sk_SK/LC_MESSAGES/django.po index dadc8076..1bf7dffd 100644 --- a/umap/locale/sk_SK/LC_MESSAGES/django.po +++ b/umap/locale/sk_SK/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Martin Ždila , 2014\n" "Language-Team: Slovak (Slovakia) (http://app.transifex.com/openstreetmap/umap/language/sk_SK/)\n" @@ -28,115 +28,115 @@ msgstr "Možné upravovať iba pomocou tajného odkazu" msgid "Everyone can edit" msgstr "Hocikto môže upravovať" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "názov" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "podrobnosti" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Odkaz na stránku s podrobnejším popisom licencie." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Vzor URL vo formáte pre dlaždice OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Poradie vrstiev pri úprave" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "popis" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "stred" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "priblíženie" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "lokalizovať" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Nájsť polohu používateľa pri štarte?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Vyberte si licenciu mapy." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "licencia" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "vlastník" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "prispievatelia" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "kto môže vykonávať úpravy" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "nastavenie zdieľania" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "nastavenia" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kópia" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "zobraziť pri štarte" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Zobraziť túto vrstvu pri štarte." @@ -154,28 +154,27 @@ msgstr "Prezerať si mapy používateľa %(current_user)s" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Prosím, prihláste sa pomocou vášho účtu" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Používateľské meno" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Heslo" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Prihlásiť" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Prosím vyberte poskytovateľa mapy" @@ -257,8 +256,8 @@ msgstr "Zdieľajte a vložte mapu na inú webstránku" msgid "And it's open source!" msgstr "A celé je to open source!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Vytvoriť mapu" @@ -266,13 +265,13 @@ msgstr "Vytvoriť mapu" msgid "Play with the demo" msgstr "Hrajte sa s demom" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "Toto je ukážková verzia, používaná na testovanie nových vydaní u msgid "Map of the uMaps" msgstr "Mapa všetkých uMap" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Inšpirujte sa prezeraním iných máp" @@ -293,75 +292,126 @@ msgstr "Inšpirujte sa prezeraním iných máp" msgid "You are logged in. Continuing..." msgstr "Ste prihláseni. Pokračujeme ďalej…" -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr ", autor:" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Viac" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Prihlásiť sa" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Zaregistrovať sa" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "O uMap" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Zmeniť heslo" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Odhlásiť sa" @@ -424,64 +474,78 @@ msgstr "Hľadať mapy" msgid "Search" msgstr "Hľadať" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Prezrieť si túto mapu" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Mapa bola aktualizována!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Zoznam prispievovateľov bol úspešne upravený!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Iba vlastník môže vymazať túto mapu." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Bola vytvorená kópia mapy! Ak chcete upravovať túto mapu z iného počítača, použite tento odkaz: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Gratulujeme, bola vytvorená kópia mapy!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Vrstva bola úspešne vymazaná." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/sl/LC_MESSAGES/django.mo b/umap/locale/sl/LC_MESSAGES/django.mo index fe87ac6f..ba2375d5 100644 Binary files a/umap/locale/sl/LC_MESSAGES/django.mo and b/umap/locale/sl/LC_MESSAGES/django.mo differ diff --git a/umap/locale/sl/LC_MESSAGES/django.po b/umap/locale/sl/LC_MESSAGES/django.po index 1bec8da6..f2be633f 100644 --- a/umap/locale/sl/LC_MESSAGES/django.po +++ b/umap/locale/sl/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Štefan Baebler , 2019\n" "Language-Team: Slovenian (http://app.transifex.com/openstreetmap/umap/language/sl/)\n" @@ -28,115 +28,115 @@ msgstr "Urejanje je mogoče le prek posebne skrivne povezave" msgid "Everyone can edit" msgstr "Vsakdo lahko ureja" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Zaradi vzdrževanja je strežnik na voljo samo za ogled." -#: models.py:48 +#: models.py:50 msgid "name" msgstr "ime" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "podrobnosti" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Povezava do strani, kjer je objavljeno dovoljenje." -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Predloga naslova URL z uporabo zapisa OSM." -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Vrstni red plasti v urejevalniku" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "opis" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "središče" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "približaj" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "določi mesto" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Al naj se ob zagonu določi trenutno mesto uporabnika?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Izbor dovoljenja za zemljevid." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "dovoljenje" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "lastnik" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "uredniki" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "stanje urejanja" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "stanje souporabe" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "nastavitve" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Klon zemljevida" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "pokaži ob zagonu" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Pokaži to plast med nalaganjem." @@ -154,28 +154,27 @@ msgstr "Prebrskaj zemljevide (%(current_user)s)" msgid "%(current_user)s has no maps." msgstr "%(current_user)s nima nobenega zemljevida." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Prijavite se z računom" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Uporabniško ime" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Geslo" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Prijava" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Izbor ponudnika" @@ -257,8 +256,8 @@ msgstr "Vstavljanje in objavljanje zemljevida" msgid "And it's open source!" msgstr "Povrh vsega pa je projekt še odprtokoden!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Ustvari zemljevid" @@ -266,13 +265,13 @@ msgstr "Ustvari zemljevid" msgid "Play with the demo" msgstr "Pokaži preizkusne strani" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "Preizkusna različica je na voljo za pregled in spoznavanje funkcionalno msgid "Map of the uMaps" msgstr "Zemljevid spletišča uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Poiščite zamisli, prebrskajte zemljevide" @@ -293,75 +292,126 @@ msgstr "Poiščite zamisli, prebrskajte zemljevide" msgid "You are logged in. Continuing..." msgstr "Prijava je uspešno končana. Poteka nalaganje vsebine ..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "–" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Več" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Prijava" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Vpis" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "O projektu" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Zamenjaj geslo" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Odjava" @@ -424,64 +474,78 @@ msgstr "Poišči zemljevide" msgid "Search" msgstr "Poišči" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Pogled zemljevida" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Zemljevid je posodobljen!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "seznam urednikov je posodobljen!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Zemljevid lahko izbriše le lastnik." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Zemljevid je kloniran! Za urejanje z drugega računalnika uporabite povezavo: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Zemljevid je uspešno kloniran!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Plast je uspešno izbrisana." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/sr/LC_MESSAGES/django.mo b/umap/locale/sr/LC_MESSAGES/django.mo index 43ed2f38..43f1da3c 100644 Binary files a/umap/locale/sr/LC_MESSAGES/django.mo and b/umap/locale/sr/LC_MESSAGES/django.mo differ diff --git a/umap/locale/sr/LC_MESSAGES/django.po b/umap/locale/sr/LC_MESSAGES/django.po index a07c7575..f828c9b6 100644 --- a/umap/locale/sr/LC_MESSAGES/django.po +++ b/umap/locale/sr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: kingserbi , 2019-2020\n" "Language-Team: Serbian (http://app.transifex.com/openstreetmap/umap/language/sr/)\n" @@ -26,115 +26,115 @@ msgstr "Могуће је уређивати само са тајним линк msgid "Everyone can edit" msgstr "Свако може да уређује" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Доступно само ради одржавања сајта" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "Име" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "Детаљи" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Линк до странице на којој је лиценца детаљно описана" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL шаблон користећи OSM формат" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Редослед слојева у пољу за уређивање" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "опис" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "центар" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "увећање" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "пронаћи" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Пронаћи корисника при уређивању" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Изаберите лиценцу мапе" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "лиценца" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "власник" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "уређивачи" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "статус уређивања" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "подели статус" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "подешавања" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "клон од" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "приказ при учитавању" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Прикажи овај лејер при учитавању" @@ -152,28 +152,27 @@ msgstr "Претражи %(current_user)s мапе" msgid "%(current_user)s has no maps." msgstr "%(current_user)sне поседује мапу." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Молимо Вас улогујте се са корисничким налогом" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Корисничко име" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Лозинка" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Пријава" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Молимо Вас одаберите провајдера" @@ -255,8 +254,8 @@ msgstr "Уређујте и делите мапу" msgid "And it's open source!" msgstr "И све је отвореног кода!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Направи мапу" @@ -264,13 +263,13 @@ msgstr "Направи мапу" msgid "Play with the demo" msgstr "Тестирајте демо верзију" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "Ово је демо пример, који се користи за т msgid "Map of the uMaps" msgstr "Мапа Umaps-a" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Инспиришите се, претражите мапе" @@ -291,75 +290,126 @@ msgstr "Инспиришите се, претражите мапе" msgid "You are logged in. Continuing..." msgstr "Улоговани сте. Учитава се..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "од стране" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Више" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Пријава" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Регистрација" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "О апликацији" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Промени лозинку" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Одјавите се" @@ -421,64 +471,78 @@ msgstr "Претражите мапе" msgid "Search" msgstr "Претрага" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Преглед мапе" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Мапа је ажурирана!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Успешно су ажурирани уредници мапа!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Власник мапе једино може да обрише мапу." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Мапа успешно дуплирана! Ако желите да уређује мапу са другог рачунара, користите овај линк%(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Честитамо, ваша мапа је дуплирана!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Лејер успешно избрисан." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/sv/LC_MESSAGES/django.mo b/umap/locale/sv/LC_MESSAGES/django.mo index 61c6f194..3dd8d9dd 100644 Binary files a/umap/locale/sv/LC_MESSAGES/django.mo and b/umap/locale/sv/LC_MESSAGES/django.mo differ diff --git a/umap/locale/sv/LC_MESSAGES/django.po b/umap/locale/sv/LC_MESSAGES/django.po index 6c7d6e08..fc80e51c 100644 --- a/umap/locale/sv/LC_MESSAGES/django.po +++ b/umap/locale/sv/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: carlbacker, 2020,2023\n" "Language-Team: Swedish (http://app.transifex.com/openstreetmap/umap/language/sv/)\n" @@ -257,8 +257,8 @@ msgstr "Bädda in och dela din karta" msgid "And it's open source!" msgstr "Och det är öppen källkod!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Skapa en karta" @@ -301,96 +301,87 @@ msgstr "av" msgid "More" msgstr "Mer" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "Namn" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "Senast sparad " -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "Ägare" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "Åtgärder" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "Dela" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "Redigera" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "Ladda ned" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -478,11 +469,11 @@ msgstr "Senast skapade kartor " msgid "Search maps" msgstr "Sök karta" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "Sök" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "Sök i mina kartor" @@ -495,19 +486,16 @@ msgstr "" msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "Du har ingen karta än. " @@ -519,48 +507,44 @@ msgstr "Se kartan" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "Kartan har uppdaterats!" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Kartans redaktörer har uppdaterats!" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Redigeringslänken för din uMap-karta: %(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Här är din hemliga redigeringslänk: %(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "Ett mejl har skickats till %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Bara ägaren kan radera kartan." -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Din karta har kopierats! Om du vill redigera den här kartan från en annan dator, använd denna länk: %(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Grattis, din karta har kopierats!" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Lagret har raderats." -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/th_TH/LC_MESSAGES/django.mo b/umap/locale/th_TH/LC_MESSAGES/django.mo index b59e1a7b..65bde5f5 100644 Binary files a/umap/locale/th_TH/LC_MESSAGES/django.mo and b/umap/locale/th_TH/LC_MESSAGES/django.mo differ diff --git a/umap/locale/th_TH/LC_MESSAGES/django.po b/umap/locale/th_TH/LC_MESSAGES/django.po index 6bbef16d..50eec695 100644 --- a/umap/locale/th_TH/LC_MESSAGES/django.po +++ b/umap/locale/th_TH/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Krittin Leewanich, 2023\n" "Language-Team: Thai (Thailand) (http://app.transifex.com/openstreetmap/umap/language/th_TH/)\n" @@ -27,115 +27,115 @@ msgstr "แก้ไขได้ ด้วยลิงก์ลับ" msgid "Everyone can edit" msgstr "ทุนคนแก้ไขได้" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "สามารถอ่านไซต์เท่านั้น เนื่องจากมีการซ่อมบำรุง" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "ชื่อ" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "รายละเอียด" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "ลิงก์ไปยังหน้ารายละเอียดใบอนุญาต" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "แม่แบบ URL ที่ใช้ฟอร์แมตไทล์ OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "ลำดับของเลเยอร์ไทล์ในกล่องแก้ไข" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "คำอธิบาย" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "ทำให้อยู่ตรงกลาง" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "ซูม" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "ระบุตำแหน่ง" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "ระบุตำแหน่งผู้ใช้ที่กำลังโหลด?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "เลือกใบอนุญาติแผนที่" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "ใบอนุญาติ" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "เจ้าของ" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "ผู้แก้ไข" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "สถานะการแก้ไข" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "สถานะการแชร์" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "การตั้งค่า" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "โคลนของ" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "แสดงตอนโหลด" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "แสดงเลเยอร์ตอนโหลด" @@ -153,28 +153,27 @@ msgstr "เรียกดูแผนที่ของ %(current_user)s" msgid "%(current_user)s has no maps." msgstr "ไม่มีแผนที่ของ %(current_user)s" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -196,23 +195,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "โปรดเข้าสู่ระบบ" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "ชื่อผู้ใช้" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "รหัสผ่าน" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "ลงชื่อเข้าใช้" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "โปรดเลือกผู้ให้บริการ" @@ -256,8 +255,8 @@ msgstr "ฝังและแชร์แผนที่" msgid "And it's open source!" msgstr "และเป็นโอเพ่นซอร์ส!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "สร้างแผนที่" @@ -265,13 +264,13 @@ msgstr "สร้างแผนที่" msgid "Play with the demo" msgstr "เล่นกับตัวอย่างเดโม่" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -284,7 +283,7 @@ msgstr "นี่เป็นเพียงตัวอย่างสาธิ msgid "Map of the uMaps" msgstr "แผนที่จาก uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "รับแรงบันดาลใจ เรียกดูแผนที่" @@ -292,75 +291,126 @@ msgstr "รับแรงบันดาลใจ เรียกดูแผ msgid "You are logged in. Continuing..." msgstr "คุณเข้าสู่ระบบแล้ว กำลังดำเนินการต่อ..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "โดย" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "เพิ่มเติม" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "เข้าสู่ระบบ" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "ลงชื่อเข้าใช้" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "เกี่ยวกับ" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "ช่วยเหลือ" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "เปลี่ยนรหัสผ่าน" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "ออกจากระบบ" @@ -420,64 +470,78 @@ msgstr "ค้นหาแผนที่" msgid "Search" msgstr "ค้นหา" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "ดูแผนที่" -#: views.py:658 -msgid "Map has been updated!" -msgstr "อัพเดทแผนที่แล้ว!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "ผู้แก้ไขแผนที่อัปเดตสำเร็จแล้ว!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "เฉพาะเจ้าของสามารถลบแผนที่ได้เท่านั้น" -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "แผนที่ของคุณถูกโคลนแล้ว! ถ้าคุณต้องการแก้ไขแผนที่นี้จากอุปกรณ์อื่น โปรดใช้ลิงค์: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "ยินดีด้วย แผนที่ของคุณถูกโคลนแล้ว!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "ลบเลเยอร์สำเร็จแล้ว" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/tr/LC_MESSAGES/django.mo b/umap/locale/tr/LC_MESSAGES/django.mo index eaedecc3..c9aaa3fb 100644 Binary files a/umap/locale/tr/LC_MESSAGES/django.mo and b/umap/locale/tr/LC_MESSAGES/django.mo differ diff --git a/umap/locale/tr/LC_MESSAGES/django.po b/umap/locale/tr/LC_MESSAGES/django.po index 0f147bab..41999b58 100644 --- a/umap/locale/tr/LC_MESSAGES/django.po +++ b/umap/locale/tr/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Roman Neumüller, 2020\n" "Language-Team: Turkish (http://app.transifex.com/openstreetmap/umap/language/tr/)\n" @@ -29,115 +29,115 @@ msgstr "Yalnızca gizli düzenleme bağlantısı ile düzenlenebilir" msgid "Everyone can edit" msgstr "Herkes düzeltebilir" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Sitenin bakım modu olduğu için salt okunur" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "adı" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "ayrıntılar" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Lisansın detaylandırıldığı bir sayfaya bağlantı" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "URL şablonu OSM döşeme biçimini kullanıyor" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Harita katmanları sırası düzenleme kutusunda" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "açıklama" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "ortalaştır" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "yakınlaştır" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "yerini belirt" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Yüklenen kullanıcılar bulunsun mu?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Harita lisansi seç" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "lisans" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "sahibi" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "editörler" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "düzeltme durumu" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "durum paylaş" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "ayarlar" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Kopya" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "yüklerken görüntüle" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Yüklerken bu katman görüntüle" @@ -155,28 +155,27 @@ msgstr "%(current_user)s'nın haritaları görüntüle" msgid "%(current_user)s has no maps." msgstr "%(current_user)s'nın haritaları yok." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -198,23 +197,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Lütfen hesabınızla giriş yapın" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Kullanıcı adı" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Şifre" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Giriş yap" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Lütfen bir sağlayıcı seçin" @@ -258,8 +257,8 @@ msgstr "Haritanızı yerleştirin ve paylaşın" msgid "And it's open source!" msgstr "Ve üsttelik açık kaynak kodlu!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Bir harita oluştur" @@ -267,13 +266,13 @@ msgstr "Bir harita oluştur" msgid "Play with the demo" msgstr "Deneme sayfalarla oyna" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -286,7 +285,7 @@ msgstr "Bu örnek, testler ve yayın öncesi sürümler için kullanılan bir de msgid "Map of the uMaps" msgstr "uMaps'in haritası" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "İlham alın, haritalara göz atın" @@ -294,75 +293,126 @@ msgstr "İlham alın, haritalara göz atın" msgid "You are logged in. Continuing..." msgstr "Giriş tamamlandı. Devam..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "tarafından" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Daha fazla" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Oturum aç" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Katıl" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Hakkında" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Şifre değiştir" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Oturum kapat" @@ -423,64 +473,78 @@ msgstr "Harita ara" msgid "Search" msgstr "Ara" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Haritayı görüntüle" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Harita güncellendi!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Haritanın editörleri başarıyla güncellendi!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Salt haritanın sahibi haritayı silebilir." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Haritanız çoğaltıldı! Eğer bu haritayı başka bir bilgisayardan düzenlemek isterseniz, lütfen bu bağlantıyı kullanın: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Tebrikler, haritanız çoğaltıldı!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Katman başarıyla silindi" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/uk_UA/LC_MESSAGES/django.mo b/umap/locale/uk_UA/LC_MESSAGES/django.mo index 7dc32d06..c6d18cb2 100644 Binary files a/umap/locale/uk_UA/LC_MESSAGES/django.mo and b/umap/locale/uk_UA/LC_MESSAGES/django.mo differ diff --git a/umap/locale/uk_UA/LC_MESSAGES/django.po b/umap/locale/uk_UA/LC_MESSAGES/django.po index 64b5a2f6..7ae0527d 100644 --- a/umap/locale/uk_UA/LC_MESSAGES/django.po +++ b/umap/locale/uk_UA/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Сергій Дубик , 2014,2017\n" "Language-Team: Ukrainian (Ukraine) (http://app.transifex.com/openstreetmap/umap/language/uk_UA/)\n" @@ -28,115 +28,115 @@ msgstr "Редагування можливе лише за наявності msgid "Everyone can edit" msgstr "Кожен може редагувати" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "Сайт доступний лише для перегляду на час робіт з його обслуговування." -#: models.py:48 +#: models.py:50 msgid "name" msgstr "назва" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "подробиці" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Посилання на сторінку з описом ліцензії" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "шаблон посилання використовує формат шару OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Розташуйте шари мап у вікні редагування" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "опис" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "центр" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "масштаб" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "геолокація" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Використовувати геолокацію при завантаженні?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Виберіть ліцензію для мапи." -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "ліцензія" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "власник" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "редактори" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "статус редагування" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "статус спільного використання" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "налаштування" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Копія " -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "показувати при завантаженні" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Показати цей шар при завантаженні." @@ -154,28 +154,27 @@ msgstr "Перегляд мап користувача %(current_user)s" msgid "%(current_user)s has no maps." msgstr "%(current_user)s не маємап." -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "Будь ласка, увійдіть за обліковим записом" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "Користувач" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "Пароль" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "Логін" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Виберіть провайдера автентифікації" @@ -257,8 +256,8 @@ msgstr "Вбудовуйте Вашу мапу та діліться нею" msgid "And it's open source!" msgstr "І це відкрите ПЗ!" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Створити мапу" @@ -266,13 +265,13 @@ msgstr "Створити мапу" msgid "Play with the demo" msgstr "Погратися з демо-версією" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "Це демонстраційний сайт, що використов msgid "Map of the uMaps" msgstr "Мапи на uMap" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Дивіться чужі мапи та надихайтеся" @@ -293,75 +292,126 @@ msgstr "Дивіться чужі мапи та надихайтеся" msgid "You are logged in. Continuing..." msgstr "Ви увійшли. Продовжимо …" -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr " від " -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Ще" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Увійти" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Зареєструватися" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Про проект" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "Зміна паролю" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Вийти" @@ -424,64 +474,78 @@ msgstr "Пошук за мапами" msgid "Search" msgstr "Шукати" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Переглянути мапу" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Мапа оновлена!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Редактори мапи успішно оновлені!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Лише власник мапи може вилучити її." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Карта була скопійована. Якщо Ви хочете редагувати її на іншому комп’ютері, використовуйте це посилання: %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Вітаємо, Ваша мапа скопійована!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Шар вилучено." -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/vi/LC_MESSAGES/django.mo b/umap/locale/vi/LC_MESSAGES/django.mo index 6f5519cf..14ae8d58 100644 Binary files a/umap/locale/vi/LC_MESSAGES/django.mo and b/umap/locale/vi/LC_MESSAGES/django.mo differ diff --git a/umap/locale/vi/LC_MESSAGES/django.po b/umap/locale/vi/LC_MESSAGES/django.po index eada6537..f362dfbd 100644 --- a/umap/locale/vi/LC_MESSAGES/django.po +++ b/umap/locale/vi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Thanh Le Viet , 2014\n" "Language-Team: Vietnamese (http://app.transifex.com/openstreetmap/umap/language/vi/)\n" @@ -26,115 +26,115 @@ msgstr "Chỉ có thể sửa với liên kết chỉnh sửa bí mật" msgid "Everyone can edit" msgstr "Ai cũng có thể chỉnh sửa" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "tên" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "chi tiết" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "Liên kết đến trang có chi tiết về bản quyền" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "Mẫu URL sử dụng định dạng tile của OSM" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "Thứ tự các titlelayer trong hộp chỉnh sửa" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "mô tả" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "trung tâm" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "thu phóng" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "xác định" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "Xác định người dùng khi tải trang?" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "Chọn bản quyền cho bản đồ" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "bản quyền" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "chủ nhân" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "người chỉnh sửa" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "trạng thái chỉnh sửa" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "chia sẻ trạng thái" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "thiết lập" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "Sao chép của" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "hiển thị khi tải trang" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "Hiển thị layer này khi tải trang" @@ -152,28 +152,27 @@ msgstr "Xem bản đồ của %(current_user)s" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -195,23 +194,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "Hãy chọn một nhà cung cấp" @@ -255,8 +254,8 @@ msgstr "Chèn và chia sẻ bản đồ" msgid "And it's open source!" msgstr "Và nó là mã nguồn mở ! " -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "Tạo bản đồ" @@ -264,13 +263,13 @@ msgstr "Tạo bản đồ" msgid "Play with the demo" msgstr "Xem thử demo" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -283,7 +282,7 @@ msgstr "Đây là một bản demo được dùng để kiểm tra và xuất b msgid "Map of the uMaps" msgstr "Bản đồ của uMaps" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "Tham khảo các bản đồ" @@ -291,75 +290,126 @@ msgstr "Tham khảo các bản đồ" msgid "You are logged in. Continuing..." msgstr "Bạn đã đăng nhập, Đang tiếp tục..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "Thêm" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "Đăng nhập" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "Đăng nhập" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "Về" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "Thoát" @@ -419,64 +469,78 @@ msgstr "Tìm bản đồ" msgid "Search" msgstr "Tìm" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "Xem bản đồ" -#: views.py:658 -msgid "Map has been updated!" -msgstr "Bản đồ đã được cập nhật!" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "Bản đồ được cập nhật thành công!" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "Chỉ chủ nhân của bản đồ mới có quyền xóa." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "Bản đồ của bạn đã được sao chép. Nếu bạn muốn chỉnh sửa bản đồ từ máy tính khác, vui lòng sử dụng liên kết này %(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "Chúc mừng, bản đồ của bạn đã được sao chép!" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "Đã xóa layer" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/zh/LC_MESSAGES/django.mo b/umap/locale/zh/LC_MESSAGES/django.mo index 31acfb58..441dfcb9 100644 Binary files a/umap/locale/zh/LC_MESSAGES/django.mo and b/umap/locale/zh/LC_MESSAGES/django.mo differ diff --git a/umap/locale/zh/LC_MESSAGES/django.po b/umap/locale/zh/LC_MESSAGES/django.po index 86e415d5..9db39234 100644 --- a/umap/locale/zh/LC_MESSAGES/django.po +++ b/umap/locale/zh/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: sun wei , 2014\n" "Language-Team: Chinese (http://app.transifex.com/openstreetmap/umap/language/zh/)\n" @@ -28,115 +28,115 @@ msgstr "有秘密编辑链接的人可以编辑" msgid "Everyone can edit" msgstr "所有人可编辑" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:371 msgid "Inherit" msgstr "" -#: middleware.py:14 +#: middleware.py:13 msgid "Site is readonly for maintenance" msgstr "" -#: models.py:48 +#: models.py:50 msgid "name" msgstr "名称" -#: models.py:79 +#: models.py:81 msgid "details" msgstr "详细" -#: models.py:80 +#: models.py:82 msgid "Link to a page where the licence is detailed." msgstr "含有许可信息的页面链接" -#: models.py:90 +#: models.py:92 msgid "URL template using OSM tile format" msgstr "使用OSM瓦片格式的URL模板" -#: models.py:96 +#: models.py:98 msgid "Order of the tilelayers in the edit box" msgstr "编辑框内瓦片图层的顺序" -#: models.py:142 models.py:318 +#: models.py:144 models.py:372 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:145 models.py:151 models.py:373 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:146 models.py:374 msgid "Owner only" msgstr "" -#: models.py:147 +#: models.py:149 msgid "Everyone (public)" msgstr "" -#: models.py:148 +#: models.py:150 msgid "Anyone with link" msgstr "" -#: models.py:150 +#: models.py:152 msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:155 models.py:378 msgid "description" msgstr "描述" -#: models.py:154 +#: models.py:156 msgid "center" msgstr "中心" -#: models.py:155 +#: models.py:157 msgid "zoom" msgstr "缩放" -#: models.py:157 +#: models.py:159 msgid "locate" msgstr "定位" -#: models.py:157 +#: models.py:159 msgid "Locate user on load?" msgstr "是否在加载时定位用户？" -#: models.py:161 +#: models.py:163 msgid "Choose the map licence." msgstr "选择地图许可" -#: models.py:162 +#: models.py:164 msgid "licence" msgstr "许可" -#: models.py:172 +#: models.py:175 msgid "owner" msgstr "所有者" -#: models.py:176 +#: models.py:179 msgid "editors" msgstr "编辑" -#: models.py:181 models.py:338 +#: models.py:184 models.py:392 msgid "edit status" msgstr "编辑状态" -#: models.py:186 +#: models.py:189 msgid "share status" msgstr "分享状态" -#: models.py:189 models.py:333 +#: models.py:192 models.py:387 msgid "settings" msgstr "设置" -#: models.py:268 +#: models.py:320 msgid "Clone of" msgstr "复制" -#: models.py:328 +#: models.py:382 msgid "display on load" msgstr "加载时显示" -#: models.py:329 +#: models.py:383 msgid "Display this layer on load." msgstr "加载时显示该图层" @@ -154,28 +154,27 @@ msgstr "浏览%(current_user)s的所有地图" msgid "%(current_user)s has no maps." msgstr "" -#: templates/auth/user_form.html:6 templates/umap/navigation.html:12 -#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 -msgid "My Dashboard" +#: templates/auth/user_form.html:6 +msgid "My Maps" msgstr "" -#: templates/auth/user_form.html:6 +#: templates/auth/user_form.html:7 msgid "My Profile" msgstr "" -#: templates/auth/user_form.html:19 +#: templates/auth/user_form.html:20 msgid "Save" msgstr "" -#: templates/auth/user_form.html:24 +#: templates/auth/user_form.html:25 msgid "Your current providers" msgstr "" -#: templates/auth/user_form.html:30 +#: templates/auth/user_form.html:31 msgid "Connect to another provider" msgstr "" -#: templates/auth/user_form.html:32 +#: templates/auth/user_form.html:33 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." @@ -197,23 +196,23 @@ msgid "" "them in your site." msgstr "" -#: templates/registration/login.html:3 +#: templates/registration/login.html:16 msgid "Please log in with your account" msgstr "" -#: templates/registration/login.html:15 +#: templates/registration/login.html:28 msgid "Username" msgstr "" -#: templates/registration/login.html:18 +#: templates/registration/login.html:31 msgid "Password" msgstr "" -#: templates/registration/login.html:19 +#: templates/registration/login.html:32 msgid "Login" msgstr "" -#: templates/registration/login.html:24 +#: templates/registration/login.html:37 msgid "Please choose a provider" msgstr "选择提供者" @@ -257,8 +256,8 @@ msgstr "嵌入与分享地图" msgid "And it's open source!" msgstr "" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42 -#: templates/umap/user_dashboard.html:20 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "创建地图" @@ -266,13 +265,13 @@ msgstr "创建地图" msgid "Play with the demo" msgstr "试用示例" -#: templates/umap/content.html:23 +#: templates/umap/content.html:22 msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." msgstr "" -#: templates/umap/content.html:31 +#: templates/umap/content.html:30 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " @@ -285,7 +284,7 @@ msgstr "" msgid "Map of the uMaps" msgstr "uMaps的地图" -#: templates/umap/home.html:13 +#: templates/umap/home.html:14 msgid "Get inspired, browse maps" msgstr "浏览地图得灵感" @@ -293,75 +292,126 @@ msgstr "浏览地图得灵感" msgid "You are logged in. Continuing..." msgstr "已登录。继续..." -#: templates/umap/map_list.html:9 views.py:303 +#: templates/umap/map_list.html:9 views.py:341 msgid "by" msgstr "由" -#: templates/umap/map_list.html:17 templates/umap/map_table.html:39 +#: templates/umap/map_list.html:17 msgid "More" msgstr "更多" #: templates/umap/map_table.html:6 -msgid "Map" -msgstr "" - -#: templates/umap/map_table.html:7 msgid "Name" msgstr "" +#: templates/umap/map_table.html:7 +msgid "Preview" +msgstr "" + #: templates/umap/map_table.html:8 -msgid "Who can see / edit" +msgid "Who can see" msgstr "" #: templates/umap/map_table.html:9 -msgid "Last save" +msgid "Who can edit" msgstr "" #: templates/umap/map_table.html:10 -msgid "Owner" +msgid "Last save" msgstr "" #: templates/umap/map_table.html:11 +msgid "Owner" +msgstr "" + +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "" -#: templates/umap/map_table.html:28 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 +msgid "Open preview" +msgstr "" + +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "" -#: templates/umap/map_table.html:29 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "" -#: templates/umap/map_table.html:30 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "" -#: templates/umap/navigation.html:15 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 +msgid "Clone" +msgstr "" + +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 +msgid "Delete" +msgstr "" + +#: templates/umap/map_table.html:88 +msgid "first" +msgstr "" + +#: templates/umap/map_table.html:89 +msgid "previous" +msgstr "" + +#: templates/umap/map_table.html:98 +#, python-format +msgid "Page %(maps_number)s of %(num_pages)s" +msgstr "" + +#: templates/umap/map_table.html:104 +msgid "next" +msgstr "" + +#: templates/umap/map_table.html:105 +msgid "last" +msgstr "" + +#: templates/umap/map_table.html:113 +#, python-format +msgid "Lines per page: %(per_page)s" +msgstr "" + +#: templates/umap/map_table.html:118 +#, python-format +msgid "%(count)s maps" +msgstr "" + +#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 +msgid "My Dashboard" +msgstr "" + +#: templates/umap/navigation.html:13 msgid "Starred maps" msgstr "" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Log in" msgstr "登录" -#: templates/umap/navigation.html:19 +#: templates/umap/navigation.html:17 msgid "Sign in" msgstr "签到" -#: templates/umap/navigation.html:23 +#: templates/umap/navigation.html:21 msgid "About" msgstr "关于" -#: templates/umap/navigation.html:26 +#: templates/umap/navigation.html:24 msgid "Help" msgstr "" -#: templates/umap/navigation.html:31 +#: templates/umap/navigation.html:29 msgid "Change password" msgstr "" -#: templates/umap/navigation.html:35 +#: templates/umap/navigation.html:33 msgid "Log out" msgstr "退出" @@ -421,64 +471,78 @@ msgstr "搜索地图" msgid "Search" msgstr "搜索" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "" -#: templates/umap/user_dashboard.html:10 +#: templates/umap/user_dashboard.html:11 +#, python-format +msgid "My Maps (%(count)s)" +msgstr "" + +#: templates/umap/user_dashboard.html:13 msgid "My profile" msgstr "" -#: templates/umap/user_dashboard.html:20 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 +msgid "Map’s title" +msgstr "" + +#: templates/umap/user_dashboard.html:32 +#, python-format +msgid "Download %(count)s maps" +msgstr "" + +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "" -#: views.py:308 +#: views.py:346 msgid "View the map" msgstr "浏览地图" -#: views.py:658 -msgid "Map has been updated!" -msgstr "地图已更新！" +#: views.py:704 +msgid "See full screen" +msgstr "" -#: views.py:683 +#: views.py:803 msgid "Map editors updated with success!" msgstr "地图编辑员成功更新地图！" -#: views.py:721 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "" -#: views.py:724 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "" -#: views.py:730 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "" -#: views.py:741 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "只有地图所有者可以删除地图." -#: views.py:764 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "地图已复制！如果你想在其他电脑上编辑该地图，请使用以下链接:%(anonymous_url)s" -#: views.py:769 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "你的地图已复制，祝贺！" -#: views.py:958 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "图层删除成功。" -#: views.py:980 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "" diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.mo b/umap/locale/zh_TW/LC_MESSAGES/django.mo index ee612d81..74c9f98f 100644 Binary files a/umap/locale/zh_TW/LC_MESSAGES/django.mo and b/umap/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.po b/umap/locale/zh_TW/LC_MESSAGES/django.po index db6909ac..2f9856a8 100644 --- a/umap/locale/zh_TW/LC_MESSAGES/django.po +++ b/umap/locale/zh_TW/LC_MESSAGES/django.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 10:52+0000\n" +"POT-Creation-Date: 2024-02-15 13:53+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Supaplex , 2019,2023-2024\n" "Language-Team: Chinese (Taiwan) (http://app.transifex.com/openstreetmap/umap/language/zh_TW/)\n" @@ -261,8 +261,8 @@ msgstr "內嵌並分享您的地圖" msgid "And it's open source!" msgstr "而且是 開放原始碼 的！" -#: templates/umap/about_summary.html:48 templates/umap/navigation.html:40 -#: templates/umap/user_dashboard.html:41 +#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38 +#: templates/umap/user_dashboard.html:42 msgid "Create a map" msgstr "建立地圖" @@ -305,96 +305,87 @@ msgstr "由" msgid "More" msgstr "更多" -#: templates/umap/map_table.html:5 +#: templates/umap/map_table.html:6 msgid "Name" msgstr "名稱" -#: templates/umap/map_table.html:6 +#: templates/umap/map_table.html:7 msgid "Preview" msgstr "預纜" -#: templates/umap/map_table.html:7 +#: templates/umap/map_table.html:8 msgid "Who can see" msgstr "" -#: templates/umap/map_table.html:8 +#: templates/umap/map_table.html:9 msgid "Who can edit" msgstr "" -#: templates/umap/map_table.html:9 +#: templates/umap/map_table.html:10 msgid "Last save" msgstr "最後儲存" -#: templates/umap/map_table.html:10 +#: templates/umap/map_table.html:11 msgid "Owner" msgstr "擁有者" -#: templates/umap/map_table.html:11 +#: templates/umap/map_table.html:12 msgid "Actions" msgstr "動作" -#: templates/umap/map_table.html:24 templates/umap/map_table.html:26 +#: templates/umap/map_table.html:25 templates/umap/map_table.html:27 msgid "Open preview" msgstr "開啟預纜" -#: templates/umap/map_table.html:45 templates/umap/map_table.html:47 +#: templates/umap/map_table.html:46 templates/umap/map_table.html:48 msgid "Share" msgstr "分享" -#: templates/umap/map_table.html:50 templates/umap/map_table.html:52 +#: templates/umap/map_table.html:51 templates/umap/map_table.html:53 msgid "Edit" msgstr "編輯" -#: templates/umap/map_table.html:55 templates/umap/map_table.html:57 +#: templates/umap/map_table.html:56 templates/umap/map_table.html:58 msgid "Download" msgstr "下載" -#: templates/umap/map_table.html:62 templates/umap/map_table.html:64 +#: templates/umap/map_table.html:63 templates/umap/map_table.html:65 msgid "Clone" msgstr "" -#: templates/umap/map_table.html:72 templates/umap/map_table.html:74 +#: templates/umap/map_table.html:73 templates/umap/map_table.html:75 msgid "Delete" msgstr "" -#: templates/umap/map_table.html:86 +#: templates/umap/map_table.html:88 msgid "first" msgstr "第一" -#: templates/umap/map_table.html:87 +#: templates/umap/map_table.html:89 msgid "previous" msgstr "先前" -#: templates/umap/map_table.html:96 +#: templates/umap/map_table.html:98 #, python-format -msgid "" -"\n" -" Page %(maps_number)s of %(num_pages)s\n" -" " +msgid "Page %(maps_number)s of %(num_pages)s" msgstr "" -#: templates/umap/map_table.html:102 +#: templates/umap/map_table.html:104 msgid "next" msgstr "之後" -#: templates/umap/map_table.html:103 +#: templates/umap/map_table.html:105 msgid "last" msgstr "最後" -#: templates/umap/map_table.html:111 +#: templates/umap/map_table.html:113 #, python-format -msgid "" -"\n" -" Lines per page: %(per_page)s\n" -" " +msgid "Lines per page: %(per_page)s" msgstr "" -#: templates/umap/map_table.html:116 +#: templates/umap/map_table.html:118 #, python-format -msgid "" -"\n" -" %(count)s maps\n" -" " +msgid "%(count)s maps" msgstr "" #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4 @@ -481,11 +472,11 @@ msgstr "最新創建地圖" msgid "Search maps" msgstr "搜尋地圖" -#: templates/umap/search_bar.html:14 templates/umap/user_dashboard.html:25 +#: templates/umap/search_bar.html:14 msgid "Search" msgstr "搜尋" -#: templates/umap/user_dashboard.html:7 +#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26 msgid "Search my maps" msgstr "搜尋我的地圖" @@ -498,19 +489,16 @@ msgstr "" msgid "My profile" msgstr "我的個人檔案" -#: templates/umap/user_dashboard.html:21 +#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23 msgid "Map’s title" msgstr "" -#: templates/umap/user_dashboard.html:31 +#: templates/umap/user_dashboard.html:32 #, python-format -msgid "" -"\n" -" Download %(count)s maps\n" -" " +msgid "Download %(count)s maps" msgstr "" -#: templates/umap/user_dashboard.html:41 +#: templates/umap/user_dashboard.html:42 msgid "You have no map yet." msgstr "你目前還沒有地圖。" @@ -522,48 +510,44 @@ msgstr "檢視地圖" msgid "See full screen" msgstr "" -#: views.py:779 -msgid "Map has been updated!" -msgstr "地圖已經更新" - -#: views.py:804 +#: views.py:803 msgid "Map editors updated with success!" msgstr "地圖編輯者更新完成" -#: views.py:842 +#: views.py:841 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "你的地圖 uMap 編輯連結：%(map_name)s" -#: views.py:845 +#: views.py:844 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "這是你的祕密編輯連結：%(link)s" -#: views.py:851 +#: views.py:850 #, python-format msgid "Email sent to %(email)s" msgstr "電子郵件寄至 %(email)s" -#: views.py:862 +#: views.py:861 msgid "Only its owner can delete the map." msgstr "只有擁有者可以刪除此地圖" -#: views.py:890 +#: views.py:889 #, python-format msgid "" "Your map has been cloned! If you want to edit this map from another " "computer, please use this link: %(anonymous_url)s" msgstr "您的地圖已複製完成！如果您想在不同的機器編輯這個地圖，請使用這個連結：%(anonymous_url)s" -#: views.py:895 +#: views.py:894 msgid "Congratulations, your map has been cloned!" msgstr "恭喜，您的地圖已被複製！" -#: views.py:1131 +#: views.py:1130 msgid "Layer successfully deleted." msgstr "圖層已刪除" -#: views.py:1153 +#: views.py:1152 msgid "Permissions updated with success!" msgstr "權限更新完成" diff --git a/umap/migrations/0017_migrate_to_openstreetmap_oauth2.py b/umap/migrations/0017_migrate_to_openstreetmap_oauth2.py new file mode 100644 index 00000000..11285286 --- /dev/null +++ b/umap/migrations/0017_migrate_to_openstreetmap_oauth2.py @@ -0,0 +1,16 @@ +# Generated by Django 5.0.2 on 2024-02-13 14:04 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("umap", "0016_pictogram_category"), + ] + + operations = [ + migrations.RunSQL( + "UPDATE social_auth_usersocialauth " + "SET provider = 'openstreetmap-oauth2' WHERE provider = 'openstreetmap'" + ), + ] diff --git a/umap/settings/base.py b/umap/settings/base.py index f4f96332..d29d08eb 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -128,9 +128,9 @@ INSTALLED_APPS = ( DEFAULT_AUTO_FIELD = "django.db.models.AutoField" EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" -FROM_EMAIL = None +DEFAULT_FROM_EMAIL = None # https://docs.djangoproject.com/en/4.2/releases/4.1/#forms -FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer" +FORM_RENDERER = "django.forms.renderers.DjangoTemplates" # ============================================================================= # Calculation of directories relative to the project module location @@ -274,11 +274,15 @@ SOCIAL_AUTH_LOGIN_REDIRECT_URL = "/login/popup/end/" AUTHENTICATION_BACKENDS = () -SOCIAL_AUTH_OPENSTREETMAP_KEY = env("SOCIAL_AUTH_OPENSTREETMAP_KEY", default="") -SOCIAL_AUTH_OPENSTREETMAP_SECRET = env("SOCIAL_AUTH_OPENSTREETMAP_SECRET", default="") -if SOCIAL_AUTH_OPENSTREETMAP_KEY and SOCIAL_AUTH_OPENSTREETMAP_SECRET: +SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY = env( + "SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY", default="" +) +SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET = env( + "SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET", default="" +) +if SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY and SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET: AUTHENTICATION_BACKENDS += ( - "social_core.backends.openstreetmap.OpenStreetMapOAuth", + "social_core.backends.openstreetmap_oauth2.OpenStreetMapOAuth2", ) AUTHENTICATION_BACKENDS += ("django.contrib.auth.backends.ModelBackend",) diff --git a/umap/settings/local.py.sample b/umap/settings/local.py.sample index 0fe412c8..6ac3bb39 100644 --- a/umap/settings/local.py.sample +++ b/umap/settings/local.py.sample @@ -52,8 +52,8 @@ SOCIAL_AUTH_GITHUB_SCOPE = [ ] SOCIAL_AUTH_TWITTER_KEY = "xxx" SOCIAL_AUTH_TWITTER_SECRET = "xxx" -SOCIAL_AUTH_OPENSTREETMAP_KEY = "xxx" -SOCIAL_AUTH_OPENSTREETMAP_SECRET = "xxx" +SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY = "xxx" +SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET = "xxx" MIDDLEWARE += ("social_django.middleware.SocialAuthExceptionMiddleware",) SOCIAL_AUTH_REDIRECT_IS_HTTPS = True SOCIAL_AUTH_RAISE_EXCEPTIONS = False diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css index 6ad7cb07..4c4ff66f 100644 --- a/umap/static/umap/content.css +++ b/umap/static/umap/content.css @@ -77,7 +77,8 @@ body.login header { .login-grid .login-twitter-oauth2 { background-image: url("./twitter.png"); } -.login-grid .login-openstreetmap { +.login-grid .login-openstreetmap, +.login-grid .login-openstreetmap-oauth2 { background-image: url("./openstreetmap.png"); } @@ -158,6 +159,7 @@ h2.tabs a { text-decoration: underline; text-decoration-thickness: 3px; text-decoration-skip-ink: none; + text-underline-offset: 7px; margin-right: 2rem; } h2.tabs a:not(.selected) { @@ -439,8 +441,15 @@ ul.umap-autocomplete { width: 100%; } .table-wrapper table a, -.table-wrapper table thead { +.table-wrapper table thead tr th, +.table-wrapper table th[scope="row"] { color: var(--color-darkBlue); + text-align: left; + padding-left: 2px; +} +.table-wrapper table thead tr th { + line-height: 1.2; + padding: 10px 5px; } .table-wrapper table thead th:last-of-type { min-width: 240px; @@ -476,9 +485,6 @@ ul.umap-autocomplete { .table-wrapper table tbody tr:nth-child(odd) { background-color: #f4f4f4; } -.table-wrapper table td { - text-align: center; -} .table-wrapper table thead tr { line-height: 2em; } @@ -515,6 +521,7 @@ dialog::backdrop { display: flex; flex-direction: row; justify-content: space-around; + margin-bottom: 3rem; } .pagination > * { padding: 1rem; diff --git a/umap/static/umap/img/marker.svg b/umap/static/umap/img/marker.svg index 9b579a76..eefae220 100644 --- a/umap/static/umap/img/marker.svg +++ b/umap/static/umap/img/marker.svg @@ -1,4 +1,6 @@ - - - - \ No newline at end of file + + + + + + diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js index 092018d3..1dcda4b2 100644 --- a/umap/static/umap/js/umap.core.js +++ b/umap/static/umap/js/umap.core.js @@ -27,6 +27,10 @@ L.Util.setBooleanFromQueryString = (options, name) => { const value = L.Util.queryString(name) if (typeof value !== 'undefined') options[name] = value == '1' || value == 'true' } +L.Util.setNumberFromQueryString = (options, name) => { + const value = +L.Util.queryString(name) + if (!isNaN(value)) options[name] = value +} L.Util.setNullableBooleanFromQueryString = (options, name) => { let value = L.Util.queryString(name) if (typeof value !== 'undefined') { @@ -396,10 +400,28 @@ L.DomUtil.after = (target, el) => { return el } +// From https://gist.github.com/Accudio/b9cb16e0e3df858cef0d31e38f1fe46f +// convert colour in range 0-255 to the modifier used within luminance calculation +L.DomUtil.colourMod = (colour) => { + const sRGB = colour / 255 + let mod = Math.pow((sRGB + 0.055) / 1.055, 2.4) + if (sRGB < 0.03928) mod = sRGB / 12.92 + return mod +} L.DomUtil.RGBRegex = /rgb *\( *([0-9]{1,3}) *, *([0-9]{1,3}) *, *([0-9]{1,3}) *\)/ L.DomUtil.TextColorFromBackgroundColor = (el, bgcolor) => { return L.DomUtil.contrastedColor(el, bgcolor) ? '#ffffff' : '#000000' } +L.DomUtil.contrastWCAG21 = (rgb) => { + const [r, g, b] = rgb + // luminance of inputted colour + const lum = 0.2126 * L.DomUtil.colourMod(r) + 0.7152 * L.DomUtil.colourMod(g) + 0.0722 * L.DomUtil.colourMod(b) + // white has a luminance of 1 + const whiteLum = 1 + const contrast = (whiteLum + 0.05) / (lum + 0.05) + return contrast > 3 ? 1 : 0 +} + const _CACHE_CONSTRAST = {} L.DomUtil.contrastedColor = (el, bgcolor) => { // Return 0 for black and 1 for white @@ -409,8 +431,8 @@ L.DomUtil.contrastedColor = (el, bgcolor) => { let rgb = window.getComputedStyle(el).getPropertyValue('background-color') rgb = L.DomUtil.RGBRegex.exec(rgb) if (!rgb || rgb.length !== 4) return out - rgb = parseInt(rgb[1], 10) + parseInt(rgb[2], 10) + parseInt(rgb[3], 10) - if (rgb < (255 * 3) / 2) out = 1 + rgb = [parseInt(rgb[1], 10), parseInt(rgb[2], 10), parseInt(rgb[3], 10)] + out = L.DomUtil.contrastWCAG21(rgb) if (bgcolor) _CACHE_CONSTRAST[bgcolor] = out return out } diff --git a/umap/static/umap/js/umap.forms.js b/umap/static/umap/js/umap.forms.js index 380c8e9a..2d28a026 100644 --- a/umap/static/umap/js/umap.forms.js +++ b/umap/static/umap/js/umap.forms.js @@ -537,12 +537,17 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ this.on('define', this.onDefine) }, - onDefine: function () { + onDefine: async function () { this.buttons.innerHTML = '' this.footer.innerHTML = '' + const [{ pictogram_list }, response, error] = await this.builder.map.server.get( + this.builder.map.options.urls.pictogram_list_json + ) + if (!error) this.pictogram_list = pictogram_list this.buildTabs() const value = this.value() - if (!value || L.Util.isPath(value)) this.showSymbolsTab() + if (U.Icon.RECENT.length) this.showRecentTab() + else if (!value || L.Util.isPath(value)) this.showSymbolsTab() else if (L.Util.isRemoteUrl(value) || L.Util.isDataImage(value)) this.showURLTab() else this.showCharsTab() const closeButton = L.DomUtil.createButton( @@ -562,6 +567,20 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ buildTabs: function () { this.tabs.innerHTML = '' + if (U.Icon.RECENT.length) { + const recent = L.DomUtil.add( + 'button', + 'flat tab-recent', + this.tabs, + L._('Recent') + ) + L.DomEvent.on(recent, 'click', L.DomEvent.stop).on( + recent, + 'click', + this.showRecentTab, + this + ) + } const symbol = L.DomUtil.add( 'button', 'flat tab-symbols', @@ -624,12 +643,11 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ search = L.Util.normalize(this.searchInput.value), title = pictogram.attribution ? `${pictogram.name} — © ${pictogram.attribution}` - : pictogram.name + : pictogram.name || pictogram.src if (search && L.Util.normalize(title).indexOf(search) === -1) return const className = value === this.value() ? `${baseClass} selected` : baseClass, - container = L.DomUtil.create('div', className, parent), - img = L.DomUtil.create('img', '', container) - img.src = value + container = L.DomUtil.create('div', className, parent) + U.Icon.makeIconElement(value, container) container.title = title L.DomEvent.on( container, @@ -653,10 +671,10 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ this.updatePreview() }, - addCategory: function (category, items) { - const parent = L.DomUtil.create('div', 'umap-pictogram-category'), - title = L.DomUtil.add('h6', '', parent, category), - grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent) + addCategory: function (items, name) { + const parent = L.DomUtil.create('div', 'umap-pictogram-category') + if (name) L.DomUtil.add('h6', '', parent, name) + const grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent) let status = false for (let item of items) { status = this.addIconPreview(item, grid) || status @@ -676,33 +694,42 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ const sorted = Object.entries(categories).toSorted(([a], [b]) => L.Util.naturalSort(a, b) ) - for (let [category, items] of sorted) { - this.addCategory(category, items) + for (let [name, items] of sorted) { + this.addCategory(items, name) } }, - isDefault: function () { - return !this.value() || this.value() === this.obj.getMap().options.default_iconUrl + buildRecentList: function () { + this.grid.innerHTML = '' + const items = U.Icon.RECENT.map((src) => ({ + src, + })) + this.addCategory(items) }, - showSymbolsTab: async function () { - this.openTab('symbols') + isDefault: function () { + return !this.value() || this.value() === U.DEFAULT_ICON_URL + }, + + addGrid: function (onSearch) { this.searchInput = L.DomUtil.create('input', '', this.body) this.searchInput.type = 'search' this.searchInput.placeholder = L._('Search') this.grid = L.DomUtil.create('div', '', this.body) - L.DomEvent.on(this.searchInput, 'input', this.buildSymbolsList, this) - if (this.pictogram_list) { - this.buildSymbolsList() - } else { - const [{ pictogram_list }, response, error] = await this.builder.map.server.get( - this.builder.map.options.urls.pictogram_list_json - ) - if (!error) { - this.pictogram_list = pictogram_list - this.buildSymbolsList() - } - } + L.DomEvent.on(this.searchInput, 'input', onSearch, this) + }, + + showRecentTab: function () { + if (!U.Icon.RECENT.length) return + this.openTab('recent') + this.addGrid(this.buildRecentList) + this.buildRecentList() + }, + + showSymbolsTab: function () { + this.openTab('symbols') + this.addGrid(this.buildSymbolsList) + this.buildSymbolsList() }, showCharsTab: function () { @@ -989,10 +1016,7 @@ L.FormBuilder.ManageEditors = L.FormBuilder.Element.extend({ on_select: L.bind(this.onSelect, this), on_unselect: L.bind(this.onUnselect, this), } - this.autocomplete = new U.AutoComplete.Ajax.SelectMultiple( - this.parentNode, - options - ) + this.autocomplete = new U.AutoComplete.Ajax.SelectMultiple(this.parentNode, options) this._values = this.toHTML() if (this._values) for (let i = 0; i < this._values.length; i++) diff --git a/umap/static/umap/js/umap.icon.js b/umap/static/umap/js/umap.icon.js index 6393fa8a..5a0189b3 100644 --- a/umap/static/umap/js/umap.icon.js +++ b/umap/static/umap/js/umap.icon.js @@ -1,4 +1,7 @@ U.Icon = L.DivIcon.extend({ + statics: { + RECENT: [], + }, initialize: function (map, options) { this.map = map const default_options = { @@ -14,11 +17,22 @@ U.Icon = L.DivIcon.extend({ } }, + _setRecent: function (url) { + if (L.Util.hasVar(url)) return + if (url === U.DEFAULT_ICON_URL) return + if (U.Icon.RECENT.indexOf(url) === -1) { + U.Icon.RECENT.push(url) + } + }, + _getIconUrl: function (name) { let url - if (this.feature && this.feature._getIconUrl(name)) + if (this.feature && this.feature._getIconUrl(name)) { url = this.feature._getIconUrl(name) - else url = this.options[`${name}Url`] + this._setRecent(url) + } else { + url = this.options[`${name}Url`] + } return this.formatUrl(url, this.feature) }, @@ -216,13 +230,13 @@ U.Icon.setIconContrast = function (icon, parent, src, bgcolor) { * src: the raw "icon" value, can be an URL, a path, text, emoticon, etc. * bgcolor: the background color, used for caching and in case we cannot guess the * parent background color - */ + */ if (!icon) return if (L.DomUtil.contrastedColor(parent, bgcolor)) { // Decide whether to switch svg to white or not, but do it // only for internal SVG, as invert could do weird things - if (L.Util.isPath(src) && src.endsWith('.svg')) { + if (L.Util.isPath(src) && src.endsWith('.svg') && src !== U.DEFAULT_ICON_URL) { // Must be called after icon container is added to the DOM // An image icon.style.filter = 'invert(1)' diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index a2307af6..0366d4cb 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -58,62 +58,62 @@ L.Map.mergeOptions({ U.Map = L.Map.extend({ includes: [ControlsMixin], editableOptions: { - 'zoom': undefined, - 'scrollWheelZoom': Boolean, - 'scaleControl': Boolean, - 'moreControl': Boolean, - 'miniMap': Boolean, - 'displayPopupFooter': undefined, - 'onLoadPanel': String, - 'defaultView': String, - 'name': String, - 'description': String, - 'licence': undefined, - 'tilelayer': undefined, - 'overlay': undefined, - 'limitBounds': undefined, - 'color': String, - 'iconClass': String, - 'iconUrl': String, - 'smoothFactor': undefined, - 'iconOpacity': undefined, - 'opacity': undefined, - 'weight': undefined, - 'fill': undefined, - 'fillColor': undefined, - 'fillOpacity': undefined, - 'dashArray': undefined, - 'popupShape': String, - 'popupTemplate': String, - 'popupContentTemplate': String, - 'zoomTo': undefined, - 'captionBar': Boolean, - 'captionMenus': Boolean, - 'slideshow': undefined, - 'sortKey': undefined, - 'labelKey': undefined, - 'filterKey': undefined, - 'facetKey': undefined, - 'slugKey': undefined, - 'showLabel': undefined, - 'labelDirection': undefined, - 'labelInteractive': undefined, - 'outlinkTarget': undefined, - 'shortCredit': undefined, - 'longCredit': undefined, - 'permanentCredit': undefined, - 'permanentCreditBackground': undefined, - 'zoomControl': 'NullableBoolean', - 'datalayersControl': 'NullableBoolean', - 'searchControl': 'NullableBoolean', - 'locateControl': 'NullableBoolean', - 'fullscreenControl': 'NullableBoolean', - 'editinosmControl': 'NullableBoolean', - 'embedControl': 'NullableBoolean', - 'measureControl': 'NullableBoolean', - 'tilelayersControl': 'NullableBoolean', - 'starControl': 'NullableBoolean', - 'easing': undefined, + zoom: undefined, + scrollWheelZoom: Boolean, + scaleControl: Boolean, + moreControl: Boolean, + miniMap: Boolean, + displayPopupFooter: undefined, + onLoadPanel: String, + defaultView: String, + name: String, + description: String, + licence: undefined, + tilelayer: undefined, + overlay: undefined, + limitBounds: undefined, + color: String, + iconClass: String, + iconUrl: String, + smoothFactor: undefined, + iconOpacity: undefined, + opacity: undefined, + weight: undefined, + fill: undefined, + fillColor: undefined, + fillOpacity: undefined, + dashArray: undefined, + popupShape: String, + popupTemplate: String, + popupContentTemplate: String, + zoomTo: Number, + captionBar: Boolean, + captionMenus: Boolean, + slideshow: undefined, + sortKey: undefined, + labelKey: String, + filterKey: undefined, + facetKey: undefined, + slugKey: undefined, + showLabel: 'NullableBoolean', + labelDirection: undefined, + labelInteractive: undefined, + outlinkTarget: undefined, + shortCredit: undefined, + longCredit: undefined, + permanentCredit: undefined, + permanentCreditBackground: undefined, + zoomControl: 'NullableBoolean', + datalayersControl: 'NullableBoolean', + searchControl: 'NullableBoolean', + locateControl: 'NullableBoolean', + fullscreenControl: 'NullableBoolean', + editinosmControl: 'NullableBoolean', + embedControl: 'NullableBoolean', + measureControl: 'NullableBoolean', + tilelayersControl: 'NullableBoolean', + starControl: 'NullableBoolean', + easing: undefined, }, initialize: function (el, geojson) { @@ -139,6 +139,7 @@ U.Map = L.Map.extend({ this.setOptionsFromQueryString(geojson.properties) L.Map.prototype.initialize.call(this, el, geojson.properties) + U.DEFAULT_ICON_URL = this.options.default_iconUrl // After calling parent initialize, as we are doing initCenter our-selves if (geojson.geometry) this.options.center = this.latLng(geojson.geometry) @@ -322,7 +323,7 @@ U.Map = L.Map.extend({ } }) - window.onbeforeunload = () => this.editEnabled && this.isDirty || null + window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null this.backup() this.initContextMenu() this.on('click contextmenu.show', this.closeInplaceToolbar) @@ -342,8 +343,12 @@ U.Map = L.Map.extend({ case 'NullableBoolean': L.Util.setNullableBooleanFromQueryString(options, key) break + case Number: + L.Util.setNumberFromQueryString(options, key) + break case String: L.Util.setFromQueryString(options, key) + break } } // Specific case for datalayersControl @@ -396,7 +401,7 @@ U.Map = L.Map.extend({ this._controls.search = new U.SearchControl() this._controls.embed = new L.Control.Embed(this, this.options.embedOptions) this._controls.tilelayersChooser = new U.TileLayerChooser(this) - this._controls.star = new U.StarControl(this) + if (this.options.user) this._controls.star = new U.StarControl(this) this._controls.editinosm = new L.Control.EditInOSM({ position: 'topleft', widgetOptions: { @@ -463,6 +468,7 @@ U.Map = L.Map.extend({ status = this.options[`${name}Control`] if (status === false) continue control = this._controls[name] + if (!control) continue control.addTo(this) if (status === undefined || status === null) L.DomUtil.addClass(control._container, 'display-on-more') @@ -566,12 +572,7 @@ U.Map = L.Map.extend({ if (key === U.Keys.E && modifierKey && !this.editEnabled) { L.DomEvent.stop(e) this.enableEdit() - } else if ( - key === U.Keys.E && - modifierKey && - this.editEnabled && - !this.isDirty - ) { + } else if (key === U.Keys.E && modifierKey && this.editEnabled && !this.isDirty) { L.DomEvent.stop(e) this.disableEdit() this.ui.closePanel() @@ -1129,7 +1130,7 @@ U.Map = L.Map.extend({ } }, - sendEditLink: function () { + sendEditLink: async function () { const input = this.ui._alert.querySelector('input') const email = input.value @@ -1137,29 +1138,25 @@ U.Map = L.Map.extend({ formData.append('email', email) const url = this.urls.get('map_send_edit_link', { map_id: this.options.umap_id }) - this.post(url, { - data: formData, - }) + await this.server.post(url, {}, formData) }, - star: function () { + star: async function () { if (!this.options.umap_id) return this.ui.alert({ content: L._('Please save the map first'), level: 'error', }) const url = this.urls.get('map_star', { map_id: this.options.umap_id }) - this.post(url, { - context: this, - callback: function (data) { - this.options.starred = data.starred - let msg = data.starred - ? L._('Map has been starred') - : L._('Map has been unstarred') - this.ui.alert({ content: msg, level: 'info' }) - this.renderControls() - }, - }) + const [data, response, error] = await this.server.post(url) + if (!error) { + this.options.starred = data.starred + let msg = data.starred + ? L._('Map has been starred') + : L._('Map has been unstarred') + this.ui.alert({ content: msg, level: 'info' }) + this.renderControls() + } }, geometry: function () { diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js index 5031479a..8fd86b97 100644 --- a/umap/static/umap/js/umap.layer.js +++ b/umap/static/umap/js/umap.layer.js @@ -1458,7 +1458,10 @@ U.DataLayer = L.Evented.extend({ zoomTo: function () { if (!this.isVisible()) return const bounds = this.layer.getBounds() - if (bounds.isValid()) this.map.fitBounds(bounds) + if (bounds.isValid()) { + const options = {maxZoom: this.getOption("zoomTo")} + this.map.fitBounds(bounds, options) + } }, // Is this layer type browsable in theorie diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js index 6c85ba57..0ab65b1e 100644 --- a/umap/static/umap/js/umap.popup.js +++ b/umap/static/umap/js/umap.popup.js @@ -96,6 +96,7 @@ U.Popup.Panel = U.Popup.extend({ _updateLayout: function () {}, _updatePosition: function () {}, _adjustPan: function () {}, + _animateZoom: function () {}, }) U.Popup.SimplePanel = U.Popup.Panel // Retrocompat. diff --git a/umap/static/umap/js/umap.tableeditor.js b/umap/static/umap/js/umap.tableeditor.js index 4a664705..19cafbed 100644 --- a/umap/static/umap/js/umap.tableeditor.js +++ b/umap/static/umap/js/umap.tableeditor.js @@ -46,7 +46,6 @@ U.TableEditor = L.Class.extend({ }) this.datalayer.deindexProperty(property) this.datalayer.indexProperty(newName) - this.resetProperties() this.edit() } L.DomEvent.on(del, 'click', doDelete, this) @@ -63,6 +62,7 @@ U.TableEditor = L.Class.extend({ }, compileProperties: function () { + this.resetProperties() if (this.properties.length === 0) this.properties = ['name'] // description is a forced textarea, don't edit it in a text input, or you lose cariage returns if (this.properties.indexOf('description') !== -1) diff --git a/umap/static/umap/locale/en.js b/umap/static/umap/locale/en.js index 312f1b40..12f0550e 100644 --- a/umap/static/umap/locale/en.js +++ b/umap/static/umap/locale/en.js @@ -431,7 +431,14 @@ const locale = { "Type a place name or coordinates": "Type a place name or coordinates", "copy": "copy", "full backup": "full backup", - "settings": "settings" + "settings": "settings", + "Action not allowed :(": "Action not allowed :(", + "Bring feature to center": "Bring feature to center", + "Current map view": "Current map view", + "Features in this layer: {count}": "Features in this layer: {count}", + "Filter": "Filter", + "Problem in the response": "Problem in the response", + "Recent": "Recent" } L.registerLocale("en", locale) L.setLocale("en") diff --git a/umap/static/umap/locale/en.json b/umap/static/umap/locale/en.json index 8545b8a8..f6170017 100644 --- a/umap/static/umap/locale/en.json +++ b/umap/static/umap/locale/en.json @@ -431,5 +431,12 @@ "Type a place name or coordinates": "Type a place name or coordinates", "copy": "copy", "full backup": "full backup", - "settings": "settings" + "settings": "settings", + "Action not allowed :(": "Action not allowed :(", + "Bring feature to center": "Bring feature to center", + "Current map view": "Current map view", + "Features in this layer: {count}": "Features in this layer: {count}", + "Filter": "Filter", + "Problem in the response": "Problem in the response", + "Recent": "Recent" } \ No newline at end of file diff --git a/umap/static/umap/locale/fr.js b/umap/static/umap/locale/fr.js index 2ed523ff..5e982bf0 100644 --- a/umap/static/umap/locale/fr.js +++ b/umap/static/umap/locale/fr.js @@ -431,7 +431,14 @@ const locale = { "Type a place name or coordinates": "Entrer un lieu ou des coordonnées", "copy": "copier", "full backup": "sauvegarde complète", - "settings": "paramètres" + "settings": "paramètres", + "Action not allowed :(": "Action non autorisée :(", + "Bring feature to center": "Centrer la carte sur cet élément", + "Current map view": "Lister seulement les éléments visibles", + "Features in this layer: {count}": "Éléments dans ce calque: {count}", + "Filter": "Filtrer", + "Problem in the response": "Problème dans la réponse du serveur", + "Recent": "Récents" } L.registerLocale("fr", locale) L.setLocale("fr") diff --git a/umap/static/umap/locale/fr.json b/umap/static/umap/locale/fr.json index 0f584876..935b9d11 100644 --- a/umap/static/umap/locale/fr.json +++ b/umap/static/umap/locale/fr.json @@ -431,5 +431,12 @@ "Type a place name or coordinates": "Entrer un lieu ou des coordonnées", "copy": "copier", "full backup": "sauvegarde complète", - "settings": "paramètres" + "settings": "paramètres", + "Action not allowed :(": "Action non autorisée :(", + "Bring feature to center": "Centrer la carte sur cet élément", + "Current map view": "Lister seulement les éléments visibles", + "Features in this layer: {count}": "Éléments dans ce calque: {count}", + "Filter": "Filtrer", + "Problem in the response": "Problème dans la réponse du serveur", + "Recent": "Récents" } \ No newline at end of file diff --git a/umap/static/umap/locale/hu.js b/umap/static/umap/locale/hu.js index eb0f4618..ac1dc189 100644 --- a/umap/static/umap/locale/hu.js +++ b/umap/static/umap/locale/hu.js @@ -431,7 +431,14 @@ const locale = { "Type a place name or coordinates": "Helynév vagy koordináták megadása", "copy": "másolás", "full backup": "teljes biztonsági másolat", - "settings": "beállítások" + "settings": "beállítások", + "Action not allowed :(": "Nem engedélyezett művelet :(", + "Bring feature to center": "Objektum középre hozása", + "Current map view": "Jelenlegi térképnézet", + "Features in this layer: {count}": "Objektumok ezen a rétegen: {count}", + "Filter": "Szűrő", + "Problem in the response": "Hiba a válaszban", + "Recent": "Legutóbbi" } L.registerLocale("hu", locale) L.setLocale("hu") diff --git a/umap/static/umap/locale/hu.json b/umap/static/umap/locale/hu.json index dd59094f..0246b5d5 100644 --- a/umap/static/umap/locale/hu.json +++ b/umap/static/umap/locale/hu.json @@ -431,5 +431,12 @@ "Type a place name or coordinates": "Helynév vagy koordináták megadása", "copy": "másolás", "full backup": "teljes biztonsági másolat", - "settings": "beállítások" + "settings": "beállítások", + "Action not allowed :(": "Nem engedélyezett művelet :(", + "Bring feature to center": "Objektum középre hozása", + "Current map view": "Jelenlegi térképnézet", + "Features in this layer: {count}": "Objektumok ezen a rétegen: {count}", + "Filter": "Szűrő", + "Problem in the response": "Hiba a válaszban", + "Recent": "Legutóbbi" } \ No newline at end of file diff --git a/umap/static/umap/locale/it.js b/umap/static/umap/locale/it.js index 9ac6ef08..b5c412ca 100644 --- a/umap/static/umap/locale/it.js +++ b/umap/static/umap/locale/it.js @@ -399,39 +399,46 @@ const locale = { "Number of desired classes (default 5)": "Numero di classi desiderate (default 5)", "Quantiles": "Quantili", "Show this layer in the caption": "Mostra questo livello nella didascalia", - "Back to preview": "Back to preview", - "Drawing": "Drawing", - "Edit the title of the map": "Edit the title of the map", - "Go to the homepage": "Go to the homepage", - "Switch to edit mode": "Switch to edit mode", - "Update who can see and edit the map": "Update who can see and edit the map", - "View": "View", - "Add image URL": "Add image URL", - "Emoji & Character": "Emoji & Character", - "Generic": "Generic", - "Symbol": "Symbol", - "Type char or paste emoji": "Type char or paste emoji", + "Back to preview": "Torna all’anteprima", + "Drawing": "Disegno", + "Edit the title of the map": "Modifica il titolo della mappa", + "Go to the homepage": "Vai all’homepage", + "Switch to edit mode": "Passa alla modalità modifica", + "Update who can see and edit the map": "Cambia chi può vedere e modificare la mappa", + "View": "Vedi", + "Add image URL": "Aggiungi URL immagine", + "Emoji & Character": "Emoji & caratteri", + "Generic": "Generico", + "Symbol": "Simbolo", + "Type char or paste emoji": "Inserisci carattere o incolla emoji", "URL": "URL", - "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.", - "Save map": "Save map", - "Toggle edit mode": "Toggle edit mode", - "All data and settings of the map": "All data and settings of the map", - "Embed and link options": "Embed and link options", - "Go to \"{coords}\"": "Go to \"{coords}\"", - "Link to view the map": "Link to view the map", + "If false, the polygon or line will act as a part of the underlying map.": "Se falso, il poligono o la linea si comporterà come parte della mappa sottostante.", + "Save map": "Salva mappa", + "Toggle edit mode": "Commuta modalità di modifica", + "All data and settings of the map": "Tutti i dati e le impostazioni della mappa", + "Embed and link options": "Opzioni di inclusione e collegamento", + "Go to \"{coords}\"": "Vai a “{coords}”", + "Link to view the map": "Collega per vedere la mappa", "No.": "No.", - "Only visible layers' data": "Only visible layers' data", - "Open share & download panel": "Open share & download panel", + "Only visible layers' data": "Solo i dati dei livelli visibili", + "Open share & download panel": "Apri pannello di condivisione & scarico", "OpenStreetMap": "OpenStreetMap", - "See on OpenStreetMap": "See on OpenStreetMap", - "Share and download": "Share and download", - "Share this link to open a customized map view": "Share this link to open a customized map view", - "Short link": "Short link", - "Street": "Street", - "Type a place name or coordinates": "Type a place name or coordinates", - "copy": "copy", - "full backup": "full backup", - "settings": "settings" + "See on OpenStreetMap": "Vedi su OpenStreetMap", + "Share and download": "Condividi e scarica", + "Share this link to open a customized map view": "Condividi questo link per aprire una vista personalizzata della mappa", + "Short link": "Collegamento corto", + "Street": "Strada", + "Type a place name or coordinates": "Inserisci il nome di un luogo o delle coordinate", + "copy": "copia", + "full backup": "backup completo", + "settings": "impostazioni", + "Action not allowed :(": "Azione non permessa :(", + "Bring feature to center": "Sposta l’oggetto al centro", + "Current map view": "Vista della mappa corrente", + "Features in this layer: {count}": "Oggetti in questo livello: {count}", + "Filter": "Filtro", + "Problem in the response": "Problema nella risposta", + "Recent": "Recente" } L.registerLocale("it", locale) L.setLocale("it") diff --git a/umap/static/umap/locale/it.json b/umap/static/umap/locale/it.json index c6631715..3fd2e589 100644 --- a/umap/static/umap/locale/it.json +++ b/umap/static/umap/locale/it.json @@ -399,37 +399,44 @@ "Number of desired classes (default 5)": "Numero di classi desiderate (default 5)", "Quantiles": "Quantili", "Show this layer in the caption": "Mostra questo livello nella didascalia", - "Back to preview": "Back to preview", - "Drawing": "Drawing", - "Edit the title of the map": "Edit the title of the map", - "Go to the homepage": "Go to the homepage", - "Switch to edit mode": "Switch to edit mode", - "Update who can see and edit the map": "Update who can see and edit the map", - "View": "View", - "Add image URL": "Add image URL", - "Emoji & Character": "Emoji & Character", - "Generic": "Generic", - "Symbol": "Symbol", - "Type char or paste emoji": "Type char or paste emoji", + "Back to preview": "Torna all’anteprima", + "Drawing": "Disegno", + "Edit the title of the map": "Modifica il titolo della mappa", + "Go to the homepage": "Vai all’homepage", + "Switch to edit mode": "Passa alla modalità modifica", + "Update who can see and edit the map": "Cambia chi può vedere e modificare la mappa", + "View": "Vedi", + "Add image URL": "Aggiungi URL immagine", + "Emoji & Character": "Emoji & caratteri", + "Generic": "Generico", + "Symbol": "Simbolo", + "Type char or paste emoji": "Inserisci carattere o incolla emoji", "URL": "URL", - "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.", - "Save map": "Save map", - "Toggle edit mode": "Toggle edit mode", - "All data and settings of the map": "All data and settings of the map", - "Embed and link options": "Embed and link options", - "Go to \"{coords}\"": "Go to \"{coords}\"", - "Link to view the map": "Link to view the map", + "If false, the polygon or line will act as a part of the underlying map.": "Se falso, il poligono o la linea si comporterà come parte della mappa sottostante.", + "Save map": "Salva mappa", + "Toggle edit mode": "Commuta modalità di modifica", + "All data and settings of the map": "Tutti i dati e le impostazioni della mappa", + "Embed and link options": "Opzioni di inclusione e collegamento", + "Go to \"{coords}\"": "Vai a “{coords}”", + "Link to view the map": "Collega per vedere la mappa", "No.": "No.", - "Only visible layers' data": "Only visible layers' data", - "Open share & download panel": "Open share & download panel", + "Only visible layers' data": "Solo i dati dei livelli visibili", + "Open share & download panel": "Apri pannello di condivisione & scarico", "OpenStreetMap": "OpenStreetMap", - "See on OpenStreetMap": "See on OpenStreetMap", - "Share and download": "Share and download", - "Share this link to open a customized map view": "Share this link to open a customized map view", - "Short link": "Short link", - "Street": "Street", - "Type a place name or coordinates": "Type a place name or coordinates", - "copy": "copy", - "full backup": "full backup", - "settings": "settings" + "See on OpenStreetMap": "Vedi su OpenStreetMap", + "Share and download": "Condividi e scarica", + "Share this link to open a customized map view": "Condividi questo link per aprire una vista personalizzata della mappa", + "Short link": "Collegamento corto", + "Street": "Strada", + "Type a place name or coordinates": "Inserisci il nome di un luogo o delle coordinate", + "copy": "copia", + "full backup": "backup completo", + "settings": "impostazioni", + "Action not allowed :(": "Azione non permessa :(", + "Bring feature to center": "Sposta l’oggetto al centro", + "Current map view": "Vista della mappa corrente", + "Features in this layer: {count}": "Oggetti in questo livello: {count}", + "Filter": "Filtro", + "Problem in the response": "Problema nella risposta", + "Recent": "Recente" } \ No newline at end of file diff --git a/umap/static/umap/nav.css b/umap/static/umap/nav.css index 1cb46488..3c754d3f 100644 --- a/umap/static/umap/nav.css +++ b/umap/static/umap/nav.css @@ -66,6 +66,7 @@ footer .i18n_switch { .umap-nav .button:hover { text-decoration: none; min-width: 150px; + margin-left: 1rem; } @media only screen and (min-width: 500px) { diff --git a/umap/storage.py b/umap/storage.py index 90764373..3ece91dc 100644 --- a/umap/storage.py +++ b/umap/storage.py @@ -41,8 +41,9 @@ class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage): def post_process(self, paths, **options): collected = super().post_process(paths, **options) for original_path, processed_path, processed in collected: - if not processed_path: - print("Unused or missing file?", original_path) + if isinstance(processed, Exception): + print("Error with file", original_path) + raise processed if processed_path.endswith(".js"): path = Path(settings.STATIC_ROOT) / processed_path initial = path.read_text() diff --git a/umap/templates/umap/map_detail.html b/umap/templates/umap/map_detail.html index 22f272c5..4252ca60 100644 --- a/umap/templates/umap/map_detail.html +++ b/umap/templates/umap/map_detail.html @@ -17,12 +17,11 @@ {% umap_js locale=locale %} {% if object.share_status != object.PUBLIC %}{% endif %} {% endblock extra_head %} {% block content %} {% block map_init %} {% include "umap/map_init.html" %} {% endblock map_init %} - {% include "umap/map_messages.html" %} {% endblock content %} diff --git a/umap/templates/umap/map_init.html b/umap/templates/umap/map_init.html index 91713b35..f3701593 100644 --- a/umap/templates/umap/map_init.html +++ b/umap/templates/umap/map_init.html @@ -2,9 +2,16 @@
diff --git a/umap/templates/umap/map_messages.html b/umap/templates/umap/map_messages.html deleted file mode 100644 index edeb3e3a..00000000 --- a/umap/templates/umap/map_messages.html +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/umap/templates/umap/map_table.html b/umap/templates/umap/map_table.html index 1a0b87c7..56309a4c 100644 --- a/umap/templates/umap/map_table.html +++ b/umap/templates/umap/map_table.html @@ -16,9 +16,9 @@ {% for map_inst in maps %} {% with unique_id="map_"|addstr:map_inst.pk %} - + {{ map_inst.name }} - + {{ map_inst.preview_settings|json_script:unique_id }}