Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup of string marked translatable. #457

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Cleanup of string marked translatable. #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions shared/ui/aboutdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>About qdrm</string>
<string>About qdmr</string>
</property>
<property name="windowIcon">
<iconset>
Expand Down Expand Up @@ -52,7 +52,7 @@
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;title&gt;About qdmr&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:600;&quot;&gt;qdmr&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:600;&quot;&gt;Version %1&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:600;&quot;&gt;Hannes Matuschek, DM3MAT&lt;br /&gt; [email protected]&lt;/span&gt;&lt;/p&gt;
Expand Down
7 changes: 2 additions & 5 deletions shared/ui/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@
</size>
</property>
<property name="windowTitle">
<string>qdmr [*]</string>
<string notr="true">qdmr [*]</string>
</property>
<property name="windowIcon">
<iconset theme="qdmr">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="accessibleName">
<string>Main window</string>
</property>
<property name="documentMode">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -70,7 +67,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>22</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand Down
2 changes: 1 addition & 1 deletion src/analogchanneldialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<string>Off</string>
</property>
<property name="suffix">
<string extracomment="Transmit time out (TOT) in seconds. A value of 0 means disabled."> s</string>
<string notr="true" extracomment="Transmit time out (TOT) in seconds. A value of 0 means disabled."> s</string>
</property>
<property name="maximum">
<number>9999</number>
Expand Down
176 changes: 88 additions & 88 deletions src/aprssystemdialog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,94 @@


