Translations update for 2.9

.github/workflows/locale-and-website.yml

@@ -114,7 +114,7 @@ jobs:
           if [[ "${{ env.BRANCH }}" == "develop" ]]; then
             FOLDER_NAME="dev"
           elif [[ "${{ env.BRANCH }}" == "main" ]]; then
-            FOLDER_NAME="2.8"
+            FOLDER_NAME="2.9"
           fi
           git checkout -f origin/gh-pages
           git checkout -b gh-pages

CMakeLists.txt

@@ -25,7 +25,7 @@ set(COPYRIGHT "2010-2023 pgRouting Developers")
 set(PGR_WORKSHOP_VERSION_MAJOR "2")
 set(PGR_WORKSHOP_VERSION_MINOR "9")
 set(PGR_WORKSHOP_VERSION_PATCH "0")
-set(PGR_WORKSHOP_VERSION_DEV "dev")
+set(PGR_WORKSHOP_VERSION_DEV "")
 set(PGR_WORKSHOP_VERSION "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}")
 set(PGR_WORKSHOP_RELEASE "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}.${PGR_WORKSHOP_VERSION_PATCH}${PGR_WORKSHOP_VERSION_DEV}")
 set(PGR_WORKSHOP_NAME "pgRouting workshop")

docs/basic/data.rst

@@ -30,7 +30,7 @@ pgRouting is installed as extension. This requires:
 These requirements are met on OSGeoLive. When the required software is installed, open a terminal window by pressing :code:`ctrl-alt-t` and follow the instructions.
 Information about installing OSGeoLive can be found on :doc:`../general-intro/osgeolive`.
 
-.. note:: If OSGeoLive is not being used, please refer to the chapter's appendix to set up the user "user".
+.. note:: If OSGeoLive is not being used, please refer to the chapter's appendix to set up the user ``user``.
 
 Create a pgRouting compatible database
 -------------------------------------------------------------------------------
@@ -51,7 +51,7 @@ Get the Workshop Data
 .. TODO get date
 
 The pgRouting workshop will make use of OpenStreetMap data, which is already
-available on `OSGeoLive <http://live.osgeo.org>`_. This workshop will use the
+available on `OSGeoLive <https://live.osgeo.org>`_. This workshop will use the
 ``@PGR_WORKSHOP_CITY@`` city data and is a snapshot of @DATE_OF_DATA@.
 
 Getting the data
@@ -95,7 +95,7 @@ More information about how to download OpenStreetMap data can be found in
 https://wiki.openstreetmap.org/wiki/Downloading_data
 
 An alternative for very large areas is to use the download services of
-`Geofabrik <http://download.geofabrik.de>`_.
+`Geofabrik <https://download.geofabrik.de>`_.
 
 
 Upload data to the database
@@ -148,7 +148,7 @@ Chapter: Appendix
 ===============================================================================
 
 
-OSGeoLive's account name on the database is ``"user"``. To easily use the workshop when not using
+OSGeoLive's account name on the database is ``user``. To easily use the workshop when not using
 OSGeoLive this extra steps are needed:
 
 .. code-block:: bash

docs/basic/pedestrian.rst

@@ -25,7 +25,7 @@ pgr_dijkstra
 -------------------------------------------------------------------------------
 
 Dijkstra algorithm was the first algorithm implemented in pgRouting. It doesn't
