Skip to content

Commit

Permalink
Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Sep 24, 2024
2 parents 4dd3224 + ee1cd06 commit 7cd8b37
Show file tree
Hide file tree
Showing 185 changed files with 17,903 additions and 2,756 deletions.
20 changes: 13 additions & 7 deletions data/po/de_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-22 10:12+0200\n"
"PO-Revision-Date: 2024-09-19 16:24+0000\n"
"PO-Revision-Date: 2024-09-23 12:31+0000\n"
"Last-Translator: Mirko Barthauer <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/"
"applications/de/>\n"
Expand Down Expand Up @@ -5452,15 +5452,15 @@ msgstr ""

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:344
msgid "Error while adding a journey for person '%': %"
msgstr ""
msgstr "Fehler beim Hinzufügen einer Reise von Person '%': %"

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:378
msgid "Error while switching to a new journey for person '%': %"
msgstr ""
msgstr "Fehler beim Übergang zu einer neuen Reise von Person '%': %"

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:409
msgid "Error during iteration %: %"
msgstr ""
msgstr "Fehler im Schritt %: %"

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:572
msgid "Person '%' in vanishing area '%' was removed from the simulation."
Expand Down Expand Up @@ -5533,12 +5533,14 @@ msgstr "Fehler bei der Generierung der Geometrie: %"

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:1133
msgid "Error while adding waiting set for % on '%': %"
msgstr ""
msgstr "Fehler beim Hinzufügen einer Warteaktivität für % auf '%': %"

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:1183
msgid ""
"Adapting geometry repulsion default values for jupedsim timestep of 0.02."
msgstr ""
"Anpassung der Geometrieabstoßkraftstandardwerte an den JuPedSim-Zeitschritt "
"von 0.02."

#: src/microsim/transportables/MSPModel_JuPedSim.cpp:1229
msgid "Error creating the pedestrian model: %"
Expand Down Expand Up @@ -5569,6 +5571,8 @@ msgstr " zwischen Kante '%' und Kante '%'"
#: src/microsim/transportables/MSPModel_Striping.cpp:1528
msgid "Person '%' walking from edge '%' to edge '%' has a disconnect%, time=%."
msgstr ""
"Die Person '%' bemerkt auf dem Fußweg von Kante '%' nach '%' eine "
"Unterbrechung%, zur Zeit=%."

#: src/microsim/transportables/MSPModel_Striping.cpp:1831
msgid "Disconnected walk for person '%'."
Expand All @@ -5591,6 +5595,8 @@ msgid ""
"Vehicle '%' exceeds containerCapacity % when placing triggered container "
"'%', time=%"
msgstr ""
"Das Fahrzeug '%' überschreitet seine Containerkapazität % mit dem zu "
"ladenden, ausgelösten Container '%', zur Zeit=%"

#: src/microsim/transportables/MSStageTrip.cpp:154
msgid ""
Expand Down Expand Up @@ -5705,7 +5711,7 @@ msgstr "Attribut % der Ladestation mit der ID='%' ist ungültig (%)."

#: src/microsim/trigger/MSChargingStation.cpp:71
msgid "ChargingStation with ID='%' doesn't have a valid position (% < %)."
msgstr ""
msgstr "Die Ladestation mit ID='%' hat keine gültige Position (% < %)."

#: src/microsim/trigger/MSLaneSpeedTrigger.cpp:166
msgid "Invalid or unsorted time entry in vss '%'."
Expand Down Expand Up @@ -12284,7 +12290,7 @@ msgstr "Unbekanntes Element"
#: src/utils/distribution/Distribution_Parameterized.cpp:84
#: src/utils/distribution/Distribution_Parameterized.cpp:100
msgid "Invalid format of distribution parameterized"
msgstr "Ungültiges Verteilungsformat parametrisiert"
msgstr "Ungültiges Format einer parametrisierten Verteilung"

