16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 14:49:20 +02:00

Merge remote-tracking branch 'tmj/master' into sim

This commit is contained in:
milek7
2020-10-18 23:35:14 +02:00
244 changed files with 54164 additions and 11636 deletions

View File

@@ -299,7 +299,9 @@ const std::string& locale::coupling_name(int c)
{ coupling::mainhose, STRN("main hose") },
{ coupling::heating, STRN("heating") },
{ coupling::permanent, STRN("permanent") },
{ coupling::uic, STRN("uic") }
{ coupling::power24v, STRN("power 24V") },
{ coupling::power110v, STRN("power 110V") },
{ coupling::power3x400v, STRN("power 3x400V") },
};
static std::string unknown(STRN("unknown"));