Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

Author: palvarezlopez

CMakeLists.txt

@@ -2,7 +2,7 @@
 set(Python_FIND_REGISTRY LAST)
 # Options
 option(CHECK_OPTIONAL_LIBS "Try to download / enable all optional libraries (use only EPL clean libraries, if set to false)" ON)
-option(MULTITHREADED_BUILD "Use all available cores for building (applies to Visual Studio only)" ON)
+option(MULTITHREADED_BUILD "Use all available cores for building (applies to Visual Studio only)" OFF)
 option(PROFILING "Enable output of profiling data (applies to gcc/clang builds only)")
 option(PPROF "Link the pprof profiler library (applies to gcc/clang builds only)")
 option(COVERAGE "Enable output of coverage data (applies to gcc/clang builds only)")
@@ -653,11 +653,13 @@ if (SUMO_LIBRARIES AND WIN32)
                            COMMAND ${CMAKE_COMMAND} -E copy_directory ${OSG_PATH}/bin/${OSG_PLUGIN_DIR} ${CMAKE_SOURCE_DIR}/bin/${OSG_PLUGIN_DIR}
                            DEPENDS ${OSG_PLUGIN_DLL})
     endif (HAVE_OSG)
-    # proj 7 needs to copy "share/proj" folder in SUMO_HOME/share
-    set(PROJ_DATA ${CMAKE_SOURCE_DIR}/share/proj/proj.db)
-    add_custom_command(OUTPUT ${PROJ_DATA}
-                       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJ_PATH}/share/proj ${CMAKE_SOURCE_DIR}/share/proj
-                       DEPENDS ${PROJ_PATH}/share/proj/proj.db)
+    if (PROJ_FOUND)
+        # proj 7 needs to copy "share/proj" folder in SUMO_HOME/share
+        set(PROJ_DATA ${CMAKE_SOURCE_DIR}/share/proj/proj.db)
+        add_custom_command(OUTPUT ${PROJ_DATA}
+                           COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJ_INCLUDE_DIR}/../share/proj ${CMAKE_SOURCE_DIR}/share/proj
+                           DEPENDS ${PROJ_INCLUDE_DIR}/../share/proj/proj.db)
+    endif ()
     install(DIRECTORY share/ DESTINATION ${DATA_PATH}share)
 endif()
 # set install dll targets, for non-Windows they depend on nothing

data/po/de_gui.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-06-20 08:20+0000\n"
+"POT-Creation-Date: 2025-06-26 15:58+0200\n"
 "PO-Revision-Date: 2025-06-16 05:35+0000\n"
 "Last-Translator: Mirko Barthauer <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/sumo-"

data/po/de_py.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-06-20 08:20+0000\n"
+"POT-Creation-Date: 2025-06-26 15:59+0200\n"
 "PO-Revision-Date: 2023-06-15 08:32+0000\n"
 "Last-Translator: Mirko Barthauer <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/"
@@ -25,120 +25,124 @@ msgstr "Interaktives Ampelspiel"
 
 #: tools/game/runner.py:68
 msgid "Railway Control"
-msgstr ""
+msgstr "Eisenbahnsteuerung"
 
 #: tools/game/runner.py:69
 msgid "Railway Control Demo"
-msgstr ""
+msgstr "Eisenbahnsteuerung (Demo)"
 
 #: tools/game/runner.py:70
+msgid "Research intersection Braunschweig"
+msgstr "Forschungskreuzung Braunschweig"
+
+#: tools/game/runner.py:71
 msgid "Research intersection Ingolstadt"
 msgstr "Forschungskreuzung Ingolstadt"
 
-#: tools/game/runner.py:71
+#: tools/game/runner.py:72
 msgid "Simple Junction"
 msgstr "Einfache Kreuzung"
 
-#: tools/game/runner.py:72
+#: tools/game/runner.py:73
 msgid "Simple Junction (Demo)"
 msgstr "Einfache Kreuzung (Demo)"
 