-require other attributes than ``id``, ``source`` and ``target`` ID and ``cost``
+require other attributes than the identifiers ``id``, ``source`` and ``target`` and the weights ``cost``
 and ``reverse_cost``.
 
 You can specify when to consider the graph as `directed
@@ -90,11 +90,11 @@ Get the vertex identifiers
 .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_0.txt
   :linenos:
 
-* |osmid_1| |place_1|  (|id_1|)
-* |osmid_2| |place_2|  (|id_2|)
-* |osmid_3| |place_3|  (|id_3|)
-* |osmid_4| |place_4|  (|id_4|)
-* |osmid_5| |place_5|  (|id_5|)
+* |osmid_1| |place_1| (|id_1|)
+* |osmid_2| |place_2| (|id_2|)
+* |osmid_3| |place_3| (|id_3|)
+* |osmid_4| |place_4| (|id_4|)
+* |osmid_5| |place_5| (|id_5|)
 
 
 The corresponding :code:`id` are shown in the following image, and a sample route from

docs/basic/plpgsql_function.rst

@@ -38,10 +38,10 @@ The detailed description:
 Column        type        Description
 ============  ==========  ===
 edges_subset  REGCLASS    Edge table name identifier.
-lat1          NUMERIC     The latitude of the `departure`  point.
-lon1          NUMERIC     The longitude of the `departure`  point.
-lat2          NUMERIC     The latitude of the `destination`  point.
-lon2          NUMERIC     The longitude of the `destination`  point.
+lat1          NUMERIC     The latitude of the `departure` point.
+lon1          NUMERIC     The longitude of the `departure` point.
+lat2          NUMERIC     The latitude of the `destination` point.
+lon2          NUMERIC     The longitude of the `destination` point.
 do_debug      BOOLEAN     Flag to create a ``WARNING`` with the query that is been executed
 ============  ==========  ===
 
@@ -246,7 +246,7 @@ Exercise 3: Nearest Vertex
 
 * Calculate the OSM identifier of the nearest vertex to a point.
 
-In particular use the following (lat,lon) value:  ``(@POINT1_LAT@, @POINT1_LON@)``.
+In particular use the following (lat,lon) value: ``(@POINT1_LAT@, @POINT1_LON@)``.
 
 * calculate the nearest OSM identifier of the vertex to:
 
@@ -387,7 +387,7 @@ Exercise 5: Test nearest vertex function
 
 * Test the ``wrk_NearestOSM`` function.
 
-In particular use the following (lat,lon) values:  ``(@POINT1_LAT@, @POINT1_LON@)``.
+In particular use the following (lat,lon) values: ``(@POINT1_LAT@, @POINT1_LON@)``.
 
 * The point is the same as in `Exercise 3: Nearest Vertex`_ problem.
 
@@ -566,8 +566,8 @@ Use ``wrk_fromAtoB``
 * For ``vehicle_net``:
 
   * The first parameter is the table name. (line **2**)
-  * The next  two parameters are the latitude and longitude of the departure point. (line **3**)
-  * The next  two parameters are the latitude and longitude of the destination point. (line **4**)
+  * The next two parameters are the latitude and longitude of the departure point. (line **3**)
+  * The next two parameters are the latitude and longitude of the destination point. (line **4**)
 
   .. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql
     :language: sql

docs/interactions/chapter-10.rst

@@ -13,17 +13,17 @@ WMS server with GeoServer
 ===============================================================================
 
 Now that we have a pl/pgsql wrapper, we will make it available as a WMS layer
-using `GeoServer <http://geoserver.org/>`_.
+using `GeoServer <https://geoserver.org/>`_.
 
 The installation of GeoServer is out of the scope of this workshop, but if
-you're using the `OSGeo Live <http://live.osgeo.org>`_ for this workshop then
+you're using the `OSGeoLive <https://live.osgeo.org>`_ for this workshop then
 you have GeoServer installed already.
 
 Connect to the administration page
 -------------------------------------------------------------------------------
 
 In order to create the WMS layer, we need to connect to the administration