#: src/utils/distribution/Distribution_Parameterized.cpp:170
msgid "minimum value % larger than maximum %"
Expand Down
12 changes: 7 additions & 5 deletions data/po/es_gui.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-22 10:12+0200\n"
"PO-Revision-Date: 2024-07-30 08:09+0000\n"
"PO-Revision-Date: 2024-09-24 07:30+0000\n"
"Last-Translator: Angelo Banse <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/eclipse-sumo/"
"sumo-gui-netedit/es/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.7-dev\n"
"X-Generator: Weblate 5.8-dev\n"

#: src/gui/GUIApplicationWindow.cpp:299 src/gui/GUIApplicationWindow.cpp:302
#: src/gui/GUIApplicationWindow.cpp:2235 src/gui/GUIApplicationWindow.cpp:2236
Expand Down Expand Up @@ -10686,15 +10686,15 @@ msgstr "agregar reroute de cerrado en '"

#: src/netedit/elements/additional/GNEAdditionalHandler.cpp:1052
msgid "add dest prob reroute in '"
msgstr ""
msgstr "agregar reroute probabilístico de destino en '"

#: src/netedit/elements/additional/GNEAdditionalHandler.cpp:1080
msgid "add parking area reroute in '"
msgstr ""
msgstr "agregar reroute de zona de estacionamiento en '"

#: src/netedit/elements/additional/GNEAdditionalHandler.cpp:1108
msgid "add route prob reroute in '"
msgstr ""
msgstr "agregar reroute probabilístico de ruta en '"

#: src/netedit/elements/additional/GNEAdditionalHandler.cpp:1145
msgid "add route probe '"
Expand Down Expand Up @@ -13511,6 +13511,8 @@ msgstr "Crear relación TAZ"
#: src/netedit/frames/data/GNETAZRelDataFrame.cpp:56
msgid "Click fromTaz and toTaz (confirm hotkey <ENTER>)"
msgstr ""
"Haga clic en la zona de análisis de tráfico (TAZ) de origen y destino ("
"confirme usando la tecla <ENTER>)"

#: src/netedit/frames/data/GNETAZRelDataFrame.cpp:58
msgid "Clear selection"
Expand Down
30 changes: 21 additions & 9 deletions data/po/es_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-22 10:12+0200\n"
"PO-Revision-Date: 2024-07-30 08:09+0000\n"
"PO-Revision-Date: 2024-09-24 07:30+0000\n"
"Last-Translator: Angelo Banse <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/eclipse-sumo/"
"applications/es/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.7-dev\n"
"X-Generator: Weblate 5.8-dev\n"

#: src/activitygen/AGActivityGen.cpp:46
msgid "Reading input"
Expand Down Expand Up @@ -236,7 +236,7 @@ msgstr "Agregar detectores de origen a la salida de validación"

#: src/dfrouter/RODFFrame.cpp:123
msgid "Derive missing flow values from upstream or downstream (not working!)"
msgstr ""
msgstr "Inferir valores de flujo faltantes desde arriba o abajo (¡no funciona!)"

#: src/dfrouter/RODFFrame.cpp:127
msgid "Switches to highway-mode"
Expand Down Expand Up @@ -335,6 +335,8 @@ msgid ""
"Try to determine further inflows to an inbetween detector when computing "
"split probabilities"
msgstr ""
"Intentar determinar más entradas a un detector intermedio al calcular las "
"probabilidades de división"

#: src/dfrouter/RODFFrame.cpp:205
msgid "Scale factor for flows"
Expand Down Expand Up @@ -418,7 +420,7 @@ msgstr " % detectores sumidero"
#: src/dfrouter/RODFNet.cpp:145
#, c-format
msgid " % in-between detectors"
msgstr ""
msgstr " % detectores intermedios"

#: src/dfrouter/RODFNet.cpp:146
#, c-format
Expand Down Expand Up @@ -546,19 +548,19 @@ msgstr "Escribiendo emitters"

#: src/dfrouter/dfrouter_main.cpp:210
msgid "Writing emitter pois"
msgstr "Escribir puntos de interés emisores"
msgstr "Escribiendo puntos de interés emisores"

