Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refs/heads/locale mark changes for revison #233

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
#---------------------------------------------
# Setting the version number
#---------------------------------------------
set(PGR_WORKSHOP_CITY "Belém")
set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}")
set(COPYRIGHT "2010-2024 pgRouting Developers")
set(PGR_WORKSHOP_VERSION_MAJOR "3")
Expand Down Expand Up @@ -48,7 +49,6 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
#---------------------------------------------
# CONFIGURATION
#---------------------------------------------
set(PGR_WORKSHOP_CITY "Belém")
set(PGR_WORKSHOP_CITY_FILE "BELEM_BR")

# https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh
Expand Down
6 changes: 3 additions & 3 deletions docs/basic/plpgsql_function.rst
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ Modify the previous query

.. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_2.txt

For ``taxi_net_vertices_pgr``:
For ``taxi_net_vertices``:

Modify the previous query.

.. collapse:: Query results

.. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_3.txt

For ``walk_net_vertices_pgr``:
For ``walk_net_vertices``:

Modify the previous query.

Expand Down Expand Up @@ -368,7 +368,7 @@ Call to the function ``wrk_dijkstra``

* ``wrk_Nearest`` is used to find the identifier.

* The vertices table name is formed with ``%1$I_vertices_pgr``.
* The vertices table name is formed with ``%1$I_vertices``.

* ``lat1``, ``lon1`` values will replace ``%2$s, %3$s`` respectively.
* ``lat2``, ``lon2`` values will replace ``%2$s, %3$s`` respectively.
Expand Down
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Basic
basic/graph_views.rst
basic/sql_function.rst
basic/plpgsql_function.rst
basic/appendix.rst

Advanced
===============================================================================
Expand Down
10 changes: 5 additions & 5 deletions locale/en/LC_MESSAGES/advanced/chapter-12.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down
10 changes: 5 additions & 5 deletions locale/en/LC_MESSAGES/appendix/appendix-2.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down
10 changes: 5 additions & 5 deletions locale/en/LC_MESSAGES/appendix/appendix-3.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down
10 changes: 5 additions & 5 deletions locale/en/LC_MESSAGES/appendix/appendix-4.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down
12 changes: 6 additions & 6 deletions locale/en/LC_MESSAGES/basic/data.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.12.1\n"

#: ../../build/docs/basic/data.rst:12
msgid "Prepare Data"
Expand Down
16 changes: 8 additions & 8 deletions locale/en/LC_MESSAGES/basic/graph_views.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# package.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G 3.0\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.12.1\n"

#: ../../build/docs/basic/graph_views.rst:12
msgid "Graph views"
Expand Down Expand Up @@ -338,7 +338,7 @@ msgstr ""
msgid "Exercise 5: Creating a view for routing"
msgstr ""

#: ../../build/docs/basic/graph_views.rst:350
#: ../../build/docs/basic/graph_views.rst:-1
msgid "View of roads for vehicles"
msgstr ""

Expand Down Expand Up @@ -440,7 +440,7 @@ msgstr ""
msgid "Exercise 6: Limiting the road network within an area"
msgstr ""

#: ../../build/docs/basic/graph_views.rst:421
#: ../../build/docs/basic/graph_views.rst:-1
msgid "View of smaller set of roads for vehicles"
msgstr ""

Expand Down Expand Up @@ -495,7 +495,7 @@ msgstr ""
msgid "Exercise 7: Creating a materialized view for routing pedestrians"
msgstr ""

#: ../../build/docs/basic/graph_views.rst:479
#: ../../build/docs/basic/graph_views.rst:-1
msgid "View of roads for pedestrians"
msgstr ""

Expand Down Expand Up @@ -545,7 +545,7 @@ msgstr ""
msgid "Exercise 8: Testing the views for routing"
msgstr ""

#: ../../build/docs/basic/graph_views.rst:543
#: ../../build/docs/basic/graph_views.rst:-1
msgid "From the Venue to the hotel using the osm_id."
msgstr ""

Expand Down
18 changes: 9 additions & 9 deletions locale/en/LC_MESSAGES/basic/pedestrian.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.12.1\n"

#: ../../build/docs/basic/pedestrian.rst:11
msgid "Pedestrian Routing"
Expand Down Expand Up @@ -185,7 +185,7 @@ msgstr ""
msgid "Calculate routes with costs in *osm2pgRouting* `length` default units."
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:116
#: ../../build/docs/basic/pedestrian.rst:-1
msgid "From the |place_1| to the |place_3|"
msgstr ""

Expand Down Expand Up @@ -251,7 +251,7 @@ msgid ""
"meters."
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:158
#: ../../build/docs/basic/pedestrian.rst:-1
msgid "From |place_1| and |place_2| to |place_3|"
msgstr ""

Expand Down Expand Up @@ -422,7 +422,7 @@ msgstr ""
msgid "Get only the cost in minutes."
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:310
#: ../../build/docs/basic/pedestrian.rst:-1
msgid "From the hotels to the |place_4| and |place_5|"
msgstr ""

Expand Down
20 changes: 10 additions & 10 deletions locale/en/LC_MESSAGES/basic/plpgsql_function.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2010-2023 pgRouting Developers
# Copyright (C) 2010-2024 pgRouting Developers
# This file is distributed under the same license as the Workshop FOSS4G
# Prizren package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# Belém package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.12.1\n"

#: ../../build/docs/basic/plpgsql_function.rst:11
msgid "pl/pgsql function"
Expand Down Expand Up @@ -498,15 +498,15 @@ msgstr ""
msgid "Exercise 5: Test nearest vertex function"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:242
#: ../../build/docs/basic/plpgsql_function.rst:-1
msgid "Nearest Vertex in vehicle network"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:246
#: ../../build/docs/basic/plpgsql_function.rst:-1
msgid "Nearest Vertex in taki network"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:250
#: ../../build/docs/basic/plpgsql_function.rst:-1
msgid "Nearest Vertex in walk network"
msgstr ""

Expand Down Expand Up @@ -684,7 +684,7 @@ msgstr ""
msgid "Exercise 7: Using the main function"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:399
#: ../../build/docs/basic/plpgsql_function.rst:-1
msgid "View of roads for taxis along with source and destination"
msgstr ""

Expand Down
Loading
Loading