80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Even more strings changes to be in line with Win32

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/CMakeLists.txt
View File

@@ -180,7 +180,7 @@ foreach(po_file ${po_files})
get_filename_component(PO_FILE_NAME ${po_file} NAME_WE)
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}"
DEPENDS "${po_file}")
list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm")

1603
src/qt/languages/.ts
View File

File diff suppressed because it is too large Load Diff

3
src/qt/languages/fi-fi.po
View File

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

4
src/qt/languages/tr-TR.po
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)"
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."
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"
msgstr "Makine"

4
src/qt/qt_deviceconfig.cpp
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) {
if (QStringLiteral("none") == internalName) {
return "None";
return tr("None");
} else if (QStringLiteral("internal") == internalName) {
return "Internal";
return tr("Internal controller");
} else if (device == nullptr) {
return QString();
} else {

3
src/qt/qt_main.cpp
View File

@@ -103,6 +103,9 @@ protected:
QString translate(const char *context, const char *sourceText,
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);
}
};

19
src/qt/qt_mainwindow.ui
View File

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

14
src/qt/qt_settings.cpp
View File

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

2
src/qt/qt_settingsdisplay.ui
View File

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

2
src/qt/qt_settingsinput.cpp
View File

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

4
src/qt/qt_settingsinput.ui
View File

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

4
src/qt/qt_settingsmachine.cpp
View File

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

8
src/qt/qt_settingsmachine.ui
View File

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

12
src/qt/qt_settingsotherperipherals.ui
View File

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

6
src/qt/qt_settingssound.ui
View File

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

2
vcpkg.json
View File

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