some more strings to translate, also fixing typos eclipse-sumo#11237 e…

…clipse-sumo#22

src/gui/dialogs/GUIDialog_AppSettings.cpp

@@ -20,6 +20,7 @@
 /****************************************************************************/
 #include <config.h>
 
+#include <utils/common/MsgHandler.h>
 #include <utils/gui/images/GUIIconSubSys.h>
 #include <utils/gui/images/GUITexturesHelper.h>
 #include <utils/gui/windows/GUIAppEnum.h>
@@ -58,19 +59,19 @@ GUIDialog_AppSettings::GUIDialog_AppSettings(GUIMainWindow* parent)
       myLocateLinks(GUIMessageWindow::locateLinksEnabled()) {
     FXCheckButton* b = nullptr;
     FXVerticalFrame* f1 = new FXVerticalFrame(this, LAYOUT_FILL_X | LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0, 0);
-    b = new FXCheckButton(f1, "Quit on Simulation End", this, MID_QUITONSIMEND);
+    b = new FXCheckButton(f1, TL("Quit on Simulation End"), this, MID_QUITONSIMEND);
     b->setCheck(myAppQuitOnEnd);
-    b = new FXCheckButton(f1, "Autostart Simulation on Load and Reload", this, MID_AUTOSTART);
+    b = new FXCheckButton(f1, TL("Autostart Simulation on Load and Reload"), this, MID_AUTOSTART);
     b->setCheck(myAppAutoStart);
-    b = new FXCheckButton(f1, "Reload Simulation after finish (Demo mode)", this, MID_DEMO);
+    b = new FXCheckButton(f1, TL("Reload Simulation after finish (Demo mode)"), this, MID_DEMO);
     b->setCheck(myAppDemo);
-    b = new FXCheckButton(f1, "Locate elements when clicking on messages", this, MID_LOCATELINKS);
+    b = new FXCheckButton(f1, TL("Locate elements when clicking on messages"), this, MID_LOCATELINKS);
     b->setCheck(myLocateLinks);
 
     FXMatrix* m1 = new FXMatrix(f1, 2, (LAYOUT_FILL_X | LAYOUT_LEFT | MATRIX_BY_COLUMNS), 0, 0, 0, 0, 10, 10, 10, 10, 5, 5);
     myBreakPointOffset = new FXRealSpinner(m1, 5, this, MID_TIMELINK_BREAKPOINT, GUIDesignViewSettingsSpinDial2 | SPIN_NOMIN);
     myBreakPointOffset->setValue(STEPS2TIME(GUIMessageWindow::getBreakPointOffset()));
-    new FXLabel(m1, "Breakpoint offset when clicking on time message", nullptr, GUIDesignViewSettingsLabel1);
+    new FXLabel(m1, TL("Breakpoint offset when clicking on time message"), nullptr, GUIDesignViewSettingsLabel1);
 
     myTable = new FXTable(f1, this, MID_TABLE, GUIDesignBreakpointTable);
     const auto& onlineMaps = parent->getOnlineMaps();
@@ -95,11 +96,11 @@ GUIDialog_AppSettings::GUIDialog_AppSettings(GUIMainWindow* parent)
     }
 
     new FXHorizontalSeparator(f1, SEPARATOR_GROOVE | LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_FILL_X);
-    b = new FXCheckButton(f1, "Allow Textures", this, MID_ALLOWTEXTURES);
+    b = new FXCheckButton(f1, TL("Allow Textures"), this, MID_ALLOWTEXTURES);
     b->setCheck(myAllowTextures);
     FXHorizontalFrame* f2 = new FXHorizontalFrame(f1, LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_FILL_X | PACK_UNIFORM_WIDTH, 0, 0, 0, 0, 10, 10, 5, 5);
-    FXButton* initial = new FXButton(f2, "&OK", nullptr, this, MID_SETTINGS_OK, BUTTON_INITIAL | BUTTON_DEFAULT | FRAME_RAISED | FRAME_THICK | LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_CENTER_X, 0, 0, 0, 0, 30, 30, 4, 4);
-    new FXButton(f2, "&Cancel", nullptr, this, MID_SETTINGS_CANCEL, BUTTON_DEFAULT | FRAME_RAISED | FRAME_THICK | LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_CENTER_X, 0, 0, 0, 0, 30, 30, 4, 4);
+    FXButton* initial = new FXButton(f2, TL("&OK"), nullptr, this, MID_SETTINGS_OK, BUTTON_INITIAL | BUTTON_DEFAULT | FRAME_RAISED | FRAME_THICK | LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_CENTER_X, 0, 0, 0, 0, 30, 30, 4, 4);
+    new FXButton(f2, TL("&Cancel"), nullptr, this, MID_SETTINGS_CANCEL, BUTTON_DEFAULT | FRAME_RAISED | FRAME_THICK | LAYOUT_TOP | LAYOUT_LEFT | LAYOUT_CENTER_X, 0, 0, 0, 0, 30, 30, 4, 4);
     initial->setFocus();
     setIcon(GUIIconSubSys::getIcon(GUIIcon::EMPTY));
 }

