diff --git a/locale/en/LC_MESSAGES/basic/appendix.po b/locale/en/LC_MESSAGES/basic/appendix.po index 36fe2df0..e5911134 100644 --- a/locale/en/LC_MESSAGES/basic/appendix.po +++ b/locale/en/LC_MESSAGES/basic/appendix.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-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -72,8 +72,8 @@ msgstr "" #: ../../build/docs/basic/appendix.rst:51 msgid "" -":ref:`basic/pedestrian:Exercise 5: Many Pedestrians going to different " -"destinations returning aggregate costs`" +":ref:`basic/pedestrian:Exercise 5: Time for many Pedestrians going to " +"different destinations`" msgstr "" #: ../../build/docs/basic/appendix.rst:57 diff --git a/locale/en/LC_MESSAGES/basic/data.po b/locale/en/LC_MESSAGES/basic/data.po index 4e3ec525..22e08460 100644 --- a/locale/en/LC_MESSAGES/basic/data.po +++ b/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-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -41,11 +41,11 @@ msgid "pgRouting is installed as extension. This requires:" msgstr "" #: ../../build/docs/basic/data.rst:27 -msgid "Supported PostgreSQL version" +msgid "PostgreSQL" msgstr "" #: ../../build/docs/basic/data.rst:28 -msgid "Supported PostGIS version" +msgid "PostGIS" msgstr "" #: ../../build/docs/basic/data.rst:30 @@ -72,65 +72,69 @@ msgid "" ":code:`psql` commands" msgstr "" -#: ../../build/docs/basic/data.rst:47 +#: ../../build/docs/basic/data.rst:46 +msgid "To exit the database use ``\\q``" +msgstr "" + +#: ../../build/docs/basic/data.rst:49 msgid "Get the Workshop Data" msgstr "" -#: ../../build/docs/basic/data.rst:51 +#: ../../build/docs/basic/data.rst:53 msgid "" "The pgRouting workshop will make use of OpenStreetMap data, which is " "already available on `OSGeoLive `_. This workshop " "will use the ``Prizren`` city data and is a snapshot of March 2023." msgstr "" -#: ../../build/docs/basic/data.rst:56 +#: ../../build/docs/basic/data.rst:58 msgid "Getting the data" msgstr "" -#: ../../build/docs/basic/data.rst:59 +#: ../../build/docs/basic/data.rst:61 msgid "Option 1) When using OSGeoLive" msgstr "" -#: ../../build/docs/basic/data.rst:61 +#: ../../build/docs/basic/data.rst:63 msgid "OSGeoLive comes with osm data from the city of Prizren." msgstr "" -#: ../../build/docs/basic/data.rst:69 +#: ../../build/docs/basic/data.rst:71 msgid "Option 2) Download data form OSGeoLive website" msgstr "" -#: ../../build/docs/basic/data.rst:71 +#: ../../build/docs/basic/data.rst:73 msgid "The exact same data can be found on the OSGeoLive download page." msgstr "" -#: ../../build/docs/basic/data.rst:80 +#: ../../build/docs/basic/data.rst:82 msgid "Option 3) Download using Overpass XAPI" msgstr "" -#: ../../build/docs/basic/data.rst:82 +#: ../../build/docs/basic/data.rst:84 msgid "" "The following downloads the latest OSM data on using the same area. Using" " this data in the workshop can generate variations in the results, due to" " changes since March 2023." msgstr "" -#: ../../build/docs/basic/data.rst:92 +#: ../../build/docs/basic/data.rst:94 msgid "" "More information about how to download OpenStreetMap data can be found in" " https://wiki.openstreetmap.org/wiki/Downloading_data" msgstr "" -#: ../../build/docs/basic/data.rst:95 +#: ../../build/docs/basic/data.rst:97 msgid "" "An alternative for very large areas is to use the download services of " "`Geofabrik `_." msgstr "" -#: ../../build/docs/basic/data.rst:100 +#: ../../build/docs/basic/data.rst:102 msgid "Upload data to the database" msgstr "" -#: ../../build/docs/basic/data.rst:102 +#: ../../build/docs/basic/data.rst:104 msgid "" "The next step is to run ``osm2pgrouting`` converter, which is a command " "line tool that inserts the data in the database, \"ready\" to be used " @@ -138,51 +142,51 @@ msgid "" "found at the :ref:`osm2pgrouting`" msgstr "" -#: ../../build/docs/basic/data.rst:106 +#: ../../build/docs/basic/data.rst:108 msgid "For this step:" msgstr "" -#: ../../build/docs/basic/data.rst:108 +#: ../../build/docs/basic/data.rst:110 msgid "the osm2pgrouting default ``mapconfig.xml`` configuration file is used" msgstr "" -#: ../../build/docs/basic/data.rst:109 +#: ../../build/docs/basic/data.rst:111 msgid "and the ``~/Desktop/workshop/Prizren_XK.osm`` data" msgstr "" -#: ../../build/docs/basic/data.rst:110 +#: ../../build/docs/basic/data.rst:112 msgid "with the ``city_routing`` database" msgstr "" -#: ../../build/docs/basic/data.rst:112 +#: ../../build/docs/basic/data.rst:114 msgid "From a terminal window :code:`ctrl-alt-t`." msgstr "" -#: ../../build/docs/basic/data.rst:115 +#: ../../build/docs/basic/data.rst:117 msgid "Run the osm2pgrouting converter" msgstr "" -#: ../../build/docs/basic/data.rst:123 +#: ../../build/docs/basic/data.rst:125 msgid "Depending on the osm2pgrouting version `-W password` is needed" msgstr "" -#: ../../build/docs/basic/data.rst:126 +#: ../../build/docs/basic/data.rst:128 msgid "Output:" msgstr "" -#: ../../build/docs/basic/data.rst:133 +#: ../../build/docs/basic/data.rst:135 msgid "Tables on the database" msgstr "" -#: ../../build/docs/basic/data.rst:140 +#: ../../build/docs/basic/data.rst:142 msgid "If everything went well the result should look like this:" msgstr "" -#: ../../build/docs/basic/data.rst:146 +#: ../../build/docs/basic/data.rst:148 msgid "Chapter: Appendix" msgstr "" -#: ../../build/docs/basic/data.rst:149 +#: ../../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:" diff --git a/locale/en/LC_MESSAGES/basic/pedestrian.po b/locale/en/LC_MESSAGES/basic/pedestrian.po index 315a7178..e83d3145 100644 --- a/locale/en/LC_MESSAGES/basic/pedestrian.po +++ b/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-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -181,7 +181,6 @@ msgid "to \"|place_3|\"." msgstr "" #: ../../build/docs/basic/pedestrian.rst:116 -#: ../../build/docs/basic/pedestrian.rst:159 msgid "Calculate routes with costs in *osm2pgRouting* `length` default units." msgstr "" @@ -248,6 +247,12 @@ msgstr "" msgid "to the \"|place_3|\"." msgstr "" +#: ../../build/docs/basic/pedestrian.rst:159 +msgid "" +"Calculate routes with costs in *osm2pgRouting* ``length_m`` which is in " +"meters." +msgstr "" + #: ../../build/docs/basic/pedestrian.rst:-1 msgid "From |place_1| and |place_2| to |place_3|" msgstr "" @@ -378,9 +383,7 @@ msgid "" msgstr "" #: ../../build/docs/basic/pedestrian.rst:273 -msgid "" -"Exercise 5: Many Pedestrians going to different destinations returning " -"aggregate costs" +msgid "Exercise 5: Time for many Pedestrians going to different destinations" msgstr "" #: ../../build/docs/basic/pedestrian.rst:279 diff --git a/locale/pot/basic/appendix.pot b/locale/pot/basic/appendix.pot index 2e83f6ad..669c75c4 100644 --- a/locale/pot/basic/appendix.pot +++ b/locale/pot/basic/appendix.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Prizren 2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,7 +61,7 @@ msgid "**Exercise**: 5 (**Chapter:** Pedestrian)" msgstr "" #: ../../build/docs/basic/appendix.rst:51 -msgid ":ref:`basic/pedestrian:Exercise 5: Many Pedestrians going to different destinations returning aggregate costs`" +msgid ":ref:`basic/pedestrian:Exercise 5: Time for many Pedestrians going to different destinations`" msgstr "" #: ../../build/docs/basic/appendix.rst:57 diff --git a/locale/pot/basic/data.pot b/locale/pot/basic/data.pot index 893ad813..8d8e4e64 100644 --- a/locale/pot/basic/data.pot +++ b/locale/pot/basic/data.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Prizren 2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,11 +37,11 @@ msgid "pgRouting is installed as extension. This requires:" msgstr "" #: ../../build/docs/basic/data.rst:27 -msgid "Supported PostgreSQL version" +msgid "PostgreSQL" msgstr "" #: ../../build/docs/basic/data.rst:28 -msgid "Supported PostGIS version" +msgid "PostGIS" msgstr "" #: ../../build/docs/basic/data.rst:30 @@ -60,102 +60,106 @@ msgstr "" msgid "Depending on the postgres configuration :code:`-U ` is needed on :code:`psql` commands" msgstr "" -#: ../../build/docs/basic/data.rst:47 +#: ../../build/docs/basic/data.rst:46 +msgid "To exit the database use ``\\q``" +msgstr "" + +#: ../../build/docs/basic/data.rst:49 msgid "Get the Workshop Data" msgstr "" -#: ../../build/docs/basic/data.rst:51 +#: ../../build/docs/basic/data.rst:53 msgid "The pgRouting workshop will make use of OpenStreetMap data, which is already available on `OSGeoLive `_. This workshop will use the ``Prizren`` city data and is a snapshot of March 2023." msgstr "" -#: ../../build/docs/basic/data.rst:56 +#: ../../build/docs/basic/data.rst:58 msgid "Getting the data" msgstr "" -#: ../../build/docs/basic/data.rst:59 +#: ../../build/docs/basic/data.rst:61 msgid "Option 1) When using OSGeoLive" msgstr "" -#: ../../build/docs/basic/data.rst:61 +#: ../../build/docs/basic/data.rst:63 msgid "OSGeoLive comes with osm data from the city of Prizren." msgstr "" -#: ../../build/docs/basic/data.rst:69 +#: ../../build/docs/basic/data.rst:71 msgid "Option 2) Download data form OSGeoLive website" msgstr "" -#: ../../build/docs/basic/data.rst:71 +#: ../../build/docs/basic/data.rst:73 msgid "The exact same data can be found on the OSGeoLive download page." msgstr "" -#: ../../build/docs/basic/data.rst:80 +#: ../../build/docs/basic/data.rst:82 msgid "Option 3) Download using Overpass XAPI" msgstr "" -#: ../../build/docs/basic/data.rst:82 +#: ../../build/docs/basic/data.rst:84 msgid "The following downloads the latest OSM data on using the same area. Using this data in the workshop can generate variations in the results, due to changes since March 2023." msgstr "" -#: ../../build/docs/basic/data.rst:92 +#: ../../build/docs/basic/data.rst:94 msgid "More information about how to download OpenStreetMap data can be found in https://wiki.openstreetmap.org/wiki/Downloading_data" msgstr "" -#: ../../build/docs/basic/data.rst:95 +#: ../../build/docs/basic/data.rst:97 msgid "An alternative for very large areas is to use the download services of `Geofabrik `_." msgstr "" -#: ../../build/docs/basic/data.rst:100 +#: ../../build/docs/basic/data.rst:102 msgid "Upload data to the database" msgstr "" -#: ../../build/docs/basic/data.rst:102 +#: ../../build/docs/basic/data.rst:104 msgid "The next step is to run ``osm2pgrouting`` converter, which is a command line tool that inserts the data in the database, \"ready\" to be used with pgRouting. Additional information about ``osm2pgrouting`` can be found at the :ref:`osm2pgrouting`" msgstr "" -#: ../../build/docs/basic/data.rst:106 +#: ../../build/docs/basic/data.rst:108 msgid "For this step:" msgstr "" -#: ../../build/docs/basic/data.rst:108 +#: ../../build/docs/basic/data.rst:110 msgid "the osm2pgrouting default ``mapconfig.xml`` configuration file is used" msgstr "" -#: ../../build/docs/basic/data.rst:109 +#: ../../build/docs/basic/data.rst:111 msgid "and the ``~/Desktop/workshop/Prizren_XK.osm`` data" msgstr "" -#: ../../build/docs/basic/data.rst:110 +#: ../../build/docs/basic/data.rst:112 msgid "with the ``city_routing`` database" msgstr "" -#: ../../build/docs/basic/data.rst:112 +#: ../../build/docs/basic/data.rst:114 msgid "From a terminal window :code:`ctrl-alt-t`." msgstr "" -#: ../../build/docs/basic/data.rst:115 +#: ../../build/docs/basic/data.rst:117 msgid "Run the osm2pgrouting converter" msgstr "" -#: ../../build/docs/basic/data.rst:123 +#: ../../build/docs/basic/data.rst:125 msgid "Depending on the osm2pgrouting version `-W password` is needed" msgstr "" -#: ../../build/docs/basic/data.rst:126 +#: ../../build/docs/basic/data.rst:128 msgid "Output:" msgstr "" -#: ../../build/docs/basic/data.rst:133 +#: ../../build/docs/basic/data.rst:135 msgid "Tables on the database" msgstr "" -#: ../../build/docs/basic/data.rst:140 +#: ../../build/docs/basic/data.rst:142 msgid "If everything went well the result should look like this:" msgstr "" -#: ../../build/docs/basic/data.rst:146 +#: ../../build/docs/basic/data.rst:148 msgid "Chapter: Appendix" msgstr "" -#: ../../build/docs/basic/data.rst:149 +#: ../../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:" msgstr "" diff --git a/locale/pot/basic/pedestrian.pot b/locale/pot/basic/pedestrian.pot index 243b276c..ef2e9d8d 100644 --- a/locale/pot/basic/pedestrian.pot +++ b/locale/pot/basic/pedestrian.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Prizren 2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-20 15:49-0600\n" +"POT-Creation-Date: 2023-05-29 15:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -152,7 +152,6 @@ msgid "to \"|place_3|\"." msgstr "" #: ../../build/docs/basic/pedestrian.rst:116 -#: ../../build/docs/basic/pedestrian.rst:159 msgid "Calculate routes with costs in *osm2pgRouting* `length` default units." msgstr "" @@ -206,6 +205,10 @@ msgstr "" msgid "to the \"|place_3|\"." msgstr "" +#: ../../build/docs/basic/pedestrian.rst:159 +msgid "Calculate routes with costs in *osm2pgRouting* ``length_m`` which is in meters." +msgstr "" + #: ../../build/docs/basic/pedestrian.rst:-1 msgid "From |place_1| and |place_2| to |place_3|" msgstr "" @@ -324,7 +327,7 @@ msgid "Description of the parameters can be found in `pgr_dijkstraCost