Even more strings changes to be in line with Win32

This commit is contained in:
Cacodemon345
2022-01-06 01:41:57 +06:00
parent 678ab35079
commit abefa65e26
16 changed files with 52 additions and 1640 deletions

View File

@@ -180,7 +180,7 @@ foreach(po_file ${po_files})
get_filename_component(PO_FILE_NAME ${po_file} NAME_WE) get_filename_component(PO_FILE_NAME ${po_file} NAME_WE)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm" add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm"
COMMAND ${LCONVERT_EXECUTABLE} -i ${po_file} -o ${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm COMMAND ${LCONVERT_EXECUTABLE} -input-format po -input-file ${po_file} -output-format qm -output-file ${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
DEPENDS "${po_file}") DEPENDS "${po_file}")
list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm") list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm")

File diff suppressed because it is too large Load Diff

View File

@@ -217,9 +217,6 @@ msgstr "&Dokumentaatio..."
msgid "&About 86Box..." msgid "&About 86Box..."
msgstr "&Tietoja 86Box:sta..." msgstr "&Tietoja 86Box:sta..."
msgid "&New image..." msgid "&New image..."
msgstr "&Uusi kasettikuva..." msgstr "&Uusi kasettikuva..."

View File

@@ -644,10 +644,10 @@ msgid "All images (*.86F *.86f *.DSK *.dsk *.FLP *.flp *.IM? *.im? *.*FD? *.*fd?
msgstr "Tüm imajlar (*.86F *.86f *.DSK *.dsk *.FLP *.flp *.IM? *.im? *.*FD? *.*fd?);;Basit sektör imajları (*.DSK *.dsk *.FLP *.flp *.IM? *.im? *.IMG *.img *.*FD? *.*fd?);;Yüzey imajları (*.86F *.86f)" msgstr "Tüm imajlar (*.86F *.86f *.DSK *.dsk *.FLP *.flp *.IM? *.im? *.*FD? *.*fd?);;Basit sektör imajları (*.DSK *.dsk *.FLP *.flp *.IM? *.im? *.IMG *.img *.*FD? *.*fd?);;Yüzey imajları (*.86F *.86f)"
msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine." msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
msgstr \""%hs\" makinesi roms/machines klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir makineye geçiş yapılıyor." msgstr "\"%hs\" makinesi roms/machines klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir makineye geçiş yapılıyor."
msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card." msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
msgstr \""%hs\" ekran kartı roms/video klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir ekran kartına geçiş yapılıyor." msgstr "\"%hs\" ekran kartı roms/video klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir ekran kartına geçiş yapılıyor."
msgid "Machine" msgid "Machine"
msgstr "Makine" msgstr "Makine"

View File

