From d623dfdf5e00cc3f95b7e1dcd01df6b2caf9d23a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 16 Sep 2023 22:19:04 +0200 Subject: [PATCH] Replace "own device" with "this device" where it makes sense * Be consistent with official UI * See https://github.com/Martchus/syncthingtray/issues/203 --- cli/testfiles/expected-status.txt | 2 +- syncthingconnector/syncthingdev.cpp | 2 +- syncthingconnector/tests/connectiontests.cpp | 2 +- syncthingconnector/translations/syncthingconnector_cs_CZ.ts | 2 +- syncthingconnector/translations/syncthingconnector_de_DE.ts | 4 ++-- syncthingconnector/translations/syncthingconnector_en_US.ts | 2 +- syncthingconnector/translations/syncthingconnector_zh_CN.ts | 2 +- syncthingmodel/syncthingdevicemodel.cpp | 2 +- syncthingmodel/translations/syncthingmodel_cs_CZ.ts | 2 +- syncthingmodel/translations/syncthingmodel_de_DE.ts | 4 ++-- syncthingmodel/translations/syncthingmodel_en_US.ts | 2 +- syncthingmodel/translations/syncthingmodel_zh_CN.ts | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cli/testfiles/expected-status.txt b/cli/testfiles/expected-status.txt index a9f207d..157d333 100644 --- a/cli/testfiles/expected-status.txt +++ b/cli/testfiles/expected-status.txt @@ -34,7 +34,7 @@ Directories Devices - .* ID \w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w-\w\w\w\w\w\w\w - Status own device + Status this device Addresses dynamic Compression metadata diff --git a/syncthingconnector/syncthingdev.cpp b/syncthingconnector/syncthingdev.cpp index 76e6e46..0f7868a 100644 --- a/syncthingconnector/syncthingdev.cpp +++ b/syncthingconnector/syncthingdev.cpp @@ -12,7 +12,7 @@ QString statusString(SyncthingDevStatus status) case SyncthingDevStatus::Disconnected: return QCoreApplication::translate("SyncthingDevStatus", "disconnected"); case SyncthingDevStatus::OwnDevice: - return QCoreApplication::translate("SyncthingDevStatus", "own device"); + return QCoreApplication::translate("SyncthingDevStatus", "this device"); case SyncthingDevStatus::Idle: return QCoreApplication::translate("SyncthingDevStatus", "idle"); case SyncthingDevStatus::Synchronizing: diff --git a/syncthingconnector/tests/connectiontests.cpp b/syncthingconnector/tests/connectiontests.cpp index 1f8ad79..995e097 100644 --- a/syncthingconnector/tests/connectiontests.cpp +++ b/syncthingconnector/tests/connectiontests.cpp @@ -432,7 +432,7 @@ void ConnectionTests::checkDevices() for (const SyncthingDev &dev : devInfo) { if (dev.id != QStringLiteral("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7") && dev.id != QStringLiteral("6EIS2PN-J2IHWGS-AXS3YUL-HC5FT3K-77ZXTLL-AKQLJ4C-7SWVPUS-AZW4RQ4")) { - CPPUNIT_ASSERT_EQUAL_MESSAGE("own device", QStringLiteral("own device"), dev.statusString()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("this device", QStringLiteral("this device"), dev.statusString()); m_ownDevId = dev.id; m_ownDevName = dev.name; } diff --git a/syncthingconnector/translations/syncthingconnector_cs_CZ.ts b/syncthingconnector/translations/syncthingconnector_cs_CZ.ts index 3626ee4..9ad8fee 100644 --- a/syncthingconnector/translations/syncthingconnector_cs_CZ.ts +++ b/syncthingconnector/translations/syncthingconnector_cs_CZ.ts @@ -447,7 +447,7 @@ - own device + this device vlastní zařízení diff --git a/syncthingconnector/translations/syncthingconnector_de_DE.ts b/syncthingconnector/translations/syncthingconnector_de_DE.ts index 7690fca..2109927 100644 --- a/syncthingconnector/translations/syncthingconnector_de_DE.ts +++ b/syncthingconnector/translations/syncthingconnector_de_DE.ts @@ -445,8 +445,8 @@ - own device - eigenes Gerät + this device + dieses Gerät diff --git a/syncthingconnector/translations/syncthingconnector_en_US.ts b/syncthingconnector/translations/syncthingconnector_en_US.ts index 0ff1188..9fa936e 100644 --- a/syncthingconnector/translations/syncthingconnector_en_US.ts +++ b/syncthingconnector/translations/syncthingconnector_en_US.ts @@ -435,7 +435,7 @@ - own device + this device diff --git a/syncthingconnector/translations/syncthingconnector_zh_CN.ts b/syncthingconnector/translations/syncthingconnector_zh_CN.ts index 6a74c8e..889bdac 100644 --- a/syncthingconnector/translations/syncthingconnector_zh_CN.ts +++ b/syncthingconnector/translations/syncthingconnector_zh_CN.ts @@ -435,7 +435,7 @@ - own device + this device 本设备 diff --git a/syncthingmodel/syncthingdevicemodel.cpp b/syncthingmodel/syncthingdevicemodel.cpp index 006945f..94b9d47 100644 --- a/syncthingmodel/syncthingdevicemodel.cpp +++ b/syncthingmodel/syncthingdevicemodel.cpp @@ -158,7 +158,7 @@ QVariant SyncthingDeviceModel::data(const QModelIndex &index, int role) const return QVariant(); } case 3: - return dev.lastSeen.isNull() ? tr("unknown or own device") + return dev.lastSeen.isNull() ? tr("unknown or this device") : QString::fromLatin1(dev.lastSeen.toString(DateTimeOutputFormat::DateAndTime, true).data()); case 4: return dev.compression; diff --git a/syncthingmodel/translations/syncthingmodel_cs_CZ.ts b/syncthingmodel/translations/syncthingmodel_cs_CZ.ts index 5c91f6e..be63ce4 100644 --- a/syncthingmodel/translations/syncthingmodel_cs_CZ.ts +++ b/syncthingmodel/translations/syncthingmodel_cs_CZ.ts @@ -114,7 +114,7 @@ - unknown or own device + unknown or this device neznámé nebo vlastní zařízení diff --git a/syncthingmodel/translations/syncthingmodel_de_DE.ts b/syncthingmodel/translations/syncthingmodel_de_DE.ts index 7f23f6d..f42f834 100644 --- a/syncthingmodel/translations/syncthingmodel_de_DE.ts +++ b/syncthingmodel/translations/syncthingmodel_de_DE.ts @@ -114,7 +114,7 @@ - unknown or own device + unknown or this device unbekannt oder eigenes Gerät @@ -145,7 +145,7 @@ Own device - Eigenes Gerät + Dieses Gerät diff --git a/syncthingmodel/translations/syncthingmodel_en_US.ts b/syncthingmodel/translations/syncthingmodel_en_US.ts index ec6311f..37c24d7 100644 --- a/syncthingmodel/translations/syncthingmodel_en_US.ts +++ b/syncthingmodel/translations/syncthingmodel_en_US.ts @@ -114,7 +114,7 @@ - unknown or own device + unknown or this device diff --git a/syncthingmodel/translations/syncthingmodel_zh_CN.ts b/syncthingmodel/translations/syncthingmodel_zh_CN.ts index 4e4b447..9b2de59 100644 --- a/syncthingmodel/translations/syncthingmodel_zh_CN.ts +++ b/syncthingmodel/translations/syncthingmodel_zh_CN.ts @@ -114,7 +114,7 @@ - unknown or own device + unknown or this device 未知或本设备