static QVector<QPair<APRSSystem::Icon, QString>> aprsIconTable{
{APRSSystem::Icon::None, QObject::tr("[None]")},
{APRSSystem::Icon::PoliceStation, QObject::tr("Police station")},
{APRSSystem::Icon::Digipeater, QObject::tr("Digipeater")},
{APRSSystem::Icon::Phone, QObject::tr("Phone")},
{APRSSystem::Icon::DXCluster, QObject::tr("DX cluster")},
{APRSSystem::Icon::HFGateway, QObject::tr("HF gateway")},
{APRSSystem::Icon::SmallPlane, QObject::tr("Plane small")},
{APRSSystem::Icon::MobileSatelliteStation, QObject::tr("Mobile Satellite station")},
{APRSSystem::Icon::WheelChair, QObject::tr("Wheel Chair")},
{APRSSystem::Icon::Snowmobile, QObject::tr("Snowmobile")},
{APRSSystem::Icon::RedCross, QObject::tr("Red cross")},
{APRSSystem::Icon::BoyScout, QObject::tr("Boy scout")},
{APRSSystem::Icon::Home, QObject::tr("Home")},
{APRSSystem::Icon::X, QObject::tr("X")},
{APRSSystem::Icon::RedDot, QObject::tr("Red dot")},
{APRSSystem::Icon::Circle0, QObject::tr("Circle 0")},
{APRSSystem::Icon::Circle1, QObject::tr("Circle 1")},
{APRSSystem::Icon::Circle2, QObject::tr("Circle 2")},
{APRSSystem::Icon::Circle3, QObject::tr("Circle 3")},
{APRSSystem::Icon::Circle4, QObject::tr("Circle 4")},
{APRSSystem::Icon::Circle5, QObject::tr("Circle 5")},
{APRSSystem::Icon::Circle6, QObject::tr("Circle 6")},
{APRSSystem::Icon::Circle7, QObject::tr("Circle 7")},
{APRSSystem::Icon::Circle8, QObject::tr("Circle 8")},
{APRSSystem::Icon::Circle9, QObject::tr("Circle 9")},
{APRSSystem::Icon::Fire, QObject::tr("Fire")},
{APRSSystem::Icon::Campground, QObject::tr("Campground")},
{APRSSystem::Icon::Motorcycle, QObject::tr("Motorcycle")},
{APRSSystem::Icon::RailEngine, QObject::tr("Rail engine")},
{APRSSystem::Icon::Car, QObject::tr("Car")},
{APRSSystem::Icon::FileServer, QObject::tr("File server")},
{APRSSystem::Icon::HCFuture, QObject::tr("HC Future")},
{APRSSystem::Icon::AidStation, QObject::tr("Aid station")},
{APRSSystem::Icon::BBS, QObject::tr("BBS")},
{APRSSystem::Icon::Canoe, QObject::tr("Canoe")},
{APRSSystem::Icon::Eyeball, QObject::tr("Eyeball")},
{APRSSystem::Icon::Tractor, QObject::tr("Tractor")},
{APRSSystem::Icon::GridSquare, QObject::tr("Grid Square")},
{APRSSystem::Icon::Hotel, QObject::tr("Hotel")},
{APRSSystem::Icon::TCPIP, QObject::tr("TCP/IP")},
{APRSSystem::Icon::School, QObject::tr("School")},
{APRSSystem::Icon::Logon, QObject::tr("Logon")},
{APRSSystem::Icon::MacOS, QObject::tr("MacOS")},
{APRSSystem::Icon::NTSStation, QObject::tr("NTS station")},
{APRSSystem::Icon::Balloon, QObject::tr("Balloon")},
{APRSSystem::Icon::PoliceCar, QObject::tr("Police car")},
{APRSSystem::Icon::TBD, QObject::tr("TBD")},
{APRSSystem::Icon::RV, QObject::tr("RV")},
{APRSSystem::Icon::Shuttle, QObject::tr("Shuttle")},
{APRSSystem::Icon::SSTV, QObject::tr("SSTV")},
{APRSSystem::Icon::Bus, QObject::tr("Bus")},
{APRSSystem::Icon::ATV, QObject::tr("ATV")},
{APRSSystem::Icon::WXService, QObject::tr("Weather service")},
{APRSSystem::Icon::Helo, QObject::tr("Helo")},
{APRSSystem::Icon::Yacht, QObject::tr("Yacht")},
{APRSSystem::Icon::Windows, QObject::tr("MS Windows")},
{APRSSystem::Icon::Jogger, QObject::tr("Jogger")},
{APRSSystem::Icon::Triangle, QObject::tr("Triangle")},
{APRSSystem::Icon::PBBS, QObject::tr("PBBS")},
{APRSSystem::Icon::LargePlane, QObject::tr("Plane large")},
{APRSSystem::Icon::WXStation, QObject::tr("Weather station")},
{APRSSystem::Icon::DishAntenna, QObject::tr("Dish antenna")},
{APRSSystem::Icon::Ambulance, QObject::tr("Ambulance")},
{APRSSystem::Icon::Bike, QObject::tr("Bike")},
{APRSSystem::Icon::ICP, QObject::tr("ICP")},
{APRSSystem::Icon::FireStation, QObject::tr("Fire station")},
{APRSSystem::Icon::Horse, QObject::tr("Horse")},
{APRSSystem::Icon::FireTruck, QObject::tr("Fire truck")},
{APRSSystem::Icon::Glider, QObject::tr("Glider")},
{APRSSystem::Icon::Hospital, QObject::tr("Hospital")},
{APRSSystem::Icon::IOTA, QObject::tr("IOTA")},
{APRSSystem::Icon::Jeep, QObject::tr("Jeep")},
{APRSSystem::Icon::SmallTruck, QObject::tr("Truck small")},
{APRSSystem::Icon::Laptop, QObject::tr("Laptop")},
{APRSSystem::Icon::MicE, QObject::tr("Mic-E")},
{APRSSystem::Icon::Node, QObject::tr("Node")},
{APRSSystem::Icon::EOC, QObject::tr("EOC")},
{APRSSystem::Icon::Rover, QObject::tr("Rover")},
{APRSSystem::Icon::Grid, QObject::tr("Grid")},
{APRSSystem::Icon::Antenna, QObject::tr("Antenna")},
{APRSSystem::Icon::PowerBoat, QObject::tr("Power boat")},
{APRSSystem::Icon::TruckStop, QObject::tr("Truck stop")},
{APRSSystem::Icon::TruckLarge, QObject::tr("Truck large")},
{APRSSystem::Icon::Van, QObject::tr("Van")},
{APRSSystem::Icon::Water, QObject::tr("Water")},
{APRSSystem::Icon::XAPRS, QObject::tr("XAPRS")},
{APRSSystem::Icon::Yagi, QObject::tr("Yagi")},
{APRSSystem::Icon::Shelter, QObject::tr("Shelter")}};
{APRSSystem::Icon::None, APRSSystem::tr("[None]")},
{APRSSystem::Icon::PoliceStation, APRSSystem::tr("Police station")},
{APRSSystem::Icon::Digipeater, APRSSystem::tr("Digipeater")},
{APRSSystem::Icon::Phone, APRSSystem::tr("Phone")},
{APRSSystem::Icon::DXCluster, APRSSystem::tr("DX cluster")},
{APRSSystem::Icon::HFGateway, APRSSystem::tr("HF gateway")},
{APRSSystem::Icon::SmallPlane, APRSSystem::tr("Plane small")},
{APRSSystem::Icon::MobileSatelliteStation, APRSSystem::tr("Mobile Satellite station")},
{APRSSystem::Icon::WheelChair, APRSSystem::tr("Wheel Chair")},
{APRSSystem::Icon::Snowmobile, APRSSystem::tr("Snowmobile")},
{APRSSystem::Icon::RedCross, APRSSystem::tr("Red cross")},
{APRSSystem::Icon::BoyScout, APRSSystem::tr("Boy scout")},
{APRSSystem::Icon::Home, APRSSystem::tr("Home")},
{APRSSystem::Icon::X, APRSSystem::tr("X")},
{APRSSystem::Icon::RedDot, APRSSystem::tr("Red dot")},
{APRSSystem::Icon::Circle0, APRSSystem::tr("Circle 0")},
{APRSSystem::Icon::Circle1, APRSSystem::tr("Circle 1")},
{APRSSystem::Icon::Circle2, APRSSystem::tr("Circle 2")},
{APRSSystem::Icon::Circle3, APRSSystem::tr("Circle 3")},
{APRSSystem::Icon::Circle4, APRSSystem::tr("Circle 4")},
{APRSSystem::Icon::Circle5, APRSSystem::tr("Circle 5")},
{APRSSystem::Icon::Circle6, APRSSystem::tr("Circle 6")},
{APRSSystem::Icon::Circle7, APRSSystem::tr("Circle 7")},
{APRSSystem::Icon::Circle8, APRSSystem::tr("Circle 8")},
{APRSSystem::Icon::Circle9, APRSSystem::tr("Circle 9")},
{APRSSystem::Icon::Fire, APRSSystem::tr("Fire")},
{APRSSystem::Icon::Campground, APRSSystem::tr("Campground")},
{APRSSystem::Icon::Motorcycle, APRSSystem::tr("Motorcycle")},
{APRSSystem::Icon::RailEngine, APRSSystem::tr("Rail engine")},
{APRSSystem::Icon::Car, APRSSystem::tr("Car")},
{APRSSystem::Icon::FileServer, APRSSystem::tr("File server")},
{APRSSystem::Icon::HCFuture, APRSSystem::tr("HC Future")},
{APRSSystem::Icon::AidStation, APRSSystem::tr("Aid station")},
{APRSSystem::Icon::BBS, APRSSystem::tr("BBS")},
{APRSSystem::Icon::Canoe, APRSSystem::tr("Canoe")},
{APRSSystem::Icon::Eyeball, APRSSystem::tr("Eyeball")},
{APRSSystem::Icon::Tractor, APRSSystem::tr("Tractor")},
{APRSSystem::Icon::GridSquare, APRSSystem::tr("Grid Square")},
{APRSSystem::Icon::Hotel, APRSSystem::tr("Hotel")},
{APRSSystem::Icon::TCPIP, APRSSystem::tr("TCP/IP")},
{APRSSystem::Icon::School, APRSSystem::tr("School")},
{APRSSystem::Icon::Logon, APRSSystem::tr("Logon")},
{APRSSystem::Icon::MacOS, APRSSystem::tr("MacOS")},
{APRSSystem::Icon::NTSStation, APRSSystem::tr("NTS station")},
{APRSSystem::Icon::Balloon, APRSSystem::tr("Balloon")},
{APRSSystem::Icon::PoliceCar, APRSSystem::tr("Police car")},
{APRSSystem::Icon::TBD, APRSSystem::tr("TBD")},
{APRSSystem::Icon::RV, APRSSystem::tr("RV")},
{APRSSystem::Icon::Shuttle, APRSSystem::tr("Shuttle")},
{APRSSystem::Icon::SSTV, APRSSystem::tr("SSTV")},
{APRSSystem::Icon::Bus, APRSSystem::tr("Bus")},
{APRSSystem::Icon::ATV, APRSSystem::tr("ATV")},
{APRSSystem::Icon::WXService, APRSSystem::tr("Weather service")},
{APRSSystem::Icon::Helo, APRSSystem::tr("Helo")},
{APRSSystem::Icon::Yacht, APRSSystem::tr("Yacht")},
{APRSSystem::Icon::Windows, APRSSystem::tr("MS Windows")},
{APRSSystem::Icon::Jogger, APRSSystem::tr("Jogger")},
{APRSSystem::Icon::Triangle, APRSSystem::tr("Triangle")},
{APRSSystem::Icon::PBBS, APRSSystem::tr("PBBS")},
{APRSSystem::Icon::LargePlane, APRSSystem::tr("Plane large")},
{APRSSystem::Icon::WXStation, APRSSystem::tr("Weather station")},
{APRSSystem::Icon::DishAntenna, APRSSystem::tr("Dish antenna")},
{APRSSystem::Icon::Ambulance, APRSSystem::tr("Ambulance")},
{APRSSystem::Icon::Bike, APRSSystem::tr("Bike")},
{APRSSystem::Icon::ICP, APRSSystem::tr("ICP")},
{APRSSystem::Icon::FireStation, APRSSystem::tr("Fire station")},
{APRSSystem::Icon::Horse, APRSSystem::tr("Horse")},
{APRSSystem::Icon::FireTruck, APRSSystem::tr("Fire truck")},
{APRSSystem::Icon::Glider, APRSSystem::tr("Glider")},
{APRSSystem::Icon::Hospital, APRSSystem::tr("Hospital")},
{APRSSystem::Icon::IOTA, APRSSystem::tr("IOTA")},
{APRSSystem::Icon::Jeep, APRSSystem::tr("Jeep")},
{APRSSystem::Icon::SmallTruck, APRSSystem::tr("Truck small")},
{APRSSystem::Icon::Laptop, APRSSystem::tr("Laptop")},
{APRSSystem::Icon::MicE, APRSSystem::tr("Mic-E")},
{APRSSystem::Icon::Node, APRSSystem::tr("Node")},
{APRSSystem::Icon::EOC, APRSSystem::tr("EOC")},
{APRSSystem::Icon::Rover, APRSSystem::tr("Rover")},
{APRSSystem::Icon::Grid, APRSSystem::tr("Grid")},
{APRSSystem::Icon::Antenna, APRSSystem::tr("Antenna")},
{APRSSystem::Icon::PowerBoat, APRSSystem::tr("Power boat")},
{APRSSystem::Icon::TruckStop, APRSSystem::tr("Truck stop")},
{APRSSystem::Icon::TruckLarge, APRSSystem::tr("Truck large")},
{APRSSystem::Icon::Van, APRSSystem::tr("Van")},
{APRSSystem::Icon::Water, APRSSystem::tr("Water")},
{APRSSystem::Icon::XAPRS, APRSSystem::tr("XAPRS")},
{APRSSystem::Icon::Yagi, APRSSystem::tr("Yagi")},
{APRSSystem::Icon::Shelter, APRSSystem::tr("Shelter")}};



