From 598870d8793af7d1c4d56e557fab32ec5b4464c2 Mon Sep 17 00:00:00 2001 From: Julius Vitkauskas Date: Wed, 10 Jun 2026 00:35:04 +0300 Subject: [PATCH] Translate Russian comments to English --- macos/ONLYOFFICE/Code/Utils/ascprinter.h | 12 ++++++------ .../extras/update-daemon/src/classes/csvcmanager.cpp | 2 +- win-linux/src/cmyapplicationmanager.h | 7 +++---- win-linux/src/qtcomp/qregexp.h | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Utils/ascprinter.h b/macos/ONLYOFFICE/Code/Utils/ascprinter.h index 3e9a01efc..b8b06acf4 100644 --- a/macos/ONLYOFFICE/Code/Utils/ascprinter.h +++ b/macos/ONLYOFFICE/Code/Utils/ascprinter.h @@ -319,26 +319,26 @@ class ASCPrinterContext : public NSEditorApi::CAscPrinterContextBase // start print dialog NSPrintInfo* pPrintInfo = [NSPrintInfo sharedPrintInfo]; - // NSString* sKeyPrint = @"prihord"; // Ключ в котором расположен объект NSPrintInfo + // NSString* sKeyPrint = @"prihord"; // Key for the stored NSPrintInfo object - // Пробуем извлечь + // Try to restore saved print settings // NSUserDefaults* pUserDef = [[NSUserDefaults alloc] init]; // NSData* pDataInfo = [pUserDef dataForKey:sKeyPrint]; // if (pDataInfo) // { - // Если удачно извлекли + // If saved settings were found // pPrintInfo = [NSUnarchiver unarchiveObjectWithData:pDataInfo]; // } // else { #if 0 - // Иначе выводим панель настройки печати + // Otherwise show the page setup panel NSPageLayout* pPageLayout = [[NSPageLayout alloc] init]; if ([pPageLayout runModal] == NSModalResponseOK) { pPrintInfo = pPageLayout.printInfo; - // сохраним введенные настройки в User Defaults + // Save the entered settings to User Defaults pDataInfo = [NSArchiver archivedDataWithRootObject:pPrintInfo]; [pUserDef setObject:pDataInfo forKey:sKeyPrint]; } @@ -392,7 +392,7 @@ class ASCPrinterContext : public NSEditorApi::CAscPrinterContextBase else pro = [NSPrintOperation printOperationWithView:m_pView]; - [pro setShowsPrintPanel:YES]; // Выводим на печать или предпросмотр + [pro setShowsPrintPanel:YES]; // Show the print panel for printing or preview [[pro printPanel] setOptions:options]; //[pro runOperation]; [pro runOperationModalForWindow:pViewParent.window delegate:sender didRunSelector:didRunSelector contextInfo:nil]; diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp index 03eb15279..70736ad1b 100644 --- a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp +++ b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp @@ -437,7 +437,7 @@ void CSvcManager::onCompleteUnzip(const int error) { __UNLOCK if (error == UNZIP_OK) { - // Сreate a file about successful unpacking for use in subsequent launches + // Write a marker for the successful unpack so subsequent launches can continue from it. const tstring updPath = NS_File::parentPath(NS_File::appPath()) + UPDATE_PATH; list successList{m_newVersion}; if (!NS_File::writeToFile(updPath + SUCCES_UNPACKED, successList)) { diff --git a/win-linux/src/cmyapplicationmanager.h b/win-linux/src/cmyapplicationmanager.h index 5f218f6d1..80280f906 100644 --- a/win-linux/src/cmyapplicationmanager.h +++ b/win-linux/src/cmyapplicationmanager.h @@ -52,10 +52,9 @@ class CMyApplicationManager : public CAscApplicationManager virtual void StartSaveDialog(const std::wstring& sName) { - // сделал через QMainPanel - чтобы использовать сигналы-слоты. - // если сделать QAscApplicationManager : public QObject, то он будет прокидывать - // слоты родителю. Т.е. классу CAscApplicationManager. - // А в либе я не буду затачиваться на QT + // Route this through QMainPanel so we can use Qt signals/slots. + // Making QAscApplicationManager inherit QObject would expose the slots through + // CAscApplicationManager, but the library should stay independent of Qt. // ((QMainPanel*)m_pPanel)->sendDialogSave(sName); QMetaObject::invokeMethod(m_pPanel, "onDialogSave", Qt::QueuedConnection, Q_ARG(std::wstring, sName)); diff --git a/win-linux/src/qtcomp/qregexp.h b/win-linux/src/qtcomp/qregexp.h index cabcf0f3e..b67fae7d3 100644 --- a/win-linux/src/qtcomp/qregexp.h +++ b/win-linux/src/qtcomp/qregexp.h @@ -66,7 +66,7 @@ namespace QtComp #endif } - // Неявные конверсии — позволяют использовать в QString::contains() + // Implicit conversions let this wrapper be used with QString::contains(). #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) operator QRegExp() const { return m_re; } #else