Skip to content

Commit 6d869ad

Browse files
authored
Merge pull request #233 from cvvergara/locale-mark-changes-for-revison
Refs/heads/locale mark changes for revison
2 parents 7811e0b + 85f8812 commit 6d869ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2934
-2720
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
2020
#---------------------------------------------
2121
# Setting the version number
2222
#---------------------------------------------
23+
set(PGR_WORKSHOP_CITY "Belém")
2324
set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}")
2425
set(COPYRIGHT "2010-2024 pgRouting Developers")
2526
set(PGR_WORKSHOP_VERSION_MAJOR "3")
@@ -48,7 +49,6 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
4849
#---------------------------------------------
4950
# CONFIGURATION
5051
#---------------------------------------------
51-
set(PGR_WORKSHOP_CITY "Belém")
5252
set(PGR_WORKSHOP_CITY_FILE "BELEM_BR")
5353

5454
# https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh

docs/basic/plpgsql_function.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ Modify the previous query
168168

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

171-
For ``taxi_net_vertices_pgr``:
171+
For ``taxi_net_vertices``:
172172

173173
Modify the previous query.
174174

175175
.. collapse:: Query results
176176

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

179-
For ``walk_net_vertices_pgr``:
179+
For ``walk_net_vertices``:
180180

181181
Modify the previous query.
182182

@@ -368,7 +368,7 @@ Call to the function ``wrk_dijkstra``
368368

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

371-
* The vertices table name is formed with ``%1$I_vertices_pgr``.
371+
* The vertices table name is formed with ``%1$I_vertices``.
372372

373373
* ``lat1``, ``lon1`` values will replace ``%2$s, %3$s`` respectively.
374374
* ``lat2``, ``lon2`` values will replace ``%2$s, %3$s`` respectively.

docs/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Basic
3636
basic/graph_views.rst
3737
basic/sql_function.rst
3838
basic/plpgsql_function.rst
39-
basic/appendix.rst
4039

4140
Advanced
4241
===============================================================================

locale/en/LC_MESSAGES/advanced/chapter-12.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"

locale/en/LC_MESSAGES/appendix/appendix-2.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"

locale/en/LC_MESSAGES/appendix/appendix-3.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"

locale/en/LC_MESSAGES/appendix/appendix-4.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"

locale/en/LC_MESSAGES/basic/data.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=utf-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
21-
"Generated-By: Babel 2.16.0\n"
21+
"Generated-By: Babel 2.12.1\n"
2222

2323
#: ../../build/docs/basic/data.rst:12
2424
msgid "Prepare Data"

locale/en/LC_MESSAGES/basic/graph_views.po

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
22
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# package.
4+
# Belém package.
55
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G 3.0\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=utf-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
21-
"Generated-By: Babel 2.16.0\n"
21+
"Generated-By: Babel 2.12.1\n"
2222

2323
#: ../../build/docs/basic/graph_views.rst:12
2424
msgid "Graph views"
@@ -338,7 +338,7 @@ msgstr ""
338338
msgid "Exercise 5: Creating a view for routing"
339339
msgstr ""
340340

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

@@ -440,7 +440,7 @@ msgstr ""
440440
msgid "Exercise 6: Limiting the road network within an area"
441441
msgstr ""
442442

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

@@ -495,7 +495,7 @@ msgstr ""
495495
msgid "Exercise 7: Creating a materialized view for routing pedestrians"
496496
msgstr ""
497497

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

@@ -545,7 +545,7 @@ msgstr ""
545545
msgid "Exercise 8: Testing the views for routing"
546546
msgstr ""
547547

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

locale/en/LC_MESSAGES/basic/pedestrian.po

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=utf-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
21-
"Generated-By: Babel 2.16.0\n"
21+
"Generated-By: Babel 2.12.1\n"
2222

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

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

@@ -251,7 +251,7 @@ msgid ""
251251
"meters."
252252
msgstr ""
253253

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

@@ -422,7 +422,7 @@ msgstr ""
422422
msgid "Get only the cost in minutes."
423423
msgstr ""
424424

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

locale/en/LC_MESSAGES/basic/plpgsql_function.po

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# SOME DESCRIPTIVE TITLE.
2-
# Copyright (C) 2010-2023 pgRouting Developers
2+
# Copyright (C) 2010-2024 pgRouting Developers
33
# This file is distributed under the same license as the Workshop FOSS4G
4-
# Prizren package.
5-
# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
4+
# Belém package.
5+
# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
66
#
77
#, fuzzy
88
msgid ""
99
msgstr ""
10-
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
10+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2024-11-05 02:02+0000\n"
12+
"POT-Creation-Date: 2024-11-04 21:10-0600\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=utf-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
21-
"Generated-By: Babel 2.16.0\n"
21+
"Generated-By: Babel 2.12.1\n"
2222

2323
#: ../../build/docs/basic/plpgsql_function.rst:11
2424
msgid "pl/pgsql function"
@@ -498,15 +498,15 @@ msgstr ""
498498
msgid "Exercise 5: Test nearest vertex function"
499499
msgstr ""
500500

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

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

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

@@ -684,7 +684,7 @@ msgstr ""
684684
msgid "Exercise 7: Using the main function"
685685
msgstr ""
686686

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

0 commit comments

Comments
 (0)