-interface of GeoServer. On `OSGeo LiveDVD <http://live.osgeo.org>`_ Desktop,
+interface of GeoServer. On `OSGeoLive <https://live.osgeo.org>`_ Desktop,
 open the *Applications* menu on the desktop and then *Geospatial* > *Web Services* > *GeoServer* > *Start GeoServer*.
 
 Once the server is up and running, open the `administration page
@@ -48,7 +48,7 @@ left menu of the page, inside the *Data* section, click *Workspaces* and then
 Fill the form with:
 
 :Name: ``pgrouting``
-:Namespace URI: ``http://pgrouting.org``
+:Namespace URI: ``https://pgrouting.org``
 
 And press the ``submit`` button.
 

docs/interactions/chapter-11.rst

@@ -53,7 +53,7 @@ open it with a web browser.
   :language: html
 
 .. note::
-  This workshop assumes, that you use OSGeo Live, which includes the OpenLayers
+  This workshop assumes, that you use OSGeoLive, which includes the OpenLayers
   Javascript library accessible under the following URL: http://localhost/openlayers/dist/
   If you don't use OSGeo Live for this workshop, you need to adjust the URL to
   OpenLayers Javascript and CSS file.

docs/interactions/chapter-9.rst

@@ -66,17 +66,12 @@ locate the nearest vertex to a lat/lon location.
           :height: 100pt
           :align: Left
 
-   **Name**      city_routing
-
-   **Host**       localhost
-
-   **Port**       5432
-
-   **Database**   city_routing
-
-   **User name**  user
-
-   **Password**   user
+   :Name: ``city_routing``
+   :Host: ``localhost``
+   :Port: ``5432``
+   :Database: ``city_routing``
+   :User name: ``user``
+   :Password: ``user``
 
 #. Allow qgis to remember login and password
 

docs/un_sdg/data.rst

@@ -37,7 +37,7 @@ pgRouting is pre-installed as an extension which requires:
 
 These requirements are met on OSGeoLive. When the required software is
 installed, open a terminal window by pressing ``ctrl-alt-t`` and follow the
-instructions.  Information about installing OSGeoLive can be found in
+instructions. Information about installing OSGeoLive can be found in
 :doc:`../general-intro/osgeolive` of this workshop.
 
 .. note:: If you don't have pgRouting installed. You can find the installation
@@ -232,7 +232,7 @@ Bangladesh.
     :language: bash
     :linenos:
 
-See  :ref:`basic/data:Option 3) Download using Overpass XAPI`
+See :ref:`basic/data:Option 3) Download using Overpass XAPI`
 
 Upload Bangladesh data to the database
 -------------------------------------------------------------------------------

locale/en/LC_MESSAGES/basic/data.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-29 15:35+0000\n"
+"POT-Creation-Date: 2024-03-22 11:12-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.14.0\n"
 
 #: ../../build/docs/basic/data.rst:12
 msgid "Prepare Data"
@@ -59,7 +59,7 @@ msgstr ""
 #: ../../build/docs/basic/data.rst:33
 msgid ""
 "If OSGeoLive is not being used, please refer to the chapter's appendix to"
-" set up the user \"user\"."
+" set up the user ``user``."
 msgstr ""
 
 #: ../../build/docs/basic/data.rst:36
@@ -83,8 +83,8 @@ msgstr ""
 #: ../../build/docs/basic/data.rst:53
 msgid ""
 "The pgRouting workshop will make use of OpenStreetMap data, which is "
-"already available on `OSGeoLive <http://live.osgeo.org>`_. This workshop "
-"will use the ``Prizren`` city data and is a snapshot of March 2023."
+"already available on `OSGeoLive <https://live.osgeo.org>`_. This workshop"
+" will use the ``Prizren`` city data and is a snapshot of March 2023."
 msgstr ""
 
 #: ../../build/docs/basic/data.rst:58
@@ -127,7 +127,7 @@ msgstr ""
 #: ../../build/docs/basic/data.rst:97
 msgid ""
 "An alternative for very large areas is to use the download services of "
-"`Geofabrik <http://download.geofabrik.de>`_."
+"`Geofabrik <https://download.geofabrik.de>`_."
 msgstr ""
 
 #: ../../build/docs/basic/data.rst:102
@@ -188,7 +188,7 @@ msgstr ""
 
 #: ../../build/docs/basic/data.rst:151
 msgid ""
-"OSGeoLive's account name on the database is ``\"user\"``. To easily use "
-"the workshop when not using OSGeoLive this extra steps are needed:"
+"OSGeoLive's account name on the database is ``user``. To easily use the "
+"workshop when not using OSGeoLive this extra steps are needed:"
 msgstr ""
 

locale/en/LC_MESSAGES/basic/pedestrian.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-29 15:35+0000\n"
+"POT-Creation-Date: 2024-03-22 11:12-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.14.0\n"
 
 #: ../../build/docs/basic/pedestrian.rst:11
 msgid "Pedestrian Routing"
@@ -42,8 +42,8 @@ msgstr ""
 #: ../../build/docs/basic/pedestrian.rst:27
 msgid ""
 "Dijkstra algorithm was the first algorithm implemented in pgRouting. It "
-"doesn't require other attributes than ``id``, ``source`` and ``target`` "
-"ID and ``cost`` and ``reverse_cost``."
+"doesn't require other attributes than the identifiers ``id``, ``source`` "
+"and ``target`` and the weights ``cost`` and ``reverse_cost``."
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:31
@@ -125,23 +125,23 @@ msgid "Get the vertex identifiers"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:93
-msgid "|osmid_1| |place_1|  (|id_1|)"
+msgid "|osmid_1| |place_1| (|id_1|)"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:94
-msgid "|osmid_2| |place_2|  (|id_2|)"
+msgid "|osmid_2| |place_2| (|id_2|)"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:95
-msgid "|osmid_3| |place_3|  (|id_3|)"
+msgid "|osmid_3| |place_3| (|id_3|)"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:96
-msgid "|osmid_4| |place_4|  (|id_4|)"
+msgid "|osmid_4| |place_4| (|id_4|)"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:97
-msgid "|osmid_5| |place_5|  (|id_5|)"
+msgid "|osmid_5| |place_5| (|id_5|)"
 msgstr ""
 
 #: ../../build/docs/basic/pedestrian.rst:100