@@ -198,9 +198,9 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) {
QString DeviceConfig::DeviceName(const _device_* device, const char *internalName, int bus) { QString DeviceConfig::DeviceName(const _device_* device, const char *internalName, int bus) {
if (QStringLiteral("none") == internalName) { if (QStringLiteral("none") == internalName) {
return "None"; return tr("None");
} else if (QStringLiteral("internal") == internalName) { } else if (QStringLiteral("internal") == internalName) {
return "Internal"; return tr("Internal controller");
} else if (device == nullptr) { } else if (device == nullptr) {
return QString(); return QString();
} else { } else {

View File

@@ -103,6 +103,9 @@ protected:
QString translate(const char *context, const char *sourceText, QString translate(const char *context, const char *sourceText,
const char *disambiguation = nullptr, int n = -1) const override const char *disambiguation = nullptr, int n = -1) const override
{ {
if (strcmp(sourceText, "&Fullscreen") == 0) sourceText = "&Fullscreen\tCtrl+Alt+PageUP";
if (strcmp(sourceText, "&Ctrl+Alt+Del") == 0) sourceText = "&Ctrl+Alt+Del\tCtrl+F12";
if (strcmp(sourceText, "Take s&creenshot") == 0) sourceText = "Take s&creenshot\tCtrl+F11";
return QTranslator::translate("", sourceText, disambiguation, n); return QTranslator::translate("", sourceText, disambiguation, n);
} }
}; };

View File

@@ -47,7 +47,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>724</width> <width>724</width>
<height>23</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuAction"> <widget class="QMenu" name="menuAction">
@@ -209,6 +209,12 @@
<property name="toolTip"> <property name="toolTip">
<string>Ctrl+Alt+Del</string> <string>Ctrl+Alt+Del</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+F12</string>
</property>
<property name="shortcutVisibleInContextMenu">
<bool>false</bool>
</property>
</action> </action>
<action name="actionCtrl_Alt_Esc"> <action name="actionCtrl_Alt_Esc">
<property name="text"> <property name="text">
@@ -243,6 +249,9 @@
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+Alt+PgUp</string> <string>Ctrl+Alt+PgUp</string>
</property> </property>
<property name="shortcutVisibleInContextMenu">
<bool>false</bool>
</property>
</action> </action>
<action name="actionSoftware_Renderer"> <action name="actionSoftware_Renderer">
<property name="checkable"> <property name="checkable">
@@ -515,7 +524,13 @@
</action> </action>
<action name="actionTake_screenshot"> <action name="actionTake_screenshot">
<property name="text"> <property name="text">
<string>Take s&amp;creenshot...</string> <string>Take s&amp;creenshot</string>
</property>
<property name="shortcut">
<string>Ctrl+F11</string>
</property>
<property name="shortcutVisibleInContextMenu">
<bool>false</bool>
</property> </property>
</action> </action>
<action name="actionSound_gain"> <action name="actionSound_gain">

View File

@@ -34,15 +34,15 @@ private:
QStringList pages = { QStringList pages = {
"Machine", "Machine",
"Display", "Display",
"Input Devices", "Input devices",
"Sound", "Sound",
"Network", "Network",
"Ports (COM & LPT)", "Ports (COM & LPT)",
"Storage Controllers", "Storage controllers",
"Hard Disks", "Hard disks",
"Floppy & CD-ROM Drives", "Floppy & CD-ROM drives",
"Other Removable Devices", "Other removable devices",
"Other Peripherals", "Other peripherals",
}; };
QStringList page_icons = { QStringList page_icons = {
"machine", "machine",
@@ -64,7 +64,7 @@ QVariant SettingsModel::data(const QModelIndex &index, int role) const {
switch (role) { switch (role) {
case Qt::DisplayRole: case Qt::DisplayRole:
return pages.at(index.row()); return tr(pages.at(index.row()).toUtf8().data());
case Qt::DecorationRole: case Qt::DecorationRole:
return QIcon(QString("%1/%2.ico").arg(ProgSettings::getIconSetPath(), page_icons[index.row()])); return QIcon(QString("%1/%2.ico").arg(ProgSettings::getIconSetPath(), page_icons[index.row()]));
default: default:

View File

@@ -32,7 +32,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Video</string> <string>Video:</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -75,7 +75,7 @@ void SettingsInput::onCurrentMachineChanged(int machineId) {
removeRows = joystickModel->rowCount(); removeRows = joystickModel->rowCount();
selectedRow = 0; selectedRow = 0;
while (joyName) { while (joyName) {
int row = Models::AddEntry(joystickModel, joyName, i); int row = Models::AddEntry(joystickModel, tr(joyName).toUtf8().data(), i);
if (i == joystick_type) { if (i == joystick_type) {
selectedRow = row - removeRows; selectedRow = row - removeRows;
} }

View File

@@ -41,7 +41,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Mouse</string> <string>Mouse:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -58,7 +58,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Joystick</string> <string>Joystick:</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -161,10 +161,10 @@ void SettingsMachine::on_comboBoxMachine_currentIndexChanged(int index) {
int divisor; int divisor;
if ((machine_get_ram_granularity(machineId) < 1024)) { if ((machine_get_ram_granularity(machineId) < 1024)) {
divisor = 1; divisor = 1;
ui->spinBoxRAM->setSuffix(" KB"); ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "KB").prepend(' '));
} else { } else {
divisor = 1024; divisor = 1024;
ui->spinBoxRAM->setSuffix(" MB"); ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "MB").prepend(' '));
} }
ui->spinBoxRAM->setMinimum(machine_get_min_ram(machineId) / divisor); ui->spinBoxRAM->setMinimum(machine_get_min_ram(machineId) / divisor);
ui->spinBoxRAM->setMaximum(machine_get_max_ram(machineId) / divisor); ui->spinBoxRAM->setMaximum(machine_get_max_ram(machineId) / divisor);

View File

@@ -44,7 +44,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Machine Type:</string> <string>Machine type:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -61,7 +61,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>CPU:</string> <string>CPU type:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -116,7 +116,7 @@
<item> <item>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Speed</string> <string>Speed:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -208,7 +208,7 @@
<item> <item>
<widget class="QRadioButton" name="radioButtonLocalTime"> <widget class="QRadioButton" name="radioButtonLocalTime">
<property name="text"> <property name="text">
<string>Enabled (Local Time)</string> <string>Enabled (local time)</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -31,7 +31,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>ISA RTC</string> <string>ISA RTC:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -73,14 +73,14 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Card 2</string> <string>Card 2:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Card 3</string> <string>Card 3:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -97,7 +97,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Card 1</string> <string>Card 1:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -117,7 +117,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Card 4</string> <string>Card 4:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -129,7 +129,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBoxISABugger"> <widget class="QCheckBox" name="checkBoxISABugger">
<property name="text"> <property name="text">
<string>ISABugger Device</string> <string>ISABugger device</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -29,7 +29,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>MIDI In</string> <string>MIDI In Device:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -50,7 +50,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Sound Card</string> <string>Sound card:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -67,7 +67,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>MIDI Out</string> <string>MIDI Out Device:</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -11,6 +11,6 @@
"sdl2", "sdl2",
"rtmidi", "rtmidi",
"qt5-base", "qt5-base",
"qt5-translations", "qt5-translations"
] ]
} }