#: src/dfrouter/dfrouter_main.cpp:217
msgid "Writing speed triggers"
msgstr "Escribir activadores de velocidad"
msgstr "Escribiendo activadores de velocidad"

#: src/dfrouter/dfrouter_main.cpp:224
msgid "Writing validation detectors"
msgstr "Escribir detectores de validación"
msgstr "Escribiendo detectores de validación"

#: src/dfrouter/dfrouter_main.cpp:231
msgid "Writing highway end rerouter"
msgstr ""
msgstr "Escribiendo rerouter de fin de autopista"

#: src/dfrouter/dfrouter_main.cpp:251
msgid "Builds vehicle routes for SUMO using detector values."
Expand Down Expand Up @@ -1141,6 +1143,7 @@ msgstr "Usar STR como definición de línea de tiempo de 24 horas"
#: src/marouter/ROMAFrame.cpp:168
msgid "Keep traffic flows of all time slots in the net"
msgstr ""
"Mantener los flujos de tráfico de todos los intervalos de tiempo en la red"

#: src/marouter/ROMAFrame.cpp:172
msgid "Choose a assignment method: incremental, UE or SUE"
Expand All @@ -1167,6 +1170,7 @@ msgstr ""
#: src/marouter/ROMAFrame.cpp:184
msgid "Penalize existing routes with FLOAT to find secondary routes"
msgstr ""
"Penalizar las rutas existentes con FLOAT, para encontrar rutas secundarias"

#: src/marouter/ROMAFrame.cpp:188
msgid "Use FLOAT as the upper bound to determine auxiliary link cost"
Expand Down Expand Up @@ -1311,13 +1315,17 @@ msgstr ""
msgid ""
"Vehicle '%' ignores triggered stop on lane '%' due to capacity constraints."
msgstr ""
"El vehículo '%' ignora la parada desencadenada en el carril '%' debido a "
"restricciones de capacidad."

#: src/mesosim/MEVehicle.cpp:390 src/microsim/MSVehicle.cpp:1706
#, c-format
msgid ""
"Vehicle '%' ignores container triggered stop on lane '%' due to capacity "
"constraints."
msgstr ""
"El vehículo '%' ignora la parada desencadenada por un contenedor en el "
"carril '%' debido a restricciones de capacidad."

#: src/mesosim/MEVehicle.cpp:557
msgid "Error: Invalid vehicles in state (may be a micro state)!"
Expand Down Expand Up @@ -1366,6 +1374,8 @@ msgid ""
"Vehicle is moving past junction and committed to move to another successor "
"edge"
msgstr ""
"El vehículo se está moviendo más allá del cruce e ingresará a una arista "
"sucesora"

#: src/microsim/MSBaseVehicle.cpp:593
msgid "Vehicle '%' could not assign stop '%' after rerouting (%) at time=%."
Expand Down Expand Up @@ -1450,10 +1460,12 @@ msgstr ""
#: src/microsim/MSBaseVehicle.cpp:1912
msgid "no route found from edge '%' to stop edge '%'"
msgstr ""
"no se encontró una ruta desde la arista '%' hacia la arista de parada '%'"

#: src/microsim/MSBaseVehicle.cpp:1700 src/microsim/MSBaseVehicle.cpp:1921
msgid "no route found from stop edge '%' to edge '%'"
msgstr ""
"no se encontró una ruta desde la arista de parada '%' hacia la arista '%'"

#: src/microsim/MSBaseVehicle.cpp:1712 src/microsim/MSBaseVehicle.cpp:1935
msgid ""
Expand Down Expand Up @@ -4533,7 +4545,7 @@ msgstr ""

#: src/microsim/devices/MSDevice_StationFinder.cpp:129
msgid "Invalid device.stationfinder.chargingStrategy '%'."
msgstr ""
msgstr "Estrategia no válida para device.stationfinder.chargingStrategy '%'."

#: src/microsim/devices/MSDevice_StationFinder.cpp:139
msgid "Invalid device.stationfinder.rescueAction '%'."
Expand Down
Loading

0 comments on commit 7cd8b37

Please sign in to comment.