src/microsim/MSVehicle.cpp

@@ -2704,7 +2704,7 @@ MSVehicle::planMoveInternal(const SUMOTime t, MSLeaderInfo ahead, DriveItemVecto
                 //std::cout << "   blocker=" << Named::getIDSecure(blocker.first) << "\n";
             }
             if (n == 0) {
-                WRITE_WARNINGF(TL("Suspicious right_before_left junction '%s'."), lane->getEdge().getToJunction()->getID());
+                WRITE_WARNINGF(TL("Suspicious right_before_left junction '%'."), lane->getEdge().getToJunction()->getID());
             }
             //std::cout << "   blockerLink=" << blocker.second << " link=" << *link << "\n";
             if (blocker.second == *link) {

src/microsim/transportables/MSPerson.cpp

@@ -85,15 +85,15 @@ MSPerson::MSPersonStage_Walking::clone() const {
     if (myRouteID != "" && MSRoute::distDictionary(myRouteID) != nullptr) {
         route = MSRoute::dictionary(myRouteID, MSRouteHandler::getParsingRNG())->getEdges();
         if (departPos > route[0]->getLength()) {
-            WRITE_WARNINGF(TL("Adjusting departPos for cloned walk with routeDistribution '%s'"), myRouteID);
+            WRITE_WARNINGF(TL("Adjusting departPos for cloned walk with routeDistribution '%'"), myRouteID);
             departPos = route[0]->getLength();
         }
         if (arrivalPos > route.back()->getLength()) {
-            WRITE_WARNINGF(TL("Adjusting arrivalPos for cloned walk with routeDistribution '%s'"), myRouteID);
+            WRITE_WARNINGF(TL("Adjusting arrivalPos for cloned walk with routeDistribution '%'"), myRouteID);
             arrivalPos = route.back()->getLength();
         }
         if (departLane >= route[0]->getNumLanes()) {
-            WRITE_WARNINGF(TL("Adjusting departLane for cloned walk with routeDistribution '%s'"), myRouteID);
+            WRITE_WARNINGF(TL("Adjusting departLane for cloned walk with routeDistribution '%'"), myRouteID);
             departLane = route[0]->getNumLanes() - 1;
         }
     }

src/netbuild/NBEdge.cpp

@@ -4363,7 +4363,7 @@ NBEdge::hasRestrictedLane(SUMOVehicleClass vclass) const {
 void
 NBEdge::addRestrictedLane(double width, SUMOVehicleClass vclass) {
     if (hasRestrictedLane(vclass)) {
-        WRITE_WARNINGF(TL("Edge '%' already has a dedicated lane for %s. Not adding another one."), getID(), toString(vclass));
+        WRITE_WARNINGF(TL("Edge '%' already has a dedicated lane for %. Not adding another one."), getID(), toString(vclass));
         return;
     }
     if (myLaneSpreadFunction == LaneSpreadFunction::CENTER) {
@@ -4400,7 +4400,7 @@ void
 NBEdge::restoreRestrictedLane(SUMOVehicleClass vclass, std::vector<NBEdge::Lane> oldLanes, PositionVector oldGeometry, std::vector<NBEdge::Connection> oldConnections) {
     // check that previously lane was transformed
     if (myLanes[0].permissions != vclass) {
-        WRITE_WARNINGF(TL("Edge '%' doesn't have a dedicated lane for %s. Cannot be restored."), getID(), toString(vclass));
+        WRITE_WARNINGF(TL("Edge '%' doesn't have a dedicated lane for %. Cannot be restored."), getID(), toString(vclass));
         return;
     }
     // restore old values

src/netbuild/NBNodeCont.cpp

@@ -710,7 +710,7 @@ NBNodeCont::addCluster2Join(const std::set<std::string>& cluster, NBNode* node)
         myJoined.insert(validCluster.begin(), validCluster.end());
         myClusters2Join.push_back(std::make_pair(validCluster, node));
     } else {
-        WRITE_WARNINGF(TL("Ignoring join-cluster '%s' because it has size '%'."), node->getID(), validCluster.size());
+        WRITE_WARNINGF(TL("Ignoring join-cluster '%' because it has size '%'."), node->getID(), validCluster.size());
     }
 }
 

src/netbuild/NBParking.cpp

@@ -68,7 +68,7 @@ NBParking::write(OutputDevice& device, NBEdgeCont& ec) const {
         }
         device.closeTag();
     } else {
-        WRITE_WARNINGF(TL("could not find edge for parkingArea '%s'"), getID());
+        WRITE_WARNINGF(TL("Could not find edge for parkingArea '%'."), getID());
     }
     // XXX else: prevent edge merging via --geometry.remove
 }