-#: tools/game/runner.py:73
+#: tools/game/runner.py:74
 msgid "Four Junctions"
 msgstr "Vier Kreuzungen"
 
-#: tools/game/runner.py:74
+#: tools/game/runner.py:75
 msgid "Six Junctions"
 msgstr "Sechs Kreuzungen"
 
-#: tools/game/runner.py:75
+#: tools/game/runner.py:76
 msgid "Prof. Kühne"
 msgstr "Prof. Kühne"
 
-#: tools/game/runner.py:76
+#: tools/game/runner.py:77
 msgid "3D Junction Virtual World"
 msgstr "3D Forschungskreuzung Virtuelle Welt"
 
-#: tools/game/runner.py:77
+#: tools/game/runner.py:78
 msgid "3D Junction OpenStreetMap"
 msgstr "3D Forschungskreuzung OpenStreetMap"
 
-#: tools/game/runner.py:78
+#: tools/game/runner.py:79
 msgid "Highway Ramp"
 msgstr "Autobahnauffahrt"
 
-#: tools/game/runner.py:79
+#: tools/game/runner.py:80
 msgid "Combined Highway On and Off Ramp"
 msgstr "Kombinierte Autobahnauf- und -abfahrt"
 
-#: tools/game/runner.py:80
+#: tools/game/runner.py:81
 msgid "Corridor"
 msgstr "Strecke"
 
-#: tools/game/runner.py:81
+#: tools/game/runner.py:82
 msgid "Highway Ramp A10"
 msgstr "A10 KW"
 
-#: tools/game/runner.py:82
+#: tools/game/runner.py:83
 msgid "Demand Responsive Transport (new)"
 msgstr "Bedarfsbus (neu)"
 
-#: tools/game/runner.py:83
+#: tools/game/runner.py:84
 msgid "DRT - Advanced (new)"
 msgstr "Bedarfsbus für Fortgeschrittene (neu)"
 
-#: tools/game/runner.py:84
+#: tools/game/runner.py:85
 msgid "DRT - Demo"
 msgstr "Bedarfsbus - Demo"
 
-#: tools/game/runner.py:85 tools/game/runner.py:95
+#: tools/game/runner.py:86 tools/game/runner.py:96
 msgid "Highscore"
 msgstr "Bestenliste"
 
-#: tools/game/runner.py:86
+#: tools/game/runner.py:87
 msgid "Reset Highscore"
 msgstr "Bestenliste zurücksetzen"
 
-#: tools/game/runner.py:87
+#: tools/game/runner.py:88
 msgid "German"
 msgstr "Deutsch"
 
-#: tools/game/runner.py:88
+#: tools/game/runner.py:89
 msgid "English"
 msgstr "Englisch"
 
-#: tools/game/runner.py:89
+#: tools/game/runner.py:90
 msgid "Italian"
 msgstr "Italienisch"
 
-#: tools/game/runner.py:90
+#: tools/game/runner.py:91
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: tools/game/runner.py:91
+#: tools/game/runner.py:92
 msgid "French"
 msgstr "Französisch"
 
-#: tools/game/runner.py:92
+#: tools/game/runner.py:93
 msgid "Chinese (simplified)"
 msgstr "Chinesisch (vereinfacht)"
 
-#: tools/game/runner.py:93
+#: tools/game/runner.py:94
 msgid "Chinese (traditional)"
 msgstr "Chinesisch (traditionell)"
 
-#: tools/game/runner.py:94
+#: tools/game/runner.py:95
 msgid "Quit"
 msgstr "Beenden"
 
-#: tools/game/runner.py:96
+#: tools/game/runner.py:97
 msgid "Congratulations!"
 msgstr "Glückwunsch!"
 
-#: tools/game/runner.py:97
+#: tools/game/runner.py:98
 msgid "Your Score"
 msgstr "Deine Punkte"
 
-#: tools/game/runner.py:98
+#: tools/game/runner.py:99
 msgid "Continue"
 msgstr "Weiter"