diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7b86e46f7..e74830617 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -46,20 +46,16 @@ jobs: - name: Configure run: | - service postgresql status sudo service postgresql start - echo "here 1" service postgresql status sudo -u postgres createdb -p ${POSTGRES_PORT} setup sudo -u postgres psql -c 'CREATE ROLE "runner" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$runner$$;' -d setup echo :5432:*:runner:runner >> .pgpass sudo -u postgres psql -c 'CREATE ROLE "user" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$user$$;' -d setup echo :5432:*:user:user >> .pgpass - echo "here 5" - mkdir -p ~/Desktop/workshop-2019 mkdir build cd build - cmake -DPGR_WORKSHOP_DEBUG=ON -DES=ON -DSV=ON .. + cmake -DPGR_WORKSHOP_DEBUG=ON .. psql -l env: POSTGRES_HOST: localhost diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f2c21a74..a2d91641d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,16 @@ -cmake_minimum_required(VERSION 2.8...3.22) +cmake_minimum_required(VERSION 3.12) if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} ) message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt." ) endif() -#--------------------------------------------- -#--------------------------------------------- #--------------------------------------------- project(PGR_WORKSHOP LANGUAGES NONE) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -#--------------------------------------------- -#--------------------------------------------- #--------------------------------------------- #--------------------------------------------- @@ -25,7 +21,7 @@ set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}") set(COPYRIGHT "2010-2024 pgRouting Developers") set(PGR_WORKSHOP_VERSION_MAJOR "3") set(PGR_WORKSHOP_VERSION_MINOR "0") -set(PGR_WORKSHOP_VERSION_PATCH "0") +set(PGR_WORKSHOP_VERSION_PATCH "1") set(PGR_WORKSHOP_VERSION_DEV "") set(PGR_WORKSHOP_VERSION "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}") set(PGR_WORKSHOP_RELEASE "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}.${PGR_WORKSHOP_VERSION_PATCH}${PGR_WORKSHOP_VERSION_DEV}") @@ -62,6 +58,10 @@ set(PGR_WORKSHOP_LITTLE_NET_BBOX "-48.52,-1.46,-48.45,-1.41") set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2024") set(DATE_OF_DATA "Sep 2024") +if (WORKSHOP_DEBUG) + message(STATUS "WORKSHOP_CITY_FILE=${WORKSHOP_CITY_FILE}") +endif() + set(OSMID_1 "10982869752") set(OSMID_2 "11818739588") set(OSMID_3 "491465035") @@ -91,26 +91,46 @@ set(CH7_PLACE_2 ${PLACE_1}) set(CH7_OSMID_1 ${OSMID_5}) set(CH7_OSMID_2 ${OSMID_1}) + + #--------------------------------------------- # minimum versions #--------------------------------------------- -set(SPHINX_MINIMUM_VERSION "2.3") +set(SPHINX_MINIMUM_VERSION "4.0.0") set(Osm2pgrouting_FIND_VERSION "2.3") #--------------------------------------------- # Finding sphinx #--------------------------------------------- -find_package(Sphinx REQUIRED) -if (NOT SPHINX_FOUND) + +find_program(SPHINX_EXECUTABLE + REQUIRED + NAMES sphinx-build + DOC "Sphinx Documentation Builder (sphinx-doc.org)" +) + +# Getting sphinx version +execute_process(COMMAND "${SPHINX_EXECUTABLE}" --version + OUTPUT_VARIABLE SPHINX_EXECUTABLE_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) +string(REPLACE "sphinx-build" "" SPHINX_EXECUTABLE_VERSION "${SPHINX_EXECUTABLE_VERSION}") +string(STRIP "${SPHINX_EXECUTABLE_VERSION}" SPHINX_EXECUTABLE_VERSION) + +if ("${SPHINX_EXECUTABLE_VERSION}" VERSION_LESS "${SPHINX_MINIMUM_VERSION}") + message(FATAL_ERROR "Sphinx required version is ${SPHINX_MINIMUM_VERSION}") +endif() + +message(STATUS "Found ${SPHINX_EXECUTABLE} version '${SPHINX_EXECUTABLE_VERSION}'") + +if (NOT SPHINX_EXECUTABLE) message(FATAL_ERROR "Sphinx not found") -#elseif (SPHINX_VERSION VERSION_LESS SPHINX_MINIMUM_VERSION) -# message(WARNING "Your Sphinx version is too old! -# This project requires Sphinx v1.0 or above to produce -# proper documentation (you have v${SPHINX_VERSION}). -# You will get output but it will have errors.") + return() endif() +set(SPHINX_FLAGS "" CACHE STRING "Flags to pass to sphinx-build") +separate_arguments(sphinx_flags UNIX_COMMAND "${SPHINX_FLAGS}") + #--------------------------------------------- # Finding osm2pgRouting #--------------------------------------------- @@ -131,138 +151,79 @@ message(STATUS "Found dropdb ${DROPDB_EXECUTABLE}") #--------------------------------------------- # Perl #--------------------------------------------- -#--------------------------------------------- -include(FindPerl) -if(NOT PERL_EXECUTABLE) - message(FATAL_ERROR " Please check your Perl installation.") -endif(NOT PERL_EXECUTABLE) - -execute_process( - COMMAND ${PERL_EXECUTABLE} -MDateTime -e "" - ERROR_QUIET RESULT_VARIABLE DATETIME_STAUS - ) +find_package(Perl REQUIRED) #--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- - # Kind of output # http://www.sphinx-doc.org/en/stable/builders.html - -#--------------------------------------------- #--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- -option(ALL_DOC - "Set ON|OFF (default=OFF) to build all documentation styles (exept LOCALE)" OFF) - -option(HTML - "Set ON|OFF (default=OFF) to build Documentation library tree as HTML" ON) - -option(DIRHTML - "Set ON|OFF (default=OFF) to build Documentation library tree as DIRHTML - STATUS: the navigation does not work " OFF - ) - -option(SINGLEHTML - "Set ON|OFF (default=OFF) to build Documentation library tree as a single HTML file" OFF - ) - -option(PICKLE - "Set ON|OFF (default=OFF) to build Documentation library tree as PICKLE" OFF) - -option(JSON - "Set ON|OFF (default=OFF) to build Documentation library tree as JSON page" OFF) +option(BUILD_HTML "Set ON|OFF (default=OFF) to build Documentation library tree as HTML" ON) +option(BUILD_PDF "Set ON|OFF (default=OFF) to build Documentation library tree as PDF" OFF) +option(BUILD_LOCALE "Set ON|OFF (default=OFF) to build the locale files" OFF) +option(BUILD_LINKCHECK "Set ON|OFF (default=OFF) to build Documentation library tree as LINKCHECK page" OFF) -option(HTMLHELP - "Set ON|OFF (default=OFF) to build Documentation library tree as HTMLHELP page" OFF) -option(DUMMY - "Set ON|OFF (default=OFF) to build Documentation library tree as DUMMY page" OFF) - -option(LATEX - "Set ON|OFF (default=OFF) to build Documentation library tree as LATEX page" OFF) - -option(LINKCHECK - "Set ON|OFF (default=OFF) to build Documentation library tree as LINKCHECK page" OFF) - -option(LOCALE - "Set ON|OFF (default=OFF) to build the locale files of all languages." OFF - ) - -foreach(opt HTML DIRHTML SINGLEHTML PICKLE JSON HTMLHELP LATEX LINKCHECK) - if (${${opt}} OR ALL_DOC) +foreach(opt BUILD_HTML BUILD_PDF BUILD_LOCALE BUILD_LINKCHECK) + if (${${opt}} OR WITH_ALL_DOC) string(TOLOWER ${opt} val) + string(REPLACE "build_" "" val ${val}) list(APPEND PGR_WORKSHOP_DOC_TARGETS ${val}) endif() endforeach() -message(STATUS "PGR_WORKSHOP_DOC_TARGETS = ${PGR_WORKSHOP_DOC_TARGETS}") - - -#--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- +if("${PGR_WORKSHOP_DOC_TARGETS}" STREQUAL "") + message(FATAL_ERROR "No documentation targets found") +endif() -# LANGUAGES SETINGS +message(STATUS "PGR_WORKSHOP_DOC_TARGETS=${PGR_WORKSHOP_DOC_TARGETS}") -#--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- #--------------------------------------------- -# Avaliable Languages -# English is allways built - -# list of sphinx languges support -# http://www.sphinx-doc.org/en/stable/config.html#confval-language -# TODO: figure out how to support this -# "el" "hu" "id" "zh") +# LANGUAGES SETTINGS #--------------------------------------------- -set(PGR_WORKSHOP_SUPPORTED_LANGUAGES "es" "ja" "sv") -set(PGR_WORKSHOP_ENGLISH "en") +list(APPEND WORKSHOP_LANGUAGES_TRANSLATED "EN" "ES" "SV") +list(APPEND WORKSHOP_LANGUAGES "en" "es" "ja" "sv") +message(STATUS "WORKSHOP_LANGUAGES=${WORKSHOP_LANGUAGES}") -#--------------------------------------------- -# Language options -#--------------------------------------------- -option(ALL_LANG - "Set ON|OFF (default=OFF) to build all documentation supported languages - ${PGR_WORKSHOP_SUPPORTED_LANGUAGES}" OFF) - -foreach(lang ${PGR_WORKSHOP_SUPPORTED_LANGUAGES}) +foreach(lang ${WORKSHOP_LANGUAGES}) string(TOUPPER ${lang} val) - option(${val} - "Set ON|OFF (default=OFF) build ${lang} Documentation" OFF) + if ("${val}" IN_LIST WORKSHOP_LANGUAGES_TRANSLATED) + option(${val} "Set ON|OFF (default=ON) build ${lang} Documentation" ON) + else() + option(${val} "Set ON|OFF (default=OFF) build ${lang} Documentation" OFF) + endif() endforeach() #--------------------------------------------- # Catching the language options to be build #--------------------------------------------- -list(APPEND PGR_WORKSHOP_BUILD_LANGUAGES ${PGR_WORKSHOP_ENGLISH}) -foreach(lang ${PGR_WORKSHOP_SUPPORTED_LANGUAGES}) +foreach(lang ${WORKSHOP_LANGUAGES}) string(TOUPPER ${lang} opt) - if (${opt} OR ALL_LANG) + if (${opt}) list(APPEND PGR_WORKSHOP_BUILD_LANGUAGES ${lang}) endif() endforeach() +if("${PGR_WORKSHOP_BUILD_LANGUAGES}" STREQUAL "") + message(FATAL_ERROR "No documentation languages found") +endif() + +message(STATUS "PGR_WORKSHOP_BUILD_LANGUAGES=${PGR_WORKSHOP_BUILD_LANGUAGES}") + + #--------------------------------------------- # All languages po files are to be generated #--------------------------------------------- -set (SPHINXINTL_LANGUAGE ${PGR_WORKSHOP_ENGLISH}) if(LOCALE) - foreach(lang ${PGR_WORKSHOP_SUPPORTED_LANGUAGES}) + foreach(lang ${WORKSHOP_LANGUAGES}) set(SPHINXINTL_LANGUAGE "${SPHINXINTL_LANGUAGE},${lang}") endforeach() - set(PGR_WORKSHOP_LANGUAGES ${PGR_WORKSHOP_ENGLISH}) + message(STATUS "SPHINXINTL_LANGUAGE=${SPHINXINTL_LANGUAGE}") endif() -message(STATUS "SPHINXINTL_LANGUAGE ${SPHINXINTL_LANGUAGE}") - #------------------------------------------ # Used to generate the languages bar @@ -294,13 +255,7 @@ message(STATUS "PGR_WORKSHOP_BUILD_LANGUAGES = ${PGR_WORKSHOP_BUILD_LANGUAGES}") message(STATUS "SPHINXINTL_LANGUAGE = ${SPHINXINTL_LANGUAGE}") #--------------------------------------------- -#--------------------------------------------- -#--------------------------------------------- - -# The list of projects to be documented - -#--------------------------------------------- -#--------------------------------------------- +# The documentation #--------------------------------------------- add_subdirectory(docs) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 49769e8a1..afd25b383 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -5,7 +5,7 @@ #--------------------- set(PGR_WORKSHOP_FILES "index.rst" - ) +) add_custom_target(doc COMMENT "Building documentation with Sphinx") @@ -44,18 +44,6 @@ set(SPHINX_DOCUMENTATION_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build") -# Internal variables. -option(LATEX_PAPER_SIZE - "Set a4|letter (default=letter) paper size" "letter") - -option(SPHINX_OPTS - "Set Sphinx options (default are sphinx defaults)") - -message(STATUS "SPHINX_OPTS=${SPHINX_OPTS}") - -set(LATEX_PAPER_SIZE " -D latex_paper_size=${LATEX_PAPER_SIZE}") - - # build the locale files if (LOCALE) add_custom_target(locale ALL @@ -120,4 +108,3 @@ foreach (target ${PGR_WORKSHOP_DOC_TARGETS}) endforeach() add_dependencies(doc "${target}") endforeach() - diff --git a/locale/es/LC_MESSAGES/advanced/chapter-12.po b/locale/es/LC_MESSAGES/advanced/chapter-12.po index b606524ec..ca485f4ca 100644 --- a/locale/es/LC_MESSAGES/advanced/chapter-12.po +++ b/locale/es/LC_MESSAGES/advanced/chapter-12.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/appendix/appendix-2.po b/locale/es/LC_MESSAGES/appendix/appendix-2.po index 27e8bfec1..b5059949e 100644 --- a/locale/es/LC_MESSAGES/appendix/appendix-2.po +++ b/locale/es/LC_MESSAGES/appendix/appendix-2.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/appendix/appendix-3.po b/locale/es/LC_MESSAGES/appendix/appendix-3.po index d8611bb63..f1f149339 100644 --- a/locale/es/LC_MESSAGES/appendix/appendix-3.po +++ b/locale/es/LC_MESSAGES/appendix/appendix-3.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2021 +# Vicky Vergara , 2021 # MarPetra , 2021 msgid "" msgstr "" diff --git a/locale/es/LC_MESSAGES/basic/data.po b/locale/es/LC_MESSAGES/basic/data.po index 925de4a6c..795fce2ea 100644 --- a/locale/es/LC_MESSAGES/basic/data.po +++ b/locale/es/LC_MESSAGES/basic/data.po @@ -7,7 +7,7 @@ # Translators: # Manuel Retamozo , 2021 # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" @@ -174,10 +174,10 @@ msgid "" "with pgRouting. Additional information about ``osm2pgrouting`` can be " "found at the :doc:`../appendix/appendix-3`" msgstr "" -"El siguiente paso es ejecutar el convertidor ``osm2pgrouting'', que es una " +"El siguiente paso es ejecutar el convertidor ``osm2pgrouting`` que es una " "herramienta de línea de comandos que inserta los datos en la base de datos, " "\"listo\" para ser utilizado con pgRouting. Puede encontrar información " -"adicional sobre ``osm2pgrouting :doc:`../appendix/appendix-3`" +"adicional sobre ``osm2pgrouting`` :doc:`../appendix/appendix-3`" #: ../../build/docs/basic/data.rst:112 msgid "For this step:" diff --git a/locale/es/LC_MESSAGES/basic/pedestrian.po b/locale/es/LC_MESSAGES/basic/pedestrian.po index c1b1a51fe..428b24429 100644 --- a/locale/es/LC_MESSAGES/basic/pedestrian.po +++ b/locale/es/LC_MESSAGES/basic/pedestrian.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/basic/plpgsql_function.po b/locale/es/LC_MESSAGES/basic/plpgsql_function.po index 2ef3bc3b7..51d78d793 100644 --- a/locale/es/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/es/LC_MESSAGES/basic/plpgsql_function.po @@ -7,7 +7,7 @@ # Translators: # Manuel Retamozo , 2021 # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/basic/sql_function.po b/locale/es/LC_MESSAGES/basic/sql_function.po index f56a79d04..66dc0b406 100644 --- a/locale/es/LC_MESSAGES/basic/sql_function.po +++ b/locale/es/LC_MESSAGES/basic/sql_function.po @@ -7,7 +7,7 @@ # Translators: # Manuel Retamozo , 2021 # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/basic/vehicle.po b/locale/es/LC_MESSAGES/basic/vehicle.po index 3a75eca88..40324f94d 100644 --- a/locale/es/LC_MESSAGES/basic/vehicle.po +++ b/locale/es/LC_MESSAGES/basic/vehicle.po @@ -7,7 +7,7 @@ # Translators: # Manuel Retamozo , 2021 # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/examples/wiki_example.po b/locale/es/LC_MESSAGES/examples/wiki_example.po index 6cebe917a..7e5b34425 100644 --- a/locale/es/LC_MESSAGES/examples/wiki_example.po +++ b/locale/es/LC_MESSAGES/examples/wiki_example.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-10 17:38+0000\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Vicky Vergara , 2022\n" +"Last-Translator: Vicky Vergara , 2022\n" "Language-Team: Spanish (https://www.transifex.com/pgrouting/teams/1219/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locale/es/LC_MESSAGES/general-intro/introduction.po b/locale/es/LC_MESSAGES/general-intro/introduction.po index dfd756d6c..d50de1baf 100644 --- a/locale/es/LC_MESSAGES/general-intro/introduction.po +++ b/locale/es/LC_MESSAGES/general-intro/introduction.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2021 +# Vicky Vergara , 2021 # MarPetra , 2021 msgid "" msgstr "" diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index 848b56938..990786071 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 # msgid "" msgstr "" diff --git a/locale/es/LC_MESSAGES/interactions/chapter-10.po b/locale/es/LC_MESSAGES/interactions/chapter-10.po index 9ae78c7c9..b4bdfb562 100644 --- a/locale/es/LC_MESSAGES/interactions/chapter-10.po +++ b/locale/es/LC_MESSAGES/interactions/chapter-10.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2021 +# Vicky Vergara , 2021 # MarPetra , 2021 msgid "" msgstr "" diff --git a/locale/es/LC_MESSAGES/interactions/chapter-11.po b/locale/es/LC_MESSAGES/interactions/chapter-11.po index d71beb2a2..adab99191 100644 --- a/locale/es/LC_MESSAGES/interactions/chapter-11.po +++ b/locale/es/LC_MESSAGES/interactions/chapter-11.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2021. # # Translators: -# Vicky Vergara , 2021 +# Vicky Vergara , 2021 # MarPetra , 2021 msgid "" msgstr "" diff --git a/locale/es/LC_MESSAGES/un_sdg/data.po b/locale/es/LC_MESSAGES/un_sdg/data.po index 21f5915bc..21046d986 100644 --- a/locale/es/LC_MESSAGES/un_sdg/data.po +++ b/locale/es/LC_MESSAGES/un_sdg/data.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/un_sdg/introduction.po b/locale/es/LC_MESSAGES/un_sdg/introduction.po index ebc455f5a..550a48d47 100644 --- a/locale/es/LC_MESSAGES/un_sdg/introduction.po +++ b/locale/es/LC_MESSAGES/un_sdg/introduction.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po b/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po index 9e290d6d7..51fdf1864 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po b/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po index 0d2fc312b..1ad566bbf 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po b/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po index 03ee29aeb..9112f2bec 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po @@ -6,7 +6,7 @@ # # Translators: # MarPetra , 2021 -# Vicky Vergara , 2022 +# Vicky Vergara , 2022 msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" diff --git a/locale/ja/LC_MESSAGES/advanced/chapter-12.po b/locale/ja/LC_MESSAGES/advanced/chapter-12.po index 0bca580a7..6458e2a41 100644 --- a/locale/ja/LC_MESSAGES/advanced/chapter-12.po +++ b/locale/ja/LC_MESSAGES/advanced/chapter-12.po @@ -5,8 +5,8 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2022 -# Taro Matsuzawa , 2022 +# Ko Nagase , 2022 +# Taro Matsuzawa , 2022 #, fuzzy msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-16 17:44+0000\n" "PO-Revision-Date: 2022-03-01 19:42+0000\n" -"Last-Translator: Taro Matsuzawa , 2022\n" +"Last-Translator: Taro Matsuzawa , 2022\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/appendix/appendix-2.po b/locale/ja/LC_MESSAGES/appendix/appendix-2.po index 2bde31964..0474dfa9e 100644 --- a/locale/ja/LC_MESSAGES/appendix/appendix-2.po +++ b/locale/ja/LC_MESSAGES/appendix/appendix-2.po @@ -5,8 +5,8 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2022 -# Taro Matsuzawa , 2022 +# Ko Nagase , 2022 +# Taro Matsuzawa , 2022 # Daniel Kastl, 2022 #, fuzzy msgid "" diff --git a/locale/ja/LC_MESSAGES/appendix/appendix-3.po b/locale/ja/LC_MESSAGES/appendix/appendix-3.po index 09c426438..21abdd7f9 100644 --- a/locale/ja/LC_MESSAGES/appendix/appendix-3.po +++ b/locale/ja/LC_MESSAGES/appendix/appendix-3.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2022. # # Translators: -# Taro Matsuzawa , 2021 +# Taro Matsuzawa , 2021 #, fuzzy msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-16 17:44+0000\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Taro Matsuzawa , 2021\n" +"Last-Translator: Taro Matsuzawa , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/basic/data.po b/locale/ja/LC_MESSAGES/basic/data.po index ec1d5261b..8525d4c95 100644 --- a/locale/ja/LC_MESSAGES/basic/data.po +++ b/locale/ja/LC_MESSAGES/basic/data.po @@ -5,8 +5,8 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2021 -# Taro Matsuzawa , 2021 +# Ko Nagase , 2021 +# Taro Matsuzawa , 2021 #, fuzzy msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-16 17:44+0000\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Taro Matsuzawa , 2021\n" +"Last-Translator: Taro Matsuzawa , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/general-intro/introduction.po b/locale/ja/LC_MESSAGES/general-intro/introduction.po index e85c2a61a..ff8871c87 100644 --- a/locale/ja/LC_MESSAGES/general-intro/introduction.po +++ b/locale/ja/LC_MESSAGES/general-intro/introduction.po @@ -5,8 +5,8 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2021 -# Taro Matsuzawa , 2021 +# Ko Nagase , 2021 +# Taro Matsuzawa , 2021 #, fuzzy msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-16 17:44+0000\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Taro Matsuzawa , 2021\n" +"Last-Translator: Taro Matsuzawa , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/general-intro/osgeolive.po b/locale/ja/LC_MESSAGES/general-intro/osgeolive.po index d9bcb95e6..e96722ebe 100644 --- a/locale/ja/LC_MESSAGES/general-intro/osgeolive.po +++ b/locale/ja/LC_MESSAGES/general-intro/osgeolive.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2021 +# Ko Nagase , 2021 # Jin Igarashi , 2022 #, fuzzy msgid "" diff --git a/locale/ja/LC_MESSAGES/general-intro/overview.po b/locale/ja/LC_MESSAGES/general-intro/overview.po index a250b8a4f..ea4489120 100644 --- a/locale/ja/LC_MESSAGES/general-intro/overview.po +++ b/locale/ja/LC_MESSAGES/general-intro/overview.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2021 +# Ko Nagase , 2021 #, fuzzy msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-16 17:44+0000\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Ko Nagase , 2021\n" +"Last-Translator: Ko Nagase , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/interactions/chapter-10.po b/locale/ja/LC_MESSAGES/interactions/chapter-10.po index 2a9151113..28f7bf5b1 100644 --- a/locale/ja/LC_MESSAGES/interactions/chapter-10.po +++ b/locale/ja/LC_MESSAGES/interactions/chapter-10.po @@ -6,7 +6,7 @@ # # Translators: # Daniel Kastl, 2021 -# Ko Nagase , 2021 +# Ko Nagase , 2021 #, fuzzy msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-11-04 21:10-0600\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Ko Nagase , 2021\n" +"Last-Translator: Ko Nagase , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/ja/LC_MESSAGES/interactions/chapter-11.po b/locale/ja/LC_MESSAGES/interactions/chapter-11.po index 121963e22..edd7eade1 100644 --- a/locale/ja/LC_MESSAGES/interactions/chapter-11.po +++ b/locale/ja/LC_MESSAGES/interactions/chapter-11.po @@ -5,7 +5,7 @@ # FIRST AUTHOR , 2022. # # Translators: -# Ko Nagase , 2021 +# Ko Nagase , 2021 #, fuzzy msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-11-04 21:10-0600\n" "PO-Revision-Date: 2021-10-10 17:39+0000\n" -"Last-Translator: Ko Nagase , 2021\n" +"Last-Translator: Ko Nagase , 2021\n" "Language: ja\n" "Language-Team: Japanese " "(https://app.transifex.com/pgrouting/teams/1219/ja/)\n" diff --git a/locale/sv/LC_MESSAGES/basic/graph_views.po b/locale/sv/LC_MESSAGES/basic/graph_views.po index 9c15c5046..ad2e194c1 100644 --- a/locale/sv/LC_MESSAGES/basic/graph_views.po +++ b/locale/sv/LC_MESSAGES/basic/graph_views.po @@ -516,7 +516,7 @@ msgstr "`the_geom` Geometrin." #: ../../build/docs/basic/graph_views.rst:502 msgid "Similar to `Exercise 5: Creating a view for routing`_:" -msgstr "Liknar \"Övning 5: Skapa en vy för routing\":" +msgstr "Liknar `Övning 5: Skapa en vy för routing`_:" #: ../../build/docs/basic/graph_views.rst:504 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of ``2 mts/sec``. (line **7**)" diff --git a/locale/sv/LC_MESSAGES/basic/pedestrian.po b/locale/sv/LC_MESSAGES/basic/pedestrian.po index 87351b102..fc6b79de8 100644 --- a/locale/sv/LC_MESSAGES/basic/pedestrian.po +++ b/locale/sv/LC_MESSAGES/basic/pedestrian.po @@ -147,7 +147,7 @@ msgstr "|osmid_5| |place_5| (|id_5|)" msgid "The corresponding :code:`id` are shown in the following image, and a sample route from \"|place_3|\" to \"|place_5|\"." msgstr "" "Motsvarande :code:`id` visas i följande bild, och ett exempel på en rutt " -"från \"|plats_3|\" till \"|plats_5|\"." +"från \"|place_3|\" till \"|place_5|\"." #: ../../build/docs/basic/pedestrian.rst:105 msgid "Exercise 1: Single pedestrian routing" @@ -361,7 +361,7 @@ msgstr "Övning 5: Kombination av rutter" #: ../../build/docs/basic/pedestrian.rst:251 msgid "First pedestrian goes from \"|place_1|\" to \"|place_4|\"" -msgstr "Den första fotgängaren går från \"|plats_1|\" till \"|plats_4|\"" +msgstr "Den första fotgängaren går från \"|place_1|\" till \"|place_4|\"" #: ../../build/docs/basic/pedestrian.rst:252 msgid "Second pedestrian goes from \"|place_2|\" to \"|place_5|\"" @@ -431,7 +431,7 @@ msgstr "Resultat som aggregerade kostnader." msgid "Compare with `Exercise 4: Many Pedestrians going to different destinations`_ 's note." msgstr "" "Jämför med `Exercise 4: Many Pedestrians going to different " -"destinations`-anteckning." +"destinations`_-anteckning." #: ../../build/docs/basic/pedestrian.rst:335 msgid "Exercise 7: Many Pedestrians going to different destinations summarizing the total costs per departure" diff --git a/locale/sv/LC_MESSAGES/basic/plpgsql_function.po b/locale/sv/LC_MESSAGES/basic/plpgsql_function.po index 6e0ac5441..ef9bd4eb8 100644 --- a/locale/sv/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/sv/LC_MESSAGES/basic/plpgsql_function.po @@ -369,8 +369,8 @@ msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:143 msgid "Using the Postgis distance operator `<-> `__ to order by distance." msgstr "" -"Använd Postgis distansoperator `<-> <https://postgis.net/docs/" -"geometry_distance_knn.html>`__ för att beställa efter avstånd." +"Använd Postgis distansoperator `<-> `__ för att beställa efter avstånd." #: ../../build/docs/basic/plpgsql_function.rst:144 msgid "Get only the first row, to obtain the nearest identifier of the vertex." @@ -567,7 +567,7 @@ msgstr "Skapa funktionen ``wrk_fromAtoB``." #: ../../build/docs/basic/plpgsql_function.rst:331 msgid "Follow the description given at `Requirements for routing from A to B`_." -msgstr "Följ beskrivningen i avsnittet \"Krav på rutten från A till B\"." +msgstr "Följ beskrivningen i avsnittet `Krav på rutten från A till B`_." #: ../../build/docs/basic/plpgsql_function.rst:332 msgid "Use specialized functions:" diff --git a/locale/sv/LC_MESSAGES/basic/vehicle.po b/locale/sv/LC_MESSAGES/basic/vehicle.po index 6a998c6a9..690546079 100644 --- a/locale/sv/LC_MESSAGES/basic/vehicle.po +++ b/locale/sv/LC_MESSAGES/basic/vehicle.po @@ -325,7 +325,7 @@ msgstr "Från \"|place_3|\" till \"|place_1|\"" #: ../../build/docs/basic/vehicle.rst:249 #: ../../build/docs/basic/vehicle.rst:313 msgid "From |place_3| to |place_1|" -msgstr "Från |place_3 till |place_1" +msgstr "Från |place_3| till |place_1|" #: ../../build/docs/basic/vehicle.rst:256 msgid "Add a penalty column" diff --git a/locale/sv/LC_MESSAGES/interactions/chapter-9.po b/locale/sv/LC_MESSAGES/interactions/chapter-9.po index 98f148ddf..60da02e58 100644 --- a/locale/sv/LC_MESSAGES/interactions/chapter-9.po +++ b/locale/sv/LC_MESSAGES/interactions/chapter-9.po @@ -162,7 +162,7 @@ msgstr ":menuselection:`Högerklicka --> Egenskaper`" #: ../../build/docs/interactions/chapter-9.rst:108 msgid ":menuselection:`Style --> Color`" -msgstr ":menyval:`Stil --> Färg`" +msgstr ":menuselection:`Stil --> Färg`" #: ../../build/docs/interactions/chapter-9.rst:113 msgid ":menuselection:`Style --> + --> Symbol Layer Type --> Marker line`" @@ -179,7 +179,7 @@ msgstr "Kopiera/klistra in format" #: ../../build/docs/interactions/chapter-9.rst:123 msgid "Choose a formmated layer and :menuselection:`Right click --> Styles --> Copy Styles`" msgstr "" -"Välj ett förminskat lager och :menyval:`Högerklicka --> Stilar --> Kopiera " +"Välj ett förminskat lager och :menuselection:`Högerklicka --> Stilar --> Kopiera " "stilar`" #: ../../build/docs/interactions/chapter-9.rst:128