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

eclipse-sumo · Aug 7, 2023 · d5d1f30 · d5d1f30
2 parents 65c979d + a71b13d
commit d5d1f30
Show file tree

Hide file tree

Showing 106 changed files with 417 additions and 385 deletions.
diff --git a/data/po/de_gui.po b/data/po/de_gui.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: sumo-dev@eclipse.org\n"
 "POT-Creation-Date: 2023-08-02 17:04+0200\n"
-"PO-Revision-Date: 2023-08-02 14:56+0000\n"
-"Last-Translator: Angelo Banse <angelo_22@outlook.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/sumo-"
-"gui-netedit/de/>\n"
+"PO-Revision-Date: 2023-08-05 10:05+0000\n"
+"Last-Translator: Mirko Barthauer <mirko.barthauer@dlr.de>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/"
+"sumo-gui-netedit/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1490,7 +1490,7 @@ msgstr "mittlere Anzahl an Anhaltevorgängen im vorherigen Intervall [#]"
 
 #: C:\Repos\sumo/src\guisim\GUIE3Collector.cpp:94
 msgid "last interval mean time loss [s]"
-msgstr ""
+msgstr "mittlere Verlustzeit im vorherigen Intervall [s]"
 
 #: C:\Repos\sumo/src\guisim\GUIE3Collector.cpp:96
 msgid "last interval mean vehicle count [#]"
@@ -1508,160 +1508,160 @@ msgstr "Straßenname"
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:187
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:1026
 msgid "pending insertions [#]"
-msgstr ""
+msgstr "ausstehende Fahrzeuge [#]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:188
 msgid "mean friction [%]"
-msgstr ""
+msgstr "mittlerer Reibungskoeffizient [%]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:189
 msgid "mean vehicle speed [m/s]"
-msgstr ""
+msgstr "mittlere Fahrzeuggeschwindigkeit [m/s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:190
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:1021
 msgid "routing speed [m/s]"
-msgstr ""
+msgstr "Geschwindigkeit für Routing [m/s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:191
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:1023
 msgid "time penalty [s]"
-msgstr ""
+msgstr "Zeitstrafe [s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:192
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:1024
 msgid "brutto occupancy [%]"
-msgstr ""
+msgstr "Bruttobelegungsgrad [%]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:193
 msgid "flow [veh/h/lane]"
-msgstr ""
+msgstr "Fluss [veh/h/Fahrstreifen]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:197
 msgid "segment index"
-msgstr ""
+msgstr "Segmentindex"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:198
 msgid "segment queues"
-msgstr ""
+msgstr "Segmentwarteschlangen"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:199
 msgid "segment length [m]"
-msgstr ""
+msgstr "Segmentlänge [m]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:200
 msgid "segment allowed speed [m/s]"
-msgstr ""
+msgstr "Höchstgeschwindigkeit im Segment [m/s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:201
 msgid "segment jam threshold [%]"
-msgstr ""
+msgstr "Schwellwert für Rückstau im Segment [%]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:202
 msgid "segment brutto occupancy [%]"
-msgstr ""
+msgstr "Bruttobelegungsgrad im Segment [%]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:203
 msgid "segment mean vehicle speed [m/s]"
-msgstr ""
+msgstr "mittlere Fahrzeuggeschwindigkeit im Segment [m/s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:204
 msgid "segment flow [veh/h/lane]"
-msgstr ""
+msgstr "Fluss durch Segment [veh/h/Fahrstreifen]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:205
 msgid "segment vehicles [#]"
-msgstr ""
+msgstr "Fahrzeuge im Segment [#]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:206
 msgid "segment leader leave time"
-msgstr ""
+msgstr "Ausfahrtszeit des führenden Fahrzeugs des Segments"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:207
 msgid "segment headway [s]"
-msgstr ""
+msgstr "mittlere Fahrzeugfolgezeit im Segment [s]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:208
 msgid "segment entry block time [s]"
 msgstr ""
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:226
 msgid "Type Information:"
-msgstr ""
+msgstr "Typeninformation:"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:227
 msgid "type [id]"
-msgstr ""
+msgstr "Typ [id]"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:228
 msgid "tauff"
-msgstr ""
+msgstr "tauff"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:229
 msgid "taufj"
-msgstr ""
+msgstr "taufj"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:230
 msgid "taujf"
-msgstr ""
+msgstr "taujf"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:231
 msgid "taujj"
-msgstr ""
+msgstr "taujj"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:232
 msgid "jam threshold"
-msgstr ""
+msgstr "Rückstauschwellwert"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:233
 msgid "junction control"
-msgstr ""
+msgstr "Knotenpunktsteuerung"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:234
 msgid "tls penalty"
-msgstr ""
+msgstr "LSA-Strafe"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:235
 msgid "tls flow penalty"
-msgstr ""
+msgstr "LSA-Flussstrafe"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:236
 msgid "minor penalty"
-msgstr ""
+msgstr "Strafe für Nebenrichtung"
 
 #: C:\Repos\sumo/src\guisim\GUIEdge.cpp:237
 msgid "overtaking"
-msgstr ""
+msgstr "Überholvorgang"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:150
 msgid "entered vehicles [-]"
-msgstr ""
+msgstr "eingefahrene Fahrzeuge [-]"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:156
 msgid "vehicle length [m]"
-msgstr ""
+msgstr "Fahrzeuglänge [m]"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:158
 msgid "empty time [s]"
-msgstr ""
+msgstr "Zeit ohne Fahrzeuge [s]"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:160
 msgid "occupied time [s]"
-msgstr ""
+msgstr "Belegungsdauer [s]"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:162
 msgid "interval entered vehicles [#]"
-msgstr ""
+msgstr "im Intervall eingefahrene Fahrzeuge [#]"
 
 #: C:\Repos\sumo/src\guisim\GUIInductLoop.cpp:168
 msgid "last interval entered vehicles [#]"
-msgstr ""
+msgstr "im vorherigen Intervall eingefahrene Fahrzeuge [#]"
 
 #: C:\Repos\sumo/src\guisim\GUIJunctionWrapper.cpp:114
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:1028
 #: C:\Repos\sumo/src\guisim\GUITrafficLightLogicWrapper.cpp:241
 msgid "type"
-msgstr ""
+msgstr "Typ"
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:964
 msgid "Copy edge name to clipboard"
@@ -1677,19 +1677,19 @@ msgstr "Höhe: "
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:981
 msgid "Reopen lane"
-msgstr ""
+msgstr "Fahrstreifen wieder öffnen"
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:982
 msgid "Reopen edge"
-msgstr ""
+msgstr "Kante wieder öffnen"
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:984
 msgid "Reopen lane (override rerouter)"
-msgstr ""
+msgstr "Fahrstreifen wieder öffnen (Rerouter übersteuern)"
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:985
 msgid "Reopen edge (override rerouter)"
-msgstr ""
+msgstr "Kante wieder öffnen (Rerouter übersteuern)"
 
 #: C:\Repos\sumo/src\guisim\GUILane.cpp:988
 msgid "Close lane"

diff --git a/data/po/zh_py.po b/data/po/zh_py.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: sumo-dev@eclipse.org\n"
 "POT-Creation-Date: 2023-07-21 15:19+0200\n"
-"PO-Revision-Date: 2023-05-25 07:25+0000\n"
-"Last-Translator: yunpangfloetteroed <yun-pang.floetteroed@dlr.de>\n"
+"PO-Revision-Date: 2023-08-05 10:05+0000\n"
+"Last-Translator: hongsheng cui <glychs@126.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "eclipse-sumo/python-tools/zh_Hans/>\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.0-dev\n"
 
 #: C:\Repos\sumo/tools/game\runner.py:63
 msgid "Interactive Traffic Light"
@@ -101,23 +101,23 @@ msgstr "英语"
 
 #: C:\Repos\sumo/tools/game\runner.py:83
 msgid "Italian"
-msgstr ""
+msgstr "意大利语"
 
 #: C:\Repos\sumo/tools/game\runner.py:84
 msgid "Spanish"
-msgstr ""
+msgstr "西班牙语"
 
 #: C:\Repos\sumo/tools/game\runner.py:85
 msgid "French"
-msgstr ""
+msgstr "法语"
 
 #: C:\Repos\sumo/tools/game\runner.py:86
 msgid "Chinese (simplified)"
-msgstr ""
+msgstr "中文（简体）"
 
 #: C:\Repos\sumo/tools/game\runner.py:87
 msgid "Chinese (traditional)"
-msgstr ""
+msgstr "中文（繁体）"
 
 #: C:\Repos\sumo/tools/game\runner.py:88
 msgid "Quit"