diff --git a/.github/workflows/locale-and-website.yml b/.github/workflows/locale-and-website.yml index 64531c6c0..663b4137d 100644 --- a/.github/workflows/locale-and-website.yml +++ b/.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.7" + FOLDER_NAME="2.8" fi git checkout -f origin/gh-pages git checkout -b gh-pages diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a0bb5259..c2f7a37d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,18 +20,18 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") #--------------------------------------------- # Setting the version number #--------------------------------------------- -set(WORKSHOP_AREA "FOSS4G Italy") -set(COPYRIGHT "2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde") +set(WORKSHOP_AREA "FOSS4G Firenze") +set(COPYRIGHT "2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde") set(PGR_WORKSHOP_VERSION_MAJOR "2") -set(PGR_WORKSHOP_VERSION_MINOR "7") +set(PGR_WORKSHOP_VERSION_MINOR "8") set(PGR_WORKSHOP_VERSION_PATCH "0") set(PGR_WORKSHOP_VERSION_DEV "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") -set(PGR_HTML_TITLE "Workshop - FOSS4G 2021 Argentina - Routing with pgRouting") -set(PGR_HTML_SHORT_TITLE "Workshop - Argentina") -set(OSGeoLive_VERSION "14.0") +set(PGR_HTML_TITLE "Workshop - FOSS4G 2022 Firenze - Routing with pgRouting") +set(PGR_HTML_SHORT_TITLE "Workshop - Firenze") +set(OSGeoLive_VERSION "15.0") #--------------------------------------------- @@ -52,30 +52,28 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG set(PGR_WORKSHOP_CITY "Firenze") set(PGR_WORKSHOP_CITY_FILE "Firenze_IT") set(PGR_WORKSHOP_CITY_BBOX "11.20,43.76,11.27,43.79") -# TODO define little net BBOX -set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.20,43.76,11.27,43.79") +set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.24,43.77,11.27,43.79") set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2022") set(DATE_OF_DATA "July 2021") -set(OSMID_1 "5020458299") -set(OSMID_2 "1798374718") -set(OSMID_3 "266939565") -set(OSMID_4 "2531656518") -set(OSMID_5 "6483155124") +set(OSMID_1 "266939565") +set(OSMID_2 "2531656518") +set(OSMID_3 "5020458299") +set(OSMID_4 "6483155124") +set(OSMID_5 "1798374718") -set(PLACE_1 "Palazzo dei Congressi") -set(PLACE_2 "Cattedrale di Santa Maria del Fiore") -set(PLACE_3 "Mercato Centrale") -set(PLACE_4 "Stazione di Santa Maria Novella") -set(PLACE_5 "Hotel Albani") +set(PLACE_1 "Mercato Centrale") +set(PLACE_2 "Stazione di Santa Maria Novella") +set(PLACE_3 "Palazzo dei Congressi") +set(PLACE_4 "Hotel Albani") +set(PLACE_5 "Cattedrale di Santa Maria del Fiore") -#TODO set points that are routable on chapter 8 -set(POINT1_LON "-58.4112") -set(POINT1_LAT "-34.59") -set(POINT2_LON "-58.4077") -set(POINT2_LAT "-34.5850") +set(POINT1_LON "11.2384") +set(POINT1_LAT "43.784") +set(POINT2_LON "11.2492") +set(POINT2_LAT "43.778") #--------------------------------------------- # minimum versions diff --git a/docs/basic/images/chapter5/pedestrian-route1.png b/docs/basic/images/chapter5/pedestrian-route1.png index 886b78485..02a4ff463 100644 Binary files a/docs/basic/images/chapter5/pedestrian-route1.png and b/docs/basic/images/chapter5/pedestrian-route1.png differ diff --git a/docs/basic/images/chapter5/pedestrian-route2.png b/docs/basic/images/chapter5/pedestrian-route2.png index 1ba45731f..6429d72d5 100644 Binary files a/docs/basic/images/chapter5/pedestrian-route2.png and b/docs/basic/images/chapter5/pedestrian-route2.png differ diff --git a/docs/basic/images/chapter5/pedestrian-route4.png b/docs/basic/images/chapter5/pedestrian-route4.png index b8d95e657..390f34a36 100644 Binary files a/docs/basic/images/chapter5/pedestrian-route4.png and b/docs/basic/images/chapter5/pedestrian-route4.png differ diff --git a/docs/basic/images/chapter5/pedestrian-route5.png b/docs/basic/images/chapter5/pedestrian-route5.png index 3f3b8139c..65295c281 100644 Binary files a/docs/basic/images/chapter5/pedestrian-route5.png and b/docs/basic/images/chapter5/pedestrian-route5.png differ diff --git a/docs/basic/images/chapter5/route.png b/docs/basic/images/chapter5/route.png index ce96ee972..5113252eb 100644 Binary files a/docs/basic/images/chapter5/route.png and b/docs/basic/images/chapter5/route.png differ diff --git a/docs/basic/images/chapter6/ad11.png b/docs/basic/images/chapter6/ad11.png index df218888d..8bdf65452 100644 Binary files a/docs/basic/images/chapter6/ad11.png and b/docs/basic/images/chapter6/ad11.png differ diff --git a/docs/basic/images/chapter6/ad7.png b/docs/basic/images/chapter6/ad7.png index c26144448..5f87866b0 100644 Binary files a/docs/basic/images/chapter6/ad7.png and b/docs/basic/images/chapter6/ad7.png differ diff --git a/docs/basic/images/chapter6/ad8.png b/docs/basic/images/chapter6/ad8.png index 3b988df0e..16390fb37 100644 Binary files a/docs/basic/images/chapter6/ad8.png and b/docs/basic/images/chapter6/ad8.png differ diff --git a/docs/basic/images/chapter6/detailofroute9.png b/docs/basic/images/chapter6/detailofroute9.png index 52c1b1934..d0dc89bc3 100644 Binary files a/docs/basic/images/chapter6/detailofroute9.png and b/docs/basic/images/chapter6/detailofroute9.png differ diff --git a/docs/basic/images/chapter6/pedestrian-only-roads.png b/docs/basic/images/chapter6/pedestrian-only-roads.png index b3d6658e0..195609b0b 100644 Binary files a/docs/basic/images/chapter6/pedestrian-only-roads.png and b/docs/basic/images/chapter6/pedestrian-only-roads.png differ diff --git a/docs/basic/images/chapter7/ch7-e1.png b/docs/basic/images/chapter7/ch7-e1.png index 6fe2fc4fa..8a938ac3d 100644 Binary files a/docs/basic/images/chapter7/ch7-e1.png and b/docs/basic/images/chapter7/ch7-e1.png differ diff --git a/docs/basic/images/chapter7/ch7-e2.png b/docs/basic/images/chapter7/ch7-e2.png index 93f8dd1d5..bab214224 100644 Binary files a/docs/basic/images/chapter7/ch7-e2.png and b/docs/basic/images/chapter7/ch7-e2.png differ diff --git a/docs/basic/images/chapter7/ch7-e3.png b/docs/basic/images/chapter7/ch7-e3.png index 449fe3f3e..ddb96d228 100644 Binary files a/docs/basic/images/chapter7/ch7-e3.png and b/docs/basic/images/chapter7/ch7-e3.png differ diff --git a/docs/basic/images/chapter7/ch7-e4.png b/docs/basic/images/chapter7/ch7-e4.png index 9bf0df1df..b0bbf650a 100644 Binary files a/docs/basic/images/chapter7/ch7-e4.png and b/docs/basic/images/chapter7/ch7-e4.png differ diff --git a/docs/basic/images/chapter7/ch7-e6.png b/docs/basic/images/chapter7/ch7-e6.png index 5a202644a..4184a57dc 100644 Binary files a/docs/basic/images/chapter7/ch7-e6.png and b/docs/basic/images/chapter7/ch7-e6.png differ diff --git a/docs/basic/images/chapter7/ch7-e8-1.png b/docs/basic/images/chapter7/ch7-e8-1.png index 524658623..3904dca92 100644 Binary files a/docs/basic/images/chapter7/ch7-e8-1.png and b/docs/basic/images/chapter7/ch7-e8-1.png differ diff --git a/docs/basic/images/chapter7/ch7-e8.png b/docs/basic/images/chapter7/ch7-e8.png index d40432769..95283e43a 100644 Binary files a/docs/basic/images/chapter7/ch7-e8.png and b/docs/basic/images/chapter7/ch7-e8.png differ diff --git a/docs/basic/images/chapter7/walk-net.png b/docs/basic/images/chapter7/walk-net.png new file mode 100644 index 000000000..b1e901ad9 Binary files /dev/null and b/docs/basic/images/chapter7/walk-net.png differ diff --git a/docs/basic/images/chapter8/ch8-e7.png b/docs/basic/images/chapter8/ch8-e7.png index 606bebb6b..d558dac16 100644 Binary files a/docs/basic/images/chapter8/ch8-e7.png and b/docs/basic/images/chapter8/ch8-e7.png differ diff --git a/docs/basic/pedestrian.rst b/docs/basic/pedestrian.rst index a70a79170..8fde4ed21 100644 --- a/docs/basic/pedestrian.rst +++ b/docs/basic/pedestrian.rst @@ -61,7 +61,7 @@ Description of the parameters can be found in `pgr_dijkstra The assignment of the vertices identifiers on the source and target columns may be different, the following exercises will use the results of this query. -For the workshop, some locations near of the FOSS4G Argentina event are going to be used. +For the workshop, some locations near of the FOSS4G event are going to be used. These locations are within this area https://www.openstreetmap.org#map=15/-34.5847/-58.3970 * |osmid_1| |place_1| @@ -179,7 +179,6 @@ Exercise 3: Many Pedestrians departing from the same location .. image:: images/chapter5/pedestrian-route2.png :scale: 25% - :alt: From the hotels to/from the venue .. rubric:: Solution: @@ -202,11 +201,10 @@ Exercise 4: Many Pedestrians going to different destinations .. rubric:: Problem: -* Walking from the hotels to the "|place_4|" and "|place_5|" (in minutes). +* Walking from |place_1| and |place_2| to the "|place_4|" and "|place_5|" (in minutes). .. image:: images/chapter5/pedestrian-route4.png :scale: 25% - :alt: From the hotels to the |place_4| and |place_5| .. rubric:: Solution: diff --git a/docs/basic/sql_function.rst b/docs/basic/sql_function.rst index 04cd0949e..0316c18c3 100644 --- a/docs/basic/sql_function.rst +++ b/docs/basic/sql_function.rst @@ -203,7 +203,7 @@ Exercise 2: Limiting the road network within an area Exercise 3: Creating a materialized view for routing pedestrians ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e1.png +.. image:: images/chapter7/walk-net.png :scale: 25% :alt: View of roads for vehicles diff --git a/docs/basic/vehicle.rst b/docs/basic/vehicle.rst index f17f422ac..d61e19197 100644 --- a/docs/basic/vehicle.rst +++ b/docs/basic/vehicle.rst @@ -89,15 +89,15 @@ Exercise 1: Vehicle routing - going .. rubric:: Problem: -* From the "|place_3|" to the "|place_1|" by car. +* From the "|place_1|" to the "|place_3|" by car. .. image:: images/chapter6/ad7.png :scale: 25% - :alt: From |place_3| to the |place_1| by car. + :alt: From |place_1| to the |place_3| by car. .. rubric:: Solution: -* The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**). +* The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**). * Use ``cost`` (line **6**) and ``reverse_cost`` (line **7**) columns, which are in unit ``degrees``. .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.sql @@ -117,15 +117,15 @@ Exercise 2: Vehicle routing - returning .. rubric:: Problem: -* From "|place_1|" to the "|place_3|" by car. +* From "|place_3|" to the "|place_1|" by car. .. image:: images/chapter6/ad8.png :scale: 25% - :alt: From |place_1| to the |place_3| by car. + :alt: From |place_3| to the |place_1| by car. .. rubric:: Solution: -* The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**). +* The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**). * Use ``cost`` (line **6**) and ``reverse_cost`` (line **7**) columns, which are in unit ``degrees``. .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.sql diff --git a/docs/general-intro/chapter-1.rst b/docs/general-intro/chapter-1.rst index 6bffdc581..3ddae858d 100644 --- a/docs/general-intro/chapter-1.rst +++ b/docs/general-intro/chapter-1.rst @@ -53,6 +53,10 @@ Please see the :doc:`contents <../index>` for full content of this workshop. Steve: presents on Boston 2017 Steve: presents on Germany 2017 Vicky: presents on Argentina 2017 + Vicky: presents on Bucharest 2019 + Vicky: presents on Argentina 2021 + Vicky & Rajat: presents on Firenze 2022 + Alphabetical Order: diff --git a/docs/general-intro/chapter-3.rst b/docs/general-intro/chapter-3.rst index 24dcdfa40..71bff8a1a 100644 --- a/docs/general-intro/chapter-3.rst +++ b/docs/general-intro/chapter-3.rst @@ -14,8 +14,10 @@ Installation All required tools are available on `OSGeoLive `__. -* `OSGeoLive Quickstart for Running in a Virtual Machine `__ -* `Creating an OSGeoLive Bootable USB flash drive `__ +* `OSGeoLive Quickstart for Running in a Virtual Machine + `__ +* `Creating an OSGeoLive Bootable USB flash drive + `__ .. important:: Before attending a workshop event, make sure your you can use `OSGeoLive` with either method or @@ -63,64 +65,64 @@ Install Virtual box using: sudo apt-get update sudo apt-get install virtualbox-6.1 -More detailed and up to date information can be found `here `__ +More detailed and up to date information can be found `here +`__ -Download OSGeoLive 14.0 +Download OSGeoLive 15.0 ............................................................................... -.. note:: The images on this section might not correspond to the VirtualBox version - you installed. But the workflow is similar. +This installation corresponds for the ``iso`` distribution of OSGeoLive. +For other installations visit `OSgeoLive `__ -.. todo update this image issue 131 +.. note:: + The images on this section might not correspond to the VirtualBox + version installed on your system. The workflow is similar. -* Go to https://sourceforge.net/projects/osgeo-live/files/14.0/ and download - *osgeolive-14.0-vmdk.7z* +* download *osgeolive-15.0-amd64.iso* + From https://sourceforge.net/projects/osgeo-live/files/15.0/ .. image:: images/chapter3/downloadOSGeoLive.png :width: 150px - * Open VirtualBox and click :menuselection:`New` .. image:: images/chapter3/install-vm.png :width: 150px -.. todo update this image issue 131 +* Fill required info -* Fill *name* and *operating system* + :name: osgeolive 15 + :Machine Folder: choose the appropriate location + :Type: choose the appropriate operating system + :Version: choose the 64 bit appropiate version - .. image:: images/chapter3/install-name.png + .. image:: images/chapter3/install-1.png :width: 150px -.. todo update this image issue 131 (has 1024) - -* Fill *memory size*: Use 2048 +* Create a dynamically allocated storage hard disk - .. image:: images/chapter3/install-memory.png + .. image:: images/chapter3/install-2.png :width: 150px -.. todo update this image issue 131 - -* Fill *hard disk* & create +* Choose storage from the virtual box traits - .. image:: images/chapter3/install-disk.png + .. image:: images/chapter3/install-3.png :width: 150px -* Fill *General* & Choose *bidirectional* (to be able o use the clipboard between your computer and the virtual machine.) +* Choose the empty disk and click on the Optical drive - .. image:: images/chapter3/install-general.png - :width: 150px - -* Double-click on *OSGeoLive14* & Read *Welcome message* + Select the `iso` file - .. image:: images/chapter3/install-welcome.png + .. image:: images/chapter3/install-4.png :width: 150px -* Ready to use +.. TODO update image to show the correct iso name + +* The virtual drive should look like this - .. image:: images/chapter3/install-final.png + .. image:: images/chapter3/install-5.png :width: 150px .. note:: OSGeoLive's account is ``user`` and password is ``user`` diff --git a/docs/general-intro/images/chapter3/CMakeLists.txt b/docs/general-intro/images/chapter3/CMakeLists.txt index d52fc7f2e..d79ec8b25 100644 --- a/docs/general-intro/images/chapter3/CMakeLists.txt +++ b/docs/general-intro/images/chapter3/CMakeLists.txt @@ -4,14 +4,12 @@ #--------------------- set(PGR_WORKSHOP_IMG_FILES downloadOSGeoLive.png - install-disk.png - install-display.png - install-final.png - install-general.png - install-memory.png - install-name.png + install-1.png + install-2.png + install-3.png + install-4.png + install-4.png install-vm.png - install-welcome.png ) diff --git a/docs/general-intro/images/chapter3/downloadOSGeoLive.png b/docs/general-intro/images/chapter3/downloadOSGeoLive.png index 2f7ea0a7e..74a30b1b3 100644 Binary files a/docs/general-intro/images/chapter3/downloadOSGeoLive.png and b/docs/general-intro/images/chapter3/downloadOSGeoLive.png differ diff --git a/docs/general-intro/images/chapter3/install-1.png b/docs/general-intro/images/chapter3/install-1.png new file mode 100644 index 000000000..e51b39c0f Binary files /dev/null and b/docs/general-intro/images/chapter3/install-1.png differ diff --git a/docs/general-intro/images/chapter3/install-2.png b/docs/general-intro/images/chapter3/install-2.png new file mode 100644 index 000000000..cdc162c13 Binary files /dev/null and b/docs/general-intro/images/chapter3/install-2.png differ diff --git a/docs/general-intro/images/chapter3/install-3.png b/docs/general-intro/images/chapter3/install-3.png new file mode 100644 index 000000000..b21906e63 Binary files /dev/null and b/docs/general-intro/images/chapter3/install-3.png differ diff --git a/docs/general-intro/images/chapter3/install-4.png b/docs/general-intro/images/chapter3/install-4.png new file mode 100644 index 000000000..490fd04c4 Binary files /dev/null and b/docs/general-intro/images/chapter3/install-4.png differ diff --git a/docs/general-intro/images/chapter3/install-5.png b/docs/general-intro/images/chapter3/install-5.png new file mode 100644 index 000000000..aa9864527 Binary files /dev/null and b/docs/general-intro/images/chapter3/install-5.png differ diff --git a/docs/general-intro/images/chapter3/install-disk.png b/docs/general-intro/images/chapter3/install-disk.png deleted file mode 100644 index 1afc73c5d..000000000 Binary files a/docs/general-intro/images/chapter3/install-disk.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-display.png b/docs/general-intro/images/chapter3/install-display.png deleted file mode 100644 index 32545727c..000000000 Binary files a/docs/general-intro/images/chapter3/install-display.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-final.png b/docs/general-intro/images/chapter3/install-final.png deleted file mode 100644 index 730bb94d2..000000000 Binary files a/docs/general-intro/images/chapter3/install-final.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-general.png b/docs/general-intro/images/chapter3/install-general.png deleted file mode 100644 index 59bf607fd..000000000 Binary files a/docs/general-intro/images/chapter3/install-general.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-memory.png b/docs/general-intro/images/chapter3/install-memory.png deleted file mode 100644 index 3521b8012..000000000 Binary files a/docs/general-intro/images/chapter3/install-memory.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-name.png b/docs/general-intro/images/chapter3/install-name.png deleted file mode 100644 index 38732b556..000000000 Binary files a/docs/general-intro/images/chapter3/install-name.png and /dev/null differ diff --git a/docs/general-intro/images/chapter3/install-vm.png b/docs/general-intro/images/chapter3/install-vm.png index ad9336676..9e870879b 100644 Binary files a/docs/general-intro/images/chapter3/install-vm.png and b/docs/general-intro/images/chapter3/install-vm.png differ diff --git a/docs/general-intro/images/chapter3/install-welcome.png b/docs/general-intro/images/chapter3/install-welcome.png deleted file mode 100644 index 062026a08..000000000 Binary files a/docs/general-intro/images/chapter3/install-welcome.png and /dev/null differ diff --git a/docs/scripts/basic/chapter_6/section-6.1.sql b/docs/scripts/basic/chapter_6/section-6.1.sql index c47549f4f..c2bffb738 100644 --- a/docs/scripts/basic/chapter_6/section-6.1.sql +++ b/docs/scripts/basic/chapter_6/section-6.1.sql @@ -23,8 +23,8 @@ SELECT * FROM pgr_dijkstra( reverse_cost FROM ways ', -@ID_3@, @ID_1@, +@ID_3@, directed := true); \o section-6.1.2.txt @@ -38,8 +38,8 @@ SELECT * FROM pgr_dijkstra( reverse_cost FROM ways ', -@ID_1@, @ID_3@, +@ID_1@, directed := true); \o section-6.1.3.txt @@ -97,7 +97,7 @@ FROM pgr_dijkstra( UPDATE configuration SET penalty=-1.0 WHERE tag_value IN ('steps','footway','pedestrian'); -- Penalizing with 5 times the costs -UPDATE configuration SET penalty=5 WHERE tag_value IN ('residential'); +UPDATE configuration SET penalty=5 WHERE tag_value IN ('unclassified'); -- Encuraging the use of "fast" roads UPDATE configuration SET penalty=0.5 WHERE tag_value IN ('tertiary'); diff --git a/docs/scripts/basic/chapter_7/all_sections.sql b/docs/scripts/basic/chapter_7/all_sections.sql index 23788515a..9c4fd4307 100644 --- a/docs/scripts/basic/chapter_7/all_sections.sql +++ b/docs/scripts/basic/chapter_7/all_sections.sql @@ -51,7 +51,7 @@ CREATE MATERIALIZED VIEW walk_net AS name, length_m, the_geom FROM ways JOIN configuration AS c USING (tag_id) - WHERE c.tag_value NOT IN ('motorway','primary'); + WHERE c.tag_value NOT IN ('motorway','primary','unclassified'); -- Verification3 SELECT count(*) FROM walk_net; diff --git a/locale/en/LC_MESSAGES/advanced/chapter-12.po b/locale/en/LC_MESSAGES/advanced/chapter-12.po index 1b29ca44a..bab4e6d80 100644 --- a/locale/en/LC_MESSAGES/advanced/chapter-12.po +++ b/locale/en/LC_MESSAGES/advanced/chapter-12.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 09:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/appendix/appendix-2.po b/locale/en/LC_MESSAGES/appendix/appendix-2.po index 61cf2d8ec..2964d4e97 100644 --- a/locale/en/LC_MESSAGES/appendix/appendix-2.po +++ b/locale/en/LC_MESSAGES/appendix/appendix-2.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/appendix/appendix-3.po b/locale/en/LC_MESSAGES/appendix/appendix-3.po index 88390f9fb..311df479b 100644 --- a/locale/en/LC_MESSAGES/appendix/appendix-3.po +++ b/locale/en/LC_MESSAGES/appendix/appendix-3.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/appendix/appendix-4.po b/locale/en/LC_MESSAGES/appendix/appendix-4.po index de2952e5c..ec8f85252 100644 --- a/locale/en/LC_MESSAGES/appendix/appendix-4.po +++ b/locale/en/LC_MESSAGES/appendix/appendix-4.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/basic/appendix.po b/locale/en/LC_MESSAGES/basic/appendix.po index 366efa033..df50d2a68 100644 --- a/locale/en/LC_MESSAGES/basic/appendix.po +++ b/locale/en/LC_MESSAGES/basic/appendix.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 13:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/basic/data.po b/locale/en/LC_MESSAGES/basic/data.po index 70a432ebb..55e0cbbf2 100644 --- a/locale/en/LC_MESSAGES/basic/data.po +++ b/locale/en/LC_MESSAGES/basic/data.po @@ -1,22 +1,22 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/docs/basic/data.rst:12 msgid "Prepare Data" diff --git a/locale/en/LC_MESSAGES/basic/pedestrian.po b/locale/en/LC_MESSAGES/basic/pedestrian.po index 8974cccdc..b33960db7 100644 --- a/locale/en/LC_MESSAGES/basic/pedestrian.po +++ b/locale/en/LC_MESSAGES/basic/pedestrian.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 13:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgid "" msgstr "" #: ../../build/docs/basic/pedestrian.rst:35 -#: ../../build/docs/basic/pedestrian.rst:251 +#: ../../build/docs/basic/pedestrian.rst:249 msgid "Signature Summary" msgstr "" @@ -89,9 +89,9 @@ msgstr "" msgid "" "The assignment of the vertices identifiers on the source and target " "columns may be different, the following exercises will use the results of" -" this query. For the workshop, some locations near of the FOSS4G " -"Argentina event are going to be used. These locations are within this " -"area https://www.openstreetmap.org#map=15/-34.5847/-58.3970" +" this query. For the workshop, some locations near of the FOSS4G event " +"are going to be used. These locations are within this area " +"https://www.openstreetmap.org#map=15/-34.5847/-58.3970" msgstr "" #: ../../build/docs/basic/pedestrian.rst:67 @@ -155,9 +155,9 @@ msgstr "" #: ../../build/docs/basic/pedestrian.rst:110 #: ../../build/docs/basic/pedestrian.rst:148 #: ../../build/docs/basic/pedestrian.rst:177 -#: ../../build/docs/basic/pedestrian.rst:204 -#: ../../build/docs/basic/pedestrian.rst:271 -#: ../../build/docs/basic/pedestrian.rst:303 +#: ../../build/docs/basic/pedestrian.rst:203 +#: ../../build/docs/basic/pedestrian.rst:269 +#: ../../build/docs/basic/pedestrian.rst:301 msgid "Problem:" msgstr "" @@ -170,10 +170,10 @@ msgstr "" #: ../../build/docs/basic/pedestrian.rst:118 #: ../../build/docs/basic/pedestrian.rst:156 -#: ../../build/docs/basic/pedestrian.rst:185 -#: ../../build/docs/basic/pedestrian.rst:212 -#: ../../build/docs/basic/pedestrian.rst:279 -#: ../../build/docs/basic/pedestrian.rst:307 +#: ../../build/docs/basic/pedestrian.rst:184 +#: ../../build/docs/basic/pedestrian.rst:210 +#: ../../build/docs/basic/pedestrian.rst:277 +#: ../../build/docs/basic/pedestrian.rst:305 msgid "Solution:" msgstr "" @@ -251,178 +251,175 @@ msgid "" " seconds)." msgstr "" -msgid "From the hotels to/from the venue" -msgstr "" - -#: ../../build/docs/basic/pedestrian.rst:186 +#: ../../build/docs/basic/pedestrian.rst:185 msgid "All pedestrians are departing from vertex |id_3| (line **9**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:187 +#: ../../build/docs/basic/pedestrian.rst:186 msgid "Pedestrians want to go to locations |id_1| and |id_2| (line **10**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:188 +#: ../../build/docs/basic/pedestrian.rst:187 msgid "" "The cost to be in seconds, with a walking speed ``s = 1.3 m/s`` and ``t =" " d/s`` (line **6**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:197 +#: ../../build/docs/basic/pedestrian.rst:196 msgid ":ref:`basic/appendix:**Exercise**: 3 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:201 +#: ../../build/docs/basic/pedestrian.rst:200 msgid "Exercise 4: Many Pedestrians going to different destinations" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:205 +#: ../../build/docs/basic/pedestrian.rst:204 msgid "" -"Walking from the hotels to the \"|place_4|\" and \"|place_5|\" (in " -"minutes)." -msgstr "" - -msgid "From the hotels to the |place_4| and |place_5|" +"Walking from |place_1| and |place_2| to the \"|place_4|\" and " +"\"|place_5|\" (in minutes)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:213 +#: ../../build/docs/basic/pedestrian.rst:211 msgid "The pedestrians depart from |id_1| and |id_2| (line **9**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:214 +#: ../../build/docs/basic/pedestrian.rst:212 msgid "" "The pedestrians want to go to destinations |id_4| and |id_5| (line " "**10**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:215 +#: ../../build/docs/basic/pedestrian.rst:213 msgid "" "The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t =" " d/s`` (line **6**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:216 -#: ../../build/docs/basic/pedestrian.rst:311 +#: ../../build/docs/basic/pedestrian.rst:214 +#: ../../build/docs/basic/pedestrian.rst:309 msgid "Result adds the costs per destination." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:227 +#: ../../build/docs/basic/pedestrian.rst:225 msgid ":ref:`basic/appendix:**Exercise**: 4 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:231 +#: ../../build/docs/basic/pedestrian.rst:229 msgid "Inspecting the results, looking for totals (`edge = -1`):" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:233 +#: ../../build/docs/basic/pedestrian.rst:231 msgid "Going to vertex |id_4|:" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:235 +#: ../../build/docs/basic/pedestrian.rst:233 msgid "from |id_1| takes 8.84.. minutes (seq = 35)" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:236 +#: ../../build/docs/basic/pedestrian.rst:234 msgid "from |id_2| takes 5.84.. minutes (seq = 74)" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:238 +#: ../../build/docs/basic/pedestrian.rst:236 msgid "Going to vertex |id_5|:" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:240 +#: ../../build/docs/basic/pedestrian.rst:238 msgid "from |id_1| takes 7.44.. minutes (seq = 7)" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:241 +#: ../../build/docs/basic/pedestrian.rst:239 msgid "from |id_2| takes 12.06.. minutes (seq = 55)" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:245 +#: ../../build/docs/basic/pedestrian.rst:243 msgid "pgr_dijkstraCost" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:247 +#: ../../build/docs/basic/pedestrian.rst:245 msgid "" "When the main goal is to calculate the total cost, without \"inspecting\"" " the `pgr_dijkstra` results, using ``pgr_dijkstraCost`` returns a more " "compact result." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:263 +#: ../../build/docs/basic/pedestrian.rst:261 msgid "" "Description of the parameters can be found in `pgr_dijkstraCost " "`__" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:268 +#: ../../build/docs/basic/pedestrian.rst:266 msgid "" "Exercise 5: Many Pedestrians going to different destinations returning " "aggregate costs" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:272 +#: ../../build/docs/basic/pedestrian.rst:270 msgid "" "Walking from the hotels to the \"|place_4|\" or \"|place_5|\" (get only " "the cost in minutes)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:280 -#: ../../build/docs/basic/pedestrian.rst:308 +msgid "From the hotels to the |place_4| and |place_5|" +msgstr "" + +#: ../../build/docs/basic/pedestrian.rst:278 +#: ../../build/docs/basic/pedestrian.rst:306 msgid "The pedestrians depart from |id_1| and |id_2| (line **10**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:281 -#: ../../build/docs/basic/pedestrian.rst:309 +#: ../../build/docs/basic/pedestrian.rst:279 +#: ../../build/docs/basic/pedestrian.rst:307 msgid "" "The pedestrians want to go to destinations |id_4| and |id_5| (line " "**11**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:282 +#: ../../build/docs/basic/pedestrian.rst:280 msgid "" "The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t =" " d/s`` (line **7**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:283 +#: ../../build/docs/basic/pedestrian.rst:281 msgid "Result as aggregated costs." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:294 +#: ../../build/docs/basic/pedestrian.rst:292 msgid ":ref:`basic/appendix:**Exercise**: 5 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:296 +#: ../../build/docs/basic/pedestrian.rst:294 msgid "" "Compare with `Exercise 4: Many Pedestrians going to different " "destinations`_ 's note." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:300 +#: ../../build/docs/basic/pedestrian.rst:298 msgid "" "Exercise 6: Many Pedestrians going to different destinations summarizing " "the total costs per departure" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:304 +#: ../../build/docs/basic/pedestrian.rst:302 msgid "" "Walking from the hotels to the \"|place_4|\" or \"|place_5|\" (summarize " "cost in minutes)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:310 +#: ../../build/docs/basic/pedestrian.rst:308 msgid "" "The cost to be in minutes, with a walking speed s = 1.3 m/s and t = d/s " "(line **7**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:321 +#: ../../build/docs/basic/pedestrian.rst:319 msgid ":ref:`basic/appendix:**Exercise**: 6 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:324 +#: ../../build/docs/basic/pedestrian.rst:322 msgid "" "An interpretation of the result can be: In general, it is faster to " "depart from the \"|place_2|\" than from the \"|place_1|\"." diff --git a/locale/en/LC_MESSAGES/basic/plpgsql_function.po b/locale/en/LC_MESSAGES/basic/plpgsql_function.po index ca50448e5..2431b1f69 100644 --- a/locale/en/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/en/LC_MESSAGES/basic/plpgsql_function.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 14:18-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -222,11 +222,11 @@ msgid "For this chapter, the following points will be used for testing." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:66 -msgid "(lat,lon) = (-34.59, -58.4112)" +msgid "(lat,lon) = (43.784, 11.2384)" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:67 -msgid "(lat,lon) = (-34.5850, -58.4077)" +msgid "(lat,lon) = (43.778, 11.2492)" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:69 @@ -500,7 +500,7 @@ msgid "Calculate the OSM identifier of the nearest vertex to a point." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:249 -msgid "In particular use the following (lat,lon) value: ``(-34.59, -58.4112)``." +msgid "In particular use the following (lat,lon) value: ``(43.784, 11.2384)``." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:251 @@ -710,7 +710,7 @@ msgid "Test the ``wrk_NearestOSM`` function." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:378 -msgid "In particular use the following (lat,lon) values: ``(-34.59, -58.4112)``." +msgid "In particular use the following (lat,lon) values: ``(43.784, 11.2384)``." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:380 @@ -929,11 +929,11 @@ msgid "Use ``wrk_fromAtoB``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:533 -msgid "Departure point is: (lat,lon) = ``(-34.59, -58.4112)``" +msgid "Departure point is: (lat,lon) = ``(43.784, 11.2384)``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:534 -msgid "Destination point is: (lat,lon) = ``(-34.5850, -58.4077)``" +msgid "Destination point is: (lat,lon) = ``(43.778, 11.2492)``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:537 diff --git a/locale/en/LC_MESSAGES/basic/sql_function.po b/locale/en/LC_MESSAGES/basic/sql_function.po index c9d07133b..51897c640 100644 --- a/locale/en/LC_MESSAGES/basic/sql_function.po +++ b/locale/en/LC_MESSAGES/basic/sql_function.po @@ -1,22 +1,22 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/docs/basic/sql_function.rst:12 msgid "SQL function" @@ -73,7 +73,7 @@ msgid "Circulate on a smaller area near \"|place_4|\"." msgstr "" #: ../../build/docs/basic/sql_function.rst:45 -msgid "Bounding box: ``(11.20,43.76,11.27,43.79)``" +msgid "Bounding box: ``(11.24,43.77,11.27,43.79)``" msgstr "" #: ../../build/docs/basic/sql_function.rst:46 @@ -435,7 +435,7 @@ msgstr "" #: ../../build/docs/basic/sql_function.rst:169 msgid "" "The taxi can only circulate inside this Bounding Box: " -"``(11.20,43.76,11.27,43.79)``" +"``(11.24,43.77,11.27,43.79)``" msgstr "" #: ../../build/docs/basic/sql_function.rst:170 @@ -456,7 +456,7 @@ msgstr "" #: ../../build/docs/basic/sql_function.rst:179 msgid "" "Can only circulate inside the bounding box: " -"``(11.20,43.76,11.27,43.79)``. (line **10**)" +"``(11.24,43.77,11.27,43.79)``. (line **10**)" msgstr "" #: ../../build/docs/basic/sql_function.rst:180 diff --git a/locale/en/LC_MESSAGES/basic/vehicle.po b/locale/en/LC_MESSAGES/basic/vehicle.po index f7e0fd1fc..3cc4f5a43 100644 --- a/locale/en/LC_MESSAGES/basic/vehicle.po +++ b/locale/en/LC_MESSAGES/basic/vehicle.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 14:18-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -152,10 +152,10 @@ msgid "Problem:" msgstr "" #: ../../build/docs/basic/vehicle.rst:92 -msgid "From the \"|place_3|\" to the \"|place_1|\" by car." +msgid "From the \"|place_1|\" to the \"|place_3|\" by car." msgstr "" -msgid "From |place_3| to the |place_1| by car." +msgid "From |place_1| to the |place_3| by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:99 ../../build/docs/basic/vehicle.rst:127 @@ -166,8 +166,9 @@ msgid "Solution:" msgstr "" #: ../../build/docs/basic/vehicle.rst:100 +#: ../../build/docs/basic/vehicle.rst:158 msgid "" -"The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line " +"The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line " "**11**)." msgstr "" @@ -187,16 +188,15 @@ msgid "Exercise 2: Vehicle routing - returning" msgstr "" #: ../../build/docs/basic/vehicle.rst:120 -msgid "From \"|place_1|\" to the \"|place_3|\" by car." +msgid "From \"|place_3|\" to the \"|place_1|\" by car." msgstr "" -msgid "From |place_1| to the |place_3| by car." +msgid "From |place_3| to the |place_1| by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:128 -#: ../../build/docs/basic/vehicle.rst:158 msgid "" -"The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line " +"The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line " "**11**)." msgstr "" diff --git a/locale/en/LC_MESSAGES/examples/boost_dijkstra.po b/locale/en/LC_MESSAGES/examples/boost_dijkstra.po index 35efe67b3..ac7085fe7 100644 --- a/locale/en/LC_MESSAGES/examples/boost_dijkstra.po +++ b/locale/en/LC_MESSAGES/examples/boost_dijkstra.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/examples/hanoslav.po b/locale/en/LC_MESSAGES/examples/hanoslav.po index 883e3d4b5..83baac002 100644 --- a/locale/en/LC_MESSAGES/examples/hanoslav.po +++ b/locale/en/LC_MESSAGES/examples/hanoslav.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/examples/wiki_example.po b/locale/en/LC_MESSAGES/examples/wiki_example.po index 6b2a35928..efac3c03c 100644 --- a/locale/en/LC_MESSAGES/examples/wiki_example.po +++ b/locale/en/LC_MESSAGES/examples/wiki_example.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/general-intro/chapter-1.po b/locale/en/LC_MESSAGES/general-intro/chapter-1.po index c4a9e3d79..d50775837 100644 --- a/locale/en/LC_MESSAGES/general-intro/chapter-1.po +++ b/locale/en/LC_MESSAGES/general-intro/chapter-1.po @@ -1,22 +1,22 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/docs/general-intro/chapter-1.rst:11 msgid "Introduction" @@ -46,7 +46,7 @@ msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:24 msgid "" -"The workshop will focus on real road networks of the FOSS4G Italy " +"The workshop will focus on real road networks of the FOSS4G Firenze " "surrounding area. It will cover the following topics:" msgstr "" @@ -95,18 +95,18 @@ msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:40 msgid "" "Equipments: This workshop uses `OSGeoLive `__ " -"(14.0)" +"(15.0)" msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:43 msgid "Authors" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:57 +#: ../../build/docs/general-intro/chapter-1.rst:61 msgid "Alphabetical Order:" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:59 +#: ../../build/docs/general-intro/chapter-1.rst:63 msgid "" "*Daniel Kastl* is founder and CEO of `Georepublic " "`_ and works in Germany and Japan. He is " @@ -115,7 +115,7 @@ msgid "" "Japan. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:63 +#: ../../build/docs/general-intro/chapter-1.rst:67 msgid "" "*Ko Nagase* works at `Georepublic `_ and works" " in Japan. tests of pgRouting project on Windows and Mac OSX environment." @@ -123,7 +123,7 @@ msgid "" "member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:66 +#: ../../build/docs/general-intro/chapter-1.rst:70 msgid "" "*Stephen Woodbridge* works at the greater Boston, MA area. He was a " "pgrouting PSC member and developer. He develops solutions for mapping, " @@ -131,24 +131,24 @@ msgid "" "imagery. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:69 +#: ../../build/docs/general-intro/chapter-1.rst:73 msgid "" "*Vicky Vergara* works at `Georepublic `_ and " "works in Mexico. She's the core developer of pgRouting project and GSoC " "Mentor. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:74 +#: ../../build/docs/general-intro/chapter-1.rst:78 msgid "License" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:75 +#: ../../build/docs/general-intro/chapter-1.rst:79 msgid "" "This work is licensed under a `Creative Commons Attribution-Share Alike " "3.0 License `_." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:80 +#: ../../build/docs/general-intro/chapter-1.rst:84 msgid "Supported by" msgstr "" diff --git a/locale/en/LC_MESSAGES/general-intro/chapter-2.po b/locale/en/LC_MESSAGES/general-intro/chapter-2.po index 284b49b06..47f6b9f5f 100644 --- a/locale/en/LC_MESSAGES/general-intro/chapter-2.po +++ b/locale/en/LC_MESSAGES/general-intro/chapter-2.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/general-intro/chapter-3.po b/locale/en/LC_MESSAGES/general-intro/chapter-3.po index 468b1221e..fe47a3252 100644 --- a/locale/en/LC_MESSAGES/general-intro/chapter-3.po +++ b/locale/en/LC_MESSAGES/general-intro/chapter-3.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,115 +32,154 @@ msgid "" "`__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:18 +#: ../../build/docs/general-intro/chapter-3.rst:19 msgid "" "`Creating an OSGeoLive Bootable USB flash drive " "`__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:20 +#: ../../build/docs/general-intro/chapter-3.rst:22 msgid "" "Before attending a workshop event, make sure your you can use `OSGeoLive`" " with either method or :doc:`../appendix/appendix-2` on your computer." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:24 +#: ../../build/docs/general-intro/chapter-3.rst:26 msgid "This workshop uses OSGeoLive on VirtualBox" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:26 +#: ../../build/docs/general-intro/chapter-3.rst:28 msgid ":ref:`install_osgeo_vm`" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:28 +#: ../../build/docs/general-intro/chapter-3.rst:30 msgid "Chapter Contents" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:33 +#: ../../build/docs/general-intro/chapter-3.rst:35 msgid "OSGeoLive on a VirtualBox" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:36 +#: ../../build/docs/general-intro/chapter-3.rst:38 msgid "Install `VirtualBox `__." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:38 +#: ../../build/docs/general-intro/chapter-3.rst:40 msgid "" "Complete details about installation can be found on the `VirtualBox " "`__ documentation." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:44 +#: ../../build/docs/general-intro/chapter-3.rst:46 msgid "Linux distributions:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:45 +#: ../../build/docs/general-intro/chapter-3.rst:47 msgid "" "Add the following line to your /etc/apt/sources.list. According to your " "distribution, replace '' with your distribution name." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:52 +#: ../../build/docs/general-intro/chapter-3.rst:54 msgid "Add the keys:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:59 +#: ../../build/docs/general-intro/chapter-3.rst:61 msgid "Install Virtual box using:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:66 +#: ../../build/docs/general-intro/chapter-3.rst:68 msgid "" "More detailed and up to date information can be found `here " "`__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:70 -msgid "Download OSGeoLive 14.0" +#: ../../build/docs/general-intro/chapter-3.rst:73 +msgid "Download OSGeoLive 15.0" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:72 +#: ../../build/docs/general-intro/chapter-3.rst:75 msgid "" -"The images on this section might not correspond to the VirtualBox version" -" you installed. But the workflow is similar." +"This installation corresponds for the ``iso`` distribution of OSGeoLive. " +"For other installations visit `OSgeoLive " +"`__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:77 +#: ../../build/docs/general-intro/chapter-3.rst:79 msgid "" -"Go to https://sourceforge.net/projects/osgeo-live/files/14.0/ and " -"download *osgeolive-14.0-vmdk.7z*" +"The images on this section might not correspond to the VirtualBox version" +" installed on your system. The workflow is similar." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:85 +#: ../../build/docs/general-intro/chapter-3.rst:82 +msgid "download *osgeolive-15.0-amd64.iso*" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:84 +msgid "From https://sourceforge.net/projects/osgeo-live/files/15.0/" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:89 msgid "Open VirtualBox and click :menuselection:`New`" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:92 -msgid "Fill *name* and *operating system*" +#: ../../build/docs/general-intro/chapter-3.rst:94 +msgid "Fill required info" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst +msgid "name" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:96 +msgid "osgeolive 15" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst +msgid "Machine Folder" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:97 +msgid "choose the appropriate location" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst +msgid "Type" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:98 +msgid "choose the appropriate operating system" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst +msgid "Version" msgstr "" #: ../../build/docs/general-intro/chapter-3.rst:99 -msgid "Fill *memory size*: Use 2048" +msgid "choose the 64 bit appropiate version" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:106 -msgid "Fill *hard disk* & create" +#: ../../build/docs/general-intro/chapter-3.rst:104 +msgid "Create a dynamically allocated storage hard disk" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:111 -msgid "" -"Fill *General* & Choose *bidirectional* (to be able o use the clipboard " -"between your computer and the virtual machine.)" +#: ../../build/docs/general-intro/chapter-3.rst:109 +msgid "Choose storage from the virtual box traits" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:114 +msgid "Choose the empty disk and click on the Optical drive" msgstr "" #: ../../build/docs/general-intro/chapter-3.rst:116 -msgid "Double-click on *OSGeoLive14* & Read *Welcome message*" +msgid "Select the `iso` file" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:121 -msgid "Ready to use" +#: ../../build/docs/general-intro/chapter-3.rst:123 +msgid "The virtual drive should look like this" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:126 +#: ../../build/docs/general-intro/chapter-3.rst:128 msgid "OSGeoLive's account is ``user`` and password is ``user``" msgstr "" diff --git a/locale/en/LC_MESSAGES/index.po b/locale/en/LC_MESSAGES/index.po index 25e492ae1..bce5b57a5 100644 --- a/locale/en/LC_MESSAGES/index.po +++ b/locale/en/LC_MESSAGES/index.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/interactions/chapter-10.po b/locale/en/LC_MESSAGES/interactions/chapter-10.po index 40c004cb8..5c8c72bf2 100644 --- a/locale/en/LC_MESSAGES/interactions/chapter-10.po +++ b/locale/en/LC_MESSAGES/interactions/chapter-10.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/interactions/chapter-11.po b/locale/en/LC_MESSAGES/interactions/chapter-11.po index 76a7be155..897eee894 100644 --- a/locale/en/LC_MESSAGES/interactions/chapter-11.po +++ b/locale/en/LC_MESSAGES/interactions/chapter-11.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/interactions/chapter-9.po b/locale/en/LC_MESSAGES/interactions/chapter-9.po index 023f331d8..a6a695ad4 100644 --- a/locale/en/LC_MESSAGES/interactions/chapter-9.po +++ b/locale/en/LC_MESSAGES/interactions/chapter-9.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/un_sdg/appendix.po b/locale/en/LC_MESSAGES/un_sdg/appendix.po index c25fe55f8..b27aff4c3 100644 --- a/locale/en/LC_MESSAGES/un_sdg/appendix.po +++ b/locale/en/LC_MESSAGES/un_sdg/appendix.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 09:53-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -315,3 +315,4 @@ msgstr "" #: ../../build/docs/un_sdg/appendix.rst:278 msgid ":ref:`un_sdg/sdg11-cities:Exercise 13: Create a union of rain zones`" msgstr "" + diff --git a/locale/en/LC_MESSAGES/un_sdg/data.po b/locale/en/LC_MESSAGES/un_sdg/data.po index dd61359f3..c439d50e0 100644 --- a/locale/en/LC_MESSAGES/un_sdg/data.po +++ b/locale/en/LC_MESSAGES/un_sdg/data.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-10 13:12-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -309,3 +309,4 @@ msgstr "" #: ../../build/docs/un_sdg/data.rst:296 msgid "Configuration information for Waterways" msgstr "" + diff --git a/locale/en/LC_MESSAGES/un_sdg/introduction.po b/locale/en/LC_MESSAGES/un_sdg/introduction.po index 7cbee4ba0..15aa94204 100644 --- a/locale/en/LC_MESSAGES/un_sdg/introduction.po +++ b/locale/en/LC_MESSAGES/un_sdg/introduction.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po b/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po index a4569f23d..6fbf05c6e 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:02-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -392,3 +392,4 @@ msgstr "" #: ../../build/docs/un_sdg/sdg11-cities.rst:380 msgid ":ref:`un_sdg/appendix:**Exercise:** 13 (**Chapter:** SDG 11)`" msgstr "" + diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po b/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po index e77a5dc51..fcd4d1e69 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:09-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -767,3 +767,4 @@ msgstr "" #: ../../build/docs/un_sdg/sdg3-health.rst:701 msgid ":ref:`un_sdg/appendix:**Exercise:** 20 (**Chapter:** SDG 3)`" msgstr "" + diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po b/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po index 0d7b73050..3ca625854 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde # This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. +# Firenze package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:04-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -450,3 +450,4 @@ msgstr "" #: ../../build/docs/un_sdg/sdg7-energy.rst:405 msgid "Finding the optimal number and locations of Electricity Transformers" msgstr "" + diff --git a/locale/pot/advanced/chapter-12.pot b/locale/pot/advanced/chapter-12.pot index 46f921ce2..0f612e848 100644 --- a/locale/pot/advanced/chapter-12.pot +++ b/locale/pot/advanced/chapter-12.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 09:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/appendix/appendix-2.pot b/locale/pot/appendix/appendix-2.pot index 92875f98b..4519fee6e 100644 --- a/locale/pot/appendix/appendix-2.pot +++ b/locale/pot/appendix/appendix-2.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/appendix/appendix-3.pot b/locale/pot/appendix/appendix-3.pot index 4ccf4a3ba..6a341cc46 100644 --- a/locale/pot/appendix/appendix-3.pot +++ b/locale/pot/appendix/appendix-3.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/appendix/appendix-4.pot b/locale/pot/appendix/appendix-4.pot index 8a271b772..365d7e3cb 100644 --- a/locale/pot/appendix/appendix-4.pot +++ b/locale/pot/appendix/appendix-4.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/basic/appendix.pot b/locale/pot/basic/appendix.pot index 495d90b39..d550fb77e 100644 --- a/locale/pot/basic/appendix.pot +++ b/locale/pot/basic/appendix.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 13:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/basic/data.pot b/locale/pot/basic/data.pot index 65cc8d3e6..32ec20856 100644 --- a/locale/pot/basic/data.pot +++ b/locale/pot/basic/data.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde -# This file is distributed under the same license as the Workshop FOSS4G Italy package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Italy 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/basic/pedestrian.pot b/locale/pot/basic/pedestrian.pot index 3d1a426b4..bda35634a 100644 --- a/locale/pot/basic/pedestrian.pot +++ b/locale/pot/basic/pedestrian.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 13:41-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,7 +41,7 @@ msgid "You can specify when to consider the graph as `directed `__" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:268 +#: ../../build/docs/basic/pedestrian.rst:266 msgid "Exercise 5: Many Pedestrians going to different destinations returning aggregate costs" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:272 +#: ../../build/docs/basic/pedestrian.rst:270 msgid "Walking from the hotels to the \"|place_4|\" or \"|place_5|\" (get only the cost in minutes)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:280 -#: ../../build/docs/basic/pedestrian.rst:308 +#: ../../build/docs/basic/pedestrian.rst:None +msgid "From the hotels to the |place_4| and |place_5|" +msgstr "" + +#: ../../build/docs/basic/pedestrian.rst:278 +#: ../../build/docs/basic/pedestrian.rst:306 msgid "The pedestrians depart from |id_1| and |id_2| (line **10**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:281 -#: ../../build/docs/basic/pedestrian.rst:309 +#: ../../build/docs/basic/pedestrian.rst:279 +#: ../../build/docs/basic/pedestrian.rst:307 msgid "The pedestrians want to go to destinations |id_4| and |id_5| (line **11**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:282 +#: ../../build/docs/basic/pedestrian.rst:280 msgid "The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t = d/s`` (line **7**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:283 +#: ../../build/docs/basic/pedestrian.rst:281 msgid "Result as aggregated costs." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:294 +#: ../../build/docs/basic/pedestrian.rst:292 msgid ":ref:`basic/appendix:**Exercise**: 5 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:296 +#: ../../build/docs/basic/pedestrian.rst:294 msgid "Compare with `Exercise 4: Many Pedestrians going to different destinations`_ 's note." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:300 +#: ../../build/docs/basic/pedestrian.rst:298 msgid "Exercise 6: Many Pedestrians going to different destinations summarizing the total costs per departure" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:304 +#: ../../build/docs/basic/pedestrian.rst:302 msgid "Walking from the hotels to the \"|place_4|\" or \"|place_5|\" (summarize cost in minutes)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:310 +#: ../../build/docs/basic/pedestrian.rst:308 msgid "The cost to be in minutes, with a walking speed s = 1.3 m/s and t = d/s (line **7**)." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:321 +#: ../../build/docs/basic/pedestrian.rst:319 msgid ":ref:`basic/appendix:**Exercise**: 6 (**Chapter:** Pedestrian)`" msgstr "" -#: ../../build/docs/basic/pedestrian.rst:324 +#: ../../build/docs/basic/pedestrian.rst:322 msgid "An interpretation of the result can be: In general, it is faster to depart from the \"|place_2|\" than from the \"|place_1|\"." msgstr "" diff --git a/locale/pot/basic/plpgsql_function.pot b/locale/pot/basic/plpgsql_function.pot index 792f818dd..3dd3d0116 100644 --- a/locale/pot/basic/plpgsql_function.pot +++ b/locale/pot/basic/plpgsql_function.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 14:18-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -212,11 +212,11 @@ msgid "For this chapter, the following points will be used for testing." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:66 -msgid "(lat,lon) = (-34.59, -58.4112)" +msgid "(lat,lon) = (43.784, 11.2384)" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:67 -msgid "(lat,lon) = (-34.5850, -58.4077)" +msgid "(lat,lon) = (43.778, 11.2492)" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:69 @@ -464,7 +464,7 @@ msgid "Calculate the OSM identifier of the nearest vertex to a point." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:249 -msgid "In particular use the following (lat,lon) value: ``(-34.59, -58.4112)``." +msgid "In particular use the following (lat,lon) value: ``(43.784, 11.2384)``." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:251 @@ -651,7 +651,7 @@ msgid "Test the ``wrk_NearestOSM`` function." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:378 -msgid "In particular use the following (lat,lon) values: ``(-34.59, -58.4112)``." +msgid "In particular use the following (lat,lon) values: ``(43.784, 11.2384)``." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:380 @@ -843,11 +843,11 @@ msgid "Use ``wrk_fromAtoB``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:533 -msgid "Departure point is: (lat,lon) = ``(-34.59, -58.4112)``" +msgid "Departure point is: (lat,lon) = ``(43.784, 11.2384)``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:534 -msgid "Destination point is: (lat,lon) = ``(-34.5850, -58.4077)``" +msgid "Destination point is: (lat,lon) = ``(43.778, 11.2492)``" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:537 diff --git a/locale/pot/basic/sql_function.pot b/locale/pot/basic/sql_function.pot index 1629de0b5..1092a230b 100644 --- a/locale/pot/basic/sql_function.pot +++ b/locale/pot/basic/sql_function.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde -# This file is distributed under the same license as the Workshop FOSS4G Italy package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Italy 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\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 "Circulate on a smaller area near \"|place_4|\"." msgstr "" #: ../../build/docs/basic/sql_function.rst:45 -msgid "Bounding box: ``(11.20,43.76,11.27,43.79)``" +msgid "Bounding box: ``(11.24,43.77,11.27,43.79)``" msgstr "" #: ../../build/docs/basic/sql_function.rst:46 @@ -412,7 +412,7 @@ msgid "Create a view ``taxi_net`` for the `taxi`:" msgstr "" #: ../../build/docs/basic/sql_function.rst:169 -msgid "The taxi can only circulate inside this Bounding Box: ``(11.20,43.76,11.27,43.79)``" +msgid "The taxi can only circulate inside this Bounding Box: ``(11.24,43.77,11.27,43.79)``" msgstr "" #: ../../build/docs/basic/sql_function.rst:170 @@ -428,7 +428,7 @@ msgid "The graph for the taxi is a subset of the ``vehicle_net`` graph. (line ** msgstr "" #: ../../build/docs/basic/sql_function.rst:179 -msgid "Can only circulate inside the bounding box: ``(11.20,43.76,11.27,43.79)``. (line **10**)" +msgid "Can only circulate inside the bounding box: ``(11.24,43.77,11.27,43.79)``. (line **10**)" msgstr "" #: ../../build/docs/basic/sql_function.rst:180 diff --git a/locale/pot/basic/vehicle.pot b/locale/pot/basic/vehicle.pot index 57153a409..a705d3453 100644 --- a/locale/pot/basic/vehicle.pot +++ b/locale/pot/basic/vehicle.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 14:18-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,11 +133,11 @@ msgid "Problem:" msgstr "" #: ../../build/docs/basic/vehicle.rst:92 -msgid "From the \"|place_3|\" to the \"|place_1|\" by car." +msgid "From the \"|place_1|\" to the \"|place_3|\" by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:None -msgid "From |place_3| to the |place_1| by car." +msgid "From |place_1| to the |place_3| by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:99 @@ -149,7 +149,8 @@ msgid "Solution:" msgstr "" #: ../../build/docs/basic/vehicle.rst:100 -msgid "The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**)." +#: ../../build/docs/basic/vehicle.rst:158 +msgid "The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**)." msgstr "" #: ../../build/docs/basic/vehicle.rst:101 @@ -166,16 +167,15 @@ msgid "Exercise 2: Vehicle routing - returning" msgstr "" #: ../../build/docs/basic/vehicle.rst:120 -msgid "From \"|place_1|\" to the \"|place_3|\" by car." +msgid "From \"|place_3|\" to the \"|place_1|\" by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:None -msgid "From |place_1| to the |place_3| by car." +msgid "From |place_3| to the |place_1| by car." msgstr "" #: ../../build/docs/basic/vehicle.rst:128 -#: ../../build/docs/basic/vehicle.rst:158 -msgid "The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**)." +msgid "The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**)." msgstr "" #: ../../build/docs/basic/vehicle.rst:140 diff --git a/locale/pot/examples/boost_dijkstra.pot b/locale/pot/examples/boost_dijkstra.pot index 1c0a609fa..2ac6ed3af 100644 --- a/locale/pot/examples/boost_dijkstra.pot +++ b/locale/pot/examples/boost_dijkstra.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/examples/hanoslav.pot b/locale/pot/examples/hanoslav.pot index 703f73663..56c2fb8d0 100644 --- a/locale/pot/examples/hanoslav.pot +++ b/locale/pot/examples/hanoslav.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/examples/wiki_example.pot b/locale/pot/examples/wiki_example.pot index 778254920..7f9e47870 100644 --- a/locale/pot/examples/wiki_example.pot +++ b/locale/pot/examples/wiki_example.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/general-intro/chapter-1.pot b/locale/pot/general-intro/chapter-1.pot index 1fe47edbd..ccec7eab1 100644 --- a/locale/pot/general-intro/chapter-1.pot +++ b/locale/pot/general-intro/chapter-1.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde -# This file is distributed under the same license as the Workshop FOSS4G Italy package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Italy 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-06 17:34+0000\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,7 @@ msgid "Road networks navigation require complex graph algorithms. pgRouting is a msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:24 -msgid "The workshop will focus on real road networks of the FOSS4G Italy surrounding area. It will cover the following topics:" +msgid "The workshop will focus on real road networks of the FOSS4G Firenze surrounding area. It will cover the following topics:" msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:27 @@ -77,42 +77,42 @@ msgid "Attendee's previous knowledge: SQL (PostgreSQL, PostGIS)" msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:40 -msgid "Equipments: This workshop uses `OSGeoLive `__ (14.0)" +msgid "Equipments: This workshop uses `OSGeoLive `__ (15.0)" msgstr "" #: ../../build/docs/general-intro/chapter-1.rst:43 msgid "Authors" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:57 +#: ../../build/docs/general-intro/chapter-1.rst:61 msgid "Alphabetical Order:" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:59 +#: ../../build/docs/general-intro/chapter-1.rst:63 msgid "*Daniel Kastl* is founder and CEO of `Georepublic `_ and works in Germany and Japan. He is moderating and promoting the pgRouting community and development since the beginning of the project, and he's an active OSM contributor in Japan. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:63 +#: ../../build/docs/general-intro/chapter-1.rst:67 msgid "*Ko Nagase* works at `Georepublic `_ and works in Japan. tests of pgRouting project on Windows and Mac OSX environment. One of the contributors of pgRoutingLayers for QGIS. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:66 +#: ../../build/docs/general-intro/chapter-1.rst:70 msgid "*Stephen Woodbridge* works at the greater Boston, MA area. He was a pgrouting PSC member and developer. He develops solutions for mapping, geocoding, reverse geocoding, routing and processing of remote sensing imagery. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:69 +#: ../../build/docs/general-intro/chapter-1.rst:73 msgid "*Vicky Vergara* works at `Georepublic `_ and works in Mexico. She's the core developer of pgRouting project and GSoC Mentor. OSGeo Charter member." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:74 +#: ../../build/docs/general-intro/chapter-1.rst:78 msgid "License" msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:75 +#: ../../build/docs/general-intro/chapter-1.rst:79 msgid "This work is licensed under a `Creative Commons Attribution-Share Alike 3.0 License `_." msgstr "" -#: ../../build/docs/general-intro/chapter-1.rst:80 +#: ../../build/docs/general-intro/chapter-1.rst:84 msgid "Supported by" msgstr "" diff --git a/locale/pot/general-intro/chapter-2.pot b/locale/pot/general-intro/chapter-2.pot index 38c556bcc..c1cbbec80 100644 --- a/locale/pot/general-intro/chapter-2.pot +++ b/locale/pot/general-intro/chapter-2.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/general-intro/chapter-3.pot b/locale/pot/general-intro/chapter-3.pot index 2b4f5a324..1e7d8ced2 100644 --- a/locale/pot/general-intro/chapter-3.pot +++ b/locale/pot/general-intro/chapter-3.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,98 +28,138 @@ msgstr "" msgid "`OSGeoLive Quickstart for Running in a Virtual Machine `__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:18 +#: ../../build/docs/general-intro/chapter-3.rst:19 msgid "`Creating an OSGeoLive Bootable USB flash drive `__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:20 +#: ../../build/docs/general-intro/chapter-3.rst:22 msgid "Before attending a workshop event, make sure your you can use `OSGeoLive` with either method or :doc:`../appendix/appendix-2` on your computer." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:24 +#: ../../build/docs/general-intro/chapter-3.rst:26 msgid "This workshop uses OSGeoLive on VirtualBox" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:26 +#: ../../build/docs/general-intro/chapter-3.rst:28 msgid ":ref:`install_osgeo_vm`" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:28 +#: ../../build/docs/general-intro/chapter-3.rst:30 msgid "Chapter Contents" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:33 +#: ../../build/docs/general-intro/chapter-3.rst:35 msgid "OSGeoLive on a VirtualBox" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:36 +#: ../../build/docs/general-intro/chapter-3.rst:38 msgid "Install `VirtualBox `__." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:38 +#: ../../build/docs/general-intro/chapter-3.rst:40 msgid "Complete details about installation can be found on the `VirtualBox `__ documentation." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:44 +#: ../../build/docs/general-intro/chapter-3.rst:46 msgid "Linux distributions:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:45 +#: ../../build/docs/general-intro/chapter-3.rst:47 msgid "Add the following line to your /etc/apt/sources.list. According to your distribution, replace '' with your distribution name." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:52 +#: ../../build/docs/general-intro/chapter-3.rst:54 msgid "Add the keys:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:59 +#: ../../build/docs/general-intro/chapter-3.rst:61 msgid "Install Virtual box using:" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:66 +#: ../../build/docs/general-intro/chapter-3.rst:68 msgid "More detailed and up to date information can be found `here `__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:70 -msgid "Download OSGeoLive 14.0" +#: ../../build/docs/general-intro/chapter-3.rst:73 +msgid "Download OSGeoLive 15.0" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:72 -msgid "The images on this section might not correspond to the VirtualBox version you installed. But the workflow is similar." +#: ../../build/docs/general-intro/chapter-3.rst:75 +msgid "This installation corresponds for the ``iso`` distribution of OSGeoLive. For other installations visit `OSgeoLive `__" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:77 -msgid "Go to https://sourceforge.net/projects/osgeo-live/files/14.0/ and download *osgeolive-14.0-vmdk.7z*" +#: ../../build/docs/general-intro/chapter-3.rst:79 +msgid "The images on this section might not correspond to the VirtualBox version installed on your system. The workflow is similar." msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:85 +#: ../../build/docs/general-intro/chapter-3.rst:82 +msgid "download *osgeolive-15.0-amd64.iso*" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:84 +msgid "From https://sourceforge.net/projects/osgeo-live/files/15.0/" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:89 msgid "Open VirtualBox and click :menuselection:`New`" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:92 -msgid "Fill *name* and *operating system*" +#: ../../build/docs/general-intro/chapter-3.rst:94 +msgid "Fill required info" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:0 +msgid "name" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:96 +msgid "osgeolive 15" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:0 +msgid "Machine Folder" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:97 +msgid "choose the appropriate location" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:0 +msgid "Type" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:98 +msgid "choose the appropriate operating system" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:0 +msgid "Version" msgstr "" #: ../../build/docs/general-intro/chapter-3.rst:99 -msgid "Fill *memory size*: Use 2048" +msgid "choose the 64 bit appropiate version" +msgstr "" + +#: ../../build/docs/general-intro/chapter-3.rst:104 +msgid "Create a dynamically allocated storage hard disk" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:106 -msgid "Fill *hard disk* & create" +#: ../../build/docs/general-intro/chapter-3.rst:109 +msgid "Choose storage from the virtual box traits" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:111 -msgid "Fill *General* & Choose *bidirectional* (to be able o use the clipboard between your computer and the virtual machine.)" +#: ../../build/docs/general-intro/chapter-3.rst:114 +msgid "Choose the empty disk and click on the Optical drive" msgstr "" #: ../../build/docs/general-intro/chapter-3.rst:116 -msgid "Double-click on *OSGeoLive14* & Read *Welcome message*" +msgid "Select the `iso` file" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:121 -msgid "Ready to use" +#: ../../build/docs/general-intro/chapter-3.rst:123 +msgid "The virtual drive should look like this" msgstr "" -#: ../../build/docs/general-intro/chapter-3.rst:126 +#: ../../build/docs/general-intro/chapter-3.rst:128 msgid "OSGeoLive's account is ``user`` and password is ``user``" msgstr "" diff --git a/locale/pot/index.pot b/locale/pot/index.pot index 35352cb3b..1c1de2783 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/interactions/chapter-10.pot b/locale/pot/interactions/chapter-10.pot index 4e7dbf3e8..add599f25 100644 --- a/locale/pot/interactions/chapter-10.pot +++ b/locale/pot/interactions/chapter-10.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/interactions/chapter-11.pot b/locale/pot/interactions/chapter-11.pot index bcf898676..9bd6deab8 100644 --- a/locale/pot/interactions/chapter-11.pot +++ b/locale/pot/interactions/chapter-11.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/interactions/chapter-9.pot b/locale/pot/interactions/chapter-9.pot index 8ba5c4bb8..3b8263445 100644 --- a/locale/pot/interactions/chapter-9.pot +++ b/locale/pot/interactions/chapter-9.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/appendix.pot b/locale/pot/un_sdg/appendix.pot index f30385ec1..78e7afd66 100644 --- a/locale/pot/un_sdg/appendix.pot +++ b/locale/pot/un_sdg/appendix.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 09:53-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/data.pot b/locale/pot/un_sdg/data.pot index 922019874..424f8d2e0 100644 --- a/locale/pot/un_sdg/data.pot +++ b/locale/pot/un_sdg/data.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-10 13:12-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/introduction.pot b/locale/pot/un_sdg/introduction.pot index e30c27a7f..d01fb69e6 100644 --- a/locale/pot/un_sdg/introduction.pot +++ b/locale/pot/un_sdg/introduction.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-03 11:07-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/sdg11-cities.pot b/locale/pot/un_sdg/sdg11-cities.pot index dce42848e..730d8b115 100644 --- a/locale/pot/un_sdg/sdg11-cities.pot +++ b/locale/pot/un_sdg/sdg11-cities.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:02-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/sdg3-health.pot b/locale/pot/un_sdg/sdg3-health.pot index 4dec43ee1..bcde1b22a 100644 --- a/locale/pot/un_sdg/sdg3-health.pot +++ b/locale/pot/un_sdg/sdg3-health.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:09-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/pot/un_sdg/sdg7-energy.pot b/locale/pot/un_sdg/sdg7-energy.pot index 6120f4531..02c9932a0 100644 --- a/locale/pot/un_sdg/sdg7-energy.pot +++ b/locale/pot/un_sdg/sdg7-energy.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G Argentina package. +# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde +# This file is distributed under the same license as the Workshop FOSS4G Firenze package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n" +"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 11:04-0600\n" +"POT-Creation-Date: 2022-07-14 13:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"