Expand Down
10 changes: 5 additions & 5 deletions src/aprssystemdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>569</width>
<height>383</height>
<height>431</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -72,7 +72,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>-</string>
<string notr="true">-</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -100,7 +100,7 @@
<item>
<widget class="QLineEdit" name="destination">
<property name="text">
<string>WIDE3</string>
<string notr="true">WIDE3</string>
</property>
<property name="maxLength">
<number>6</number>
Expand All @@ -110,7 +110,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>-</string>
<string notr="true">-</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -166,7 +166,7 @@
<item row="15" column="1">
<widget class="QSpinBox" name="updatePeriod">
<property name="suffix">
<string>s</string>
<string notr="true">s</string>
</property>
<property name="maximum">
<number>6000</number>
Expand Down
18 changes: 9 additions & 9 deletions src/configitemwrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ ChannelListWrapper::data(const QModelIndex &index, int role) const {
if (channel->scanList()) {
return channel->scanList()->name();
} else {
return tr("-");
return QString("-");
}
case 9: { // Collect zones, the channel is a member of
QStringList zones;
Expand Down Expand Up @@ -326,7 +326,7 @@ ChannelListWrapper::data(const QModelIndex &index, int role) const {
if (digi->groupListObj()) {
return digi->groupListObj()->name();
} else {
return tr("-");
return QString("-");
}
} else if (channel->is<FMChannel>()) {
return tr("[None]");
Expand All @@ -337,7 +337,7 @@ ChannelListWrapper::data(const QModelIndex &index, int role) const {
if (digi->txContactObj())
return digi->txContactObj()->name();
else
return tr("-");
return QString("-");
} else if (channel->is<FMChannel>()) {
return tr("[None]");
}
Expand All @@ -356,18 +356,18 @@ ChannelListWrapper::data(const QModelIndex &index, int role) const {
if (digi->aprsObj())
return digi->aprsObj()->name();
else
return tr("-");
return QString("-");
} else if (FMChannel *analog = channel->as<FMChannel>()) {
if (analog->aprsSystem())
return analog->aprsSystem()->name();
else
return tr("-");
return QString("-");
}
break;
case 16:
if (DMRChannel *digi = channel->as<DMRChannel>()) {
if (nullptr == digi->roamingZone())
return tr("-");
return QString("-");
else if (DefaultRoamingZone::get() == digi->roamingZone())
return tr("[Default]");
return digi->roamingZone()->name();
Expand Down Expand Up @@ -713,7 +713,7 @@ PositioningSystemListWrapper::data(const QModelIndex &index, int role) const {
else if (sys->is<APRSSystem>())
return tr("APRS");
else
return tr("OOps!");
return QString("Oops!");
case 1:
return sys->name();
case 2:
Expand All @@ -722,7 +722,7 @@ PositioningSystemListWrapper::data(const QModelIndex &index, int role) const {
return tr("[None]");
return sys->as<GPSSystem>()->contactObj()->name();
} else if (sys->is<APRSSystem>())
return tr("%1-%2").arg(sys->as<APRSSystem>()->destination())
return QString("%1-%2").arg(sys->as<APRSSystem>()->destination())
.arg(sys->as<APRSSystem>()->destSSID());
break;
case 3:
Expand All @@ -734,7 +734,7 @@ PositioningSystemListWrapper::data(const QModelIndex &index, int role) const {
return sys->as<GPSSystem>()->revertChannel()->name();
} else if (sys->is<APRSSystem>())
return ((nullptr != sys->as<APRSSystem>()->revertChannel()) ?
sys->as<APRSSystem>()->revertChannel()->name() : tr("OOPS!"));
sys->as<APRSSystem>()->revertChannel()->name() : QString("Oops!"));
break;
case 5:
if (sys->is<GPSSystem>())
Expand Down
3 changes: 0 additions & 3 deletions src/contactlistview.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
<property name="toolTip">
<string>Adds a contact to the list.</string>
</property>
<property name="accessibleName">
<string>Add contact button</string>
</property>
<property name="text">
<string>Add Digital Contact</string>
</property>
Expand Down
5 changes: 4 additions & 1 deletion src/digitalchanneldialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<string>Off</string>
</property>
<property name="suffix">
<string> s</string>
<string notr="true"> s</string>
</property>
<property name="maximum">
<number>9999</number>
Expand Down Expand Up @@ -261,6 +261,9 @@
</item>
<item row="3" column="1">
<widget class="QComboBox" name="timeSlot">
<property name="currentText">
<string notr="true">TS 1</string>
</property>
<item>
<property name="text">
<string>TS 1</string>
Expand Down
Loading
Loading