From ac618d400b40da8e8b7750d4279bc693aaf3c655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=83=D1=80=D0=BD=D0=B0=D1=82=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 8 Jun 2026 21:35:46 +0300 Subject: [PATCH] Polish client UI labels --- .../SettingsPictureUploadsFragment.kt | 11 ++- .../SettingsVideoUploadsFragment.kt | 11 ++- .../src/main/res/values-ru/strings.xml | 53 ++++++------- .../qsferaApp/src/main/res/values/strings.xml | 53 ++++++------- Desktop/src/gui/accountsettings.cpp | 8 +- Desktop/src/gui/accountsettings.ui | 4 +- Desktop/src/gui/generalsettings.ui | 12 +-- Desktop/src/gui/qml/FolderDelegate.qml | 16 ++-- Desktop/src/gui/spaces/qml/SpaceDelegate.qml | 12 ++- Desktop/src/gui/spaces/qml/SpacesView.qml | 2 +- .../removeAccountConnection.feature | 2 +- .../tabs-settings/tabsSettings.feature | 8 +- .../test/gui/pageObjects/AccountSetting.py | 8 +- Desktop/test/gui/pageObjects/Settings.py | 16 ++-- .../test/gui/pageObjects/SyncConnection.py | 6 +- .../test/gui/release-test-plan/testplan.md | 2 +- Desktop/translations/desktop_en.ts | 36 ++++----- Desktop/translations/desktop_ru.ts | 74 +++++++++---------- 18 files changed, 178 insertions(+), 156 deletions(-) diff --git a/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt b/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt index 9f7eed14..2824128e 100644 --- a/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt +++ b/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsPictureUploadsFragment.kt @@ -159,7 +159,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() { prefPictureUploadsOnWifi?.isChecked = it.wifiOnly prefPictureUploadsOnCharging?.isChecked = it.chargingOnly prefPictureUploadsBehaviour?.value = it.behavior.name - prefPictureUploadsLastSync?.summary = DisplayUtils.unixTimeToHumanReadable(it.lastSyncTimestamp) + prefPictureUploadsLastSync?.summary = formatLastSyncSummary(it.lastSyncTimestamp) spaceId = it.spaceId } ?: resetFields() } @@ -293,7 +293,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() { prefPictureUploadsOnWifi?.isChecked = false prefPictureUploadsOnCharging?.isChecked = false prefPictureUploadsBehaviour?.value = UploadBehavior.COPY.name - prefPictureUploadsLastSync?.summary = null + prefPictureUploadsLastSync?.summary = getString(R.string.prefs_camera_upload_last_sync_never) } private fun getSourcePathsSummary(sourcePaths: List): String = @@ -305,6 +305,13 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() { } } + private fun formatLastSyncSummary(lastSyncTimestamp: Long): String = + if (lastSyncTimestamp <= 0L) { + getString(R.string.prefs_camera_upload_last_sync_never) + } else { + DisplayUtils.unixTimeToHumanReadable(lastSyncTimestamp) + } + companion object { private const val PREF_PICTURE_UPLOADS_CLEAR_SOURCE_PATHS = "picture_uploads_clear_source_paths" } diff --git a/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt b/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt index 9b07d210..6a69d08d 100644 --- a/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt +++ b/Android/qsferaApp/src/main/java/eu/qsfera/android/presentation/settings/automaticuploads/SettingsVideoUploadsFragment.kt @@ -157,7 +157,7 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() { prefVideoUploadsOnWifi?.isChecked = it.wifiOnly prefVideoUploadsOnCharging?.isChecked = it.chargingOnly prefVideoUploadsBehaviour?.value = it.behavior.name - prefVideoUploadsLastSync?.summary = DisplayUtils.unixTimeToHumanReadable(it.lastSyncTimestamp) + prefVideoUploadsLastSync?.summary = formatLastSyncSummary(it.lastSyncTimestamp) spaceId = it.spaceId } ?: resetFields() } @@ -291,7 +291,7 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() { prefVideoUploadsOnWifi?.isChecked = false prefVideoUploadsOnCharging?.isChecked = false prefVideoUploadsBehaviour?.value = UploadBehavior.COPY.name - prefVideoUploadsLastSync?.summary = null + prefVideoUploadsLastSync?.summary = getString(R.string.prefs_camera_upload_last_sync_never) } private fun getSourcePathsSummary(sourcePaths: List): String = @@ -303,6 +303,13 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() { } } + private fun formatLastSyncSummary(lastSyncTimestamp: Long): String = + if (lastSyncTimestamp <= 0L) { + getString(R.string.prefs_camera_upload_last_sync_never) + } else { + DisplayUtils.unixTimeToHumanReadable(lastSyncTimestamp) + } + companion object { private const val PREF_VIDEO_UPLOADS_CLEAR_SOURCE_PATHS = "video_uploads_clear_source_paths" } diff --git a/Android/qsferaApp/src/main/res/values-ru/strings.xml b/Android/qsferaApp/src/main/res/values-ru/strings.xml index af1cd66e..6d70b11d 100644 --- a/Android/qsferaApp/src/main/res/values-ru/strings.xml +++ b/Android/qsferaApp/src/main/res/values-ru/strings.xml @@ -60,23 +60,23 @@ Разрешает взаимодействие, когда есть перекрытие другим видимым или прозрачным окном. Это нужно, если вы используете приложения для фильтрации света от экрана. Перекрывающее приложение сможет получать информацию о взаимодействии. Вы уверены, что хотите включить эту функцию? Используйте эту функцию на свой страх и риск. Вредоносное приложение может попытаться обманом заставить вас выполнить какие-либо действия, используя другие представления. - Автоматическая загрузка изображений - Управляйте местоположением и поведением автоматически загружаемых фотографий - Автоматическая загрузка видео - Настройка размещения и поведения видеороликов, загружаемых автоматически - Загрузка изображений - Автоматически загружать изображения, сделанные камерой - Путь загрузки изображений - Условия для загрузки - Автозагрузка будет запущена только при удовлетворении выбранных ниже условий - Загрузка изображений только через wifi - Загрузка изображений только во время зарядки + Резервное копирование фото + Выберите папки телефона и условия загрузки + Резервное копирование видео + Выберите папки с видео и условия загрузки + Копировать фото + Автоматически копировать фото из выбранных папок телефона + Папка назначения в КуСфера + Условия загрузки + Копирование запускается только при выполнении выбранных условий + Копировать фото только по Wi-Fi + Копировать фото только во время зарядки Чтобы включить этот параметр, сначала включите загрузку только по Wi-Fi - Загрузка видео - Автоматически загружать видео, записанные камерой - Путь загрузки видео - Загрузка видео только через wifi - Загрузка видео только во время зарядки + Копировать видео + Автоматически копировать видео из выбранных папок телефона + Папка назначения в КуСфера + Копировать видео только по Wi-Fi + Копировать видео только во время зарядки Автоматические загрузки недоступны для пользователей Light Дополнительно Управление уведомлениями @@ -553,17 +553,18 @@ %1$d файлов %1$d файлов, 1 каталог %1$d файлов, %2$d каталогов - Учётная запись для закачки изображений - Учётная запись для закачки видео - Каталог камеры (%1$s) + Учётная запись для фото + Учётная запись для видео + Папки телефона (%1$s) обязательно - Очистить выбранные папки - Папки не выбраны - Очистить выбранные папки - Автозагрузка перестанет проверять папки телефона, пока вы снова не добавите папку. - Исходный файл будет - Исходный файл будет - Последняя синхронизация + Убрать выбранные папки + Папки телефона не выбраны + Убрать выбранные папки + Копирование перестанет проверять папки телефона, пока вы снова не добавите папку. + Исходный файл после копирования + Исходный файл после копирования + Последняя проверка + Ожидает первой проверки Вы можете обновить свои установки в Настройки Скопировать файл Переместить файл diff --git a/Android/qsferaApp/src/main/res/values/strings.xml b/Android/qsferaApp/src/main/res/values/strings.xml index 2a904675..ebe7f463 100644 --- a/Android/qsferaApp/src/main/res/values/strings.xml +++ b/Android/qsferaApp/src/main/res/values/strings.xml @@ -61,23 +61,23 @@ Allow touches when the view is obscured by another visible window. Enable it to use light filtering apps. Are you sure you want to enable this feature? Use this feature at your own risk. A malicious application could try to spoof you into unknowingly performing some actions, using other views. - Automatic picture uploads - Manage location and behavior of the pictures uploaded automatically - Automatic video uploads - Manage location and behavior of the videos uploaded automatically - Picture uploads - Automatically upload pictures taken by camera - Picture upload path - Conditions to execute uploads - Uploads will be triggered when all selected options are fulfilled - Upload pictures via wifi only - Upload pictures only when charging + Photo backup + Choose which phone folders are backed up and when uploads run + Video backup + Choose which video folders are backed up and when uploads run + Back up photos + Automatically back up photos from selected phone folders + QSfera destination folder + Upload conditions + Backup runs only when the selected conditions are met + Use Wi-Fi only for photo backup + Back up photos only while charging Enable wifi only uploads to activate this option - Video uploads - Automatically upload videos recorded by camera - Video upload path - Upload videos via wifi only - Upload videos only when charging + Back up videos + Automatically back up videos from selected phone folders + QSfera destination folder + Use Wi-Fi only for video backup + Back up videos only while charging Automatic uploads are not available for users light Advanced Manage notifications @@ -591,17 +591,18 @@ %1$d files %1$d files, 1 folder %1$d files, %2$d folders - Account to upload pictures - Account to upload videos - Camera folder (%1$s) + QSfera account for photos + QSfera account for videos + Phone folders (%1$s) required - Clear selected folders - No folders selected - Clear selected folders - Automatic uploads will stop scanning phone folders until you add a folder again. - Original file will be - Original file will be - Last synchronization + Remove selected folders + No phone folders selected + Remove selected folders + Backup will stop scanning phone folders until you add a folder again. + Original file after backup + Original file after backup + Last backup scan + Waiting for first backup scan You can update your preferences in Settings Copy file Move file diff --git a/Desktop/src/gui/accountsettings.cpp b/Desktop/src/gui/accountsettings.cpp index 04c11458..2bad4736 100644 --- a/Desktop/src/gui/accountsettings.cpp +++ b/Desktop/src/gui/accountsettings.cpp @@ -194,13 +194,13 @@ void AccountSettings::slotRemoveCurrentFolder(Folder *folder) { // TODO: move to qml qCInfo(lcAccountSettings) << u"Remove Folder " << folder->path(); - auto messageBox = new FontIconMessageBox({Resources::FontIcon::DefaultGlyphes::Question}, tr("Confirm removal of Space"), - tr("

Do you really want to stop syncing the Space »%1«?

" - "

Note: This will not delete any files.

") + auto messageBox = new FontIconMessageBox({Resources::FontIcon::DefaultGlyphes::Question}, tr("Confirm removal of folder sync"), + tr("

Stop syncing %1 on this computer?

" + "

Note: This will not delete files in QSfera or on this device.

") .arg(folder->displayName()), QMessageBox::NoButton, ocApp()->settingsDialog()); messageBox->setAttribute(Qt::WA_DeleteOnClose); - QPushButton *yesButton = messageBox->addButton(tr("Remove Space"), QMessageBox::YesRole); + QPushButton *yesButton = messageBox->addButton(tr("Remove folder sync"), QMessageBox::YesRole); messageBox->addButton(tr("Cancel"), QMessageBox::NoRole); connect(messageBox, &QMessageBox::finished, this, [messageBox, yesButton, folder, this] { if (messageBox->clickedButton() == yesButton) { diff --git a/Desktop/src/gui/accountsettings.ui b/Desktop/src/gui/accountsettings.ui index 73009bcf..81f07bdf 100644 --- a/Desktop/src/gui/accountsettings.ui +++ b/Desktop/src/gui/accountsettings.ui @@ -55,7 +55,7 @@ - Preparing the account + Preparing account @@ -83,7 +83,7 @@ - Sync connections + Synchronized folders diff --git a/Desktop/src/gui/generalsettings.ui b/Desktop/src/gui/generalsettings.ui index 8117d642..c0bd2c3d 100644 --- a/Desktop/src/gui/generalsettings.ui +++ b/Desktop/src/gui/generalsettings.ui @@ -77,7 +77,7 @@ - Start on Login + Start QSfera when I sign in @@ -95,7 +95,7 @@ - Sync hidden files + Sync hidden files and folders @@ -108,14 +108,14 @@ - Show crash reporter + Show crash reporter after a crash - Move remotely deleted files to the local trash bin instead of deleting them + Move server-deleted files to the local trash instead of deleting them @@ -124,14 +124,14 @@ - Edit Ignored Files + Ignored files - Log Settings + Logs diff --git a/Desktop/src/gui/qml/FolderDelegate.qml b/Desktop/src/gui/qml/FolderDelegate.qml index 0e78ddc4..7eebc461 100644 --- a/Desktop/src/gui/qml/FolderDelegate.qml +++ b/Desktop/src/gui/qml/FolderDelegate.qml @@ -22,14 +22,14 @@ import eu.QSfera.resources 1.0 Pane { id: folderSyncPanel // TODO: not cool - readonly property real normalSize: 170 + readonly property real normalSize: 140 readonly property AccountSettings accountSettings: ocContext readonly property OCQuickWidget widget: ocQuickWidget spacing: 10 Accessible.role: Accessible.List - Accessible.name: qsTr("Folder Sync") + Accessible.name: qsTr("Synchronized folders") Connections { target: widget @@ -69,7 +69,7 @@ Pane { Button { id: manageAccountButton - text: qsTr("Manage Account") + text: qsTr("Account") Menu { id: accountMenu @@ -89,14 +89,14 @@ Pane { } MenuItem { - text: qsTr("Remove") + text: qsTr("Remove account") onTriggered: accountSettings.slotDeleteAccount() } } onClicked: { accountMenu.open(); - Accessible.announce(qsTr("Account options Menu")); + Accessible.announce(qsTr("Account options menu")); } Keys.onBacktabPressed: { @@ -352,7 +352,7 @@ Pane { } MenuItem { - text: qsTr("Remove Space") + text: qsTr("Remove folder sync") onTriggered: accountSettings.slotRemoveCurrentFolder(folderDelegate.folder) visible: !folderDelegate.isDeployed height: visible ? implicitHeight : 0 @@ -371,7 +371,7 @@ Pane { Button { id: addSyncButton - text: qsTr("Add Space") + text: qsTr("Add folder sync") onClicked: { accountSettings.slotAddFolder(); @@ -391,7 +391,7 @@ Pane { Layout.fillWidth: true } Label { - text: qsTr("You are synchronizing %1 out of %2 Spaces").arg(accountSettings.syncedSpaces).arg(accountSettings.syncedSpaces + accountSettings.unsyncedSpaces) + text: qsTr("Synchronized folders: %1 of %2").arg(accountSettings.syncedSpaces).arg(accountSettings.syncedSpaces + accountSettings.unsyncedSpaces) visible: accountSettings.accountState.state === AccountState.Connected } } diff --git a/Desktop/src/gui/spaces/qml/SpaceDelegate.qml b/Desktop/src/gui/spaces/qml/SpaceDelegate.qml index 324dcc21..01b980ff 100644 --- a/Desktop/src/gui/spaces/qml/SpaceDelegate.qml +++ b/Desktop/src/gui/spaces/qml/SpaceDelegate.qml @@ -24,6 +24,7 @@ Item { property alias imageSource: image.source property alias statusSource: statusIcon.source + property real imageSize: 96 property real spacing: 10 default property alias content: colLayout.data @@ -39,15 +40,20 @@ Item { Rectangle { Accessible.ignored: true - Layout.preferredHeight: normalSize - 20 - Layout.preferredWidth: normalSize - 20 + Layout.preferredHeight: imageSize + Layout.preferredWidth: imageSize Layout.alignment: Qt.AlignTop color: spaceDelegate.palette.alternateBase + radius: 6 + border.color: spaceDelegate.palette.mid + border.width: 1 + clip: true Image { id: image anchors.fill: parent + anchors.margins: 8 fillMode: Image.PreserveAspectFit sourceSize.width: width sourceSize.height: height @@ -74,7 +80,7 @@ Item { Accessible.ignored: true Layout.fillWidth: true font.bold: true - font.pointSize: 15 + font.pointSize: 13 elide: Text.ElideRight } } diff --git a/Desktop/src/gui/spaces/qml/SpacesView.qml b/Desktop/src/gui/spaces/qml/SpacesView.qml index 0cf30829..2101bcaf 100644 --- a/Desktop/src/gui/spaces/qml/SpacesView.qml +++ b/Desktop/src/gui/spaces/qml/SpacesView.qml @@ -22,7 +22,7 @@ import eu.QSfera.libsync 1.0 Pane { id: spacesView // TODO: not cool - readonly property real normalSize: 170 + readonly property real normalSize: 140 readonly property SpacesBrowser spacesBrowser: ocContext readonly property OCQuickWidget widget: ocQuickWidget diff --git a/Desktop/test/gui/features/remove-account-connection/removeAccountConnection.feature b/Desktop/test/gui/features/remove-account-connection/removeAccountConnection.feature index 3003bf68..601a0025 100644 --- a/Desktop/test/gui/features/remove-account-connection/removeAccountConnection.feature +++ b/Desktop/test/gui/features/remove-account-connection/removeAccountConnection.feature @@ -23,6 +23,6 @@ Feature: remove account connection And user "Alice" has set up a client with default settings When the user removes the connection for user "Alice" Then the settings tab should have the following options in the general section: - | Start on Login | + | Start QSfera when I sign in | And the folder "large-folder" should exist on the file system And the file "testFile.txt" should exist on the file system diff --git a/Desktop/test/gui/features/tabs-settings/tabsSettings.feature b/Desktop/test/gui/features/tabs-settings/tabsSettings.feature index 378ec894..383888d7 100644 --- a/Desktop/test/gui/features/tabs-settings/tabsSettings.feature +++ b/Desktop/test/gui/features/tabs-settings/tabsSettings.feature @@ -19,11 +19,11 @@ Feature: Visually check all tabs And user "Alice" has set up a client with default settings When the user opens the settings tab Then the settings tab should have the following options in the general section: - | Start on Login | + | Start QSfera when I sign in | And the settings tab should have the following options in the advanced section: - | Sync hidden files | - | Edit ignored files | - | Log settings | + | Sync hidden files and folders | + | Ignored files | + | Logs | And the settings tab should have the following options in the network section: | Download Bandwidth | | Upload Bandwidth | diff --git a/Desktop/test/gui/pageObjects/AccountSetting.py b/Desktop/test/gui/pageObjects/AccountSetting.py index 7733019a..fa4fb9dd 100644 --- a/Desktop/test/gui/pageObjects/AccountSetting.py +++ b/Desktop/test/gui/pageObjects/AccountSetting.py @@ -11,16 +11,16 @@ from helpers.SyncHelper import wait_for class AccountSetting: ACCOUNT_CONNECTION_CONTAINER = SimpleNamespace( - by=By.NAME, selector="Sync connections" + by=By.NAME, selector="Synchronized folders" ) - MANAGE_ACCOUNT_BUTTON = SimpleNamespace(by=By.NAME, selector="Manage Account") + MANAGE_ACCOUNT_BUTTON = SimpleNamespace(by=By.NAME, selector="Account") ACCOUNT_MENU = SimpleNamespace(by=By.NAME, selector="{menu_item}") CONFIRM_REMOVE_CONNECTION_BUTTON = SimpleNamespace( by=By.NAME, selector="Remove connection" ) ACCOUNT_CONNECTION_LABEL = SimpleNamespace( by=By.XPATH, - selector="//list[@name='Folder Sync']//label", + selector="//list[@name='Synchronized folders']//label", ) LOG_BROWSER_WINDOW = SimpleNamespace(by=None, selector=None) ACCOUNT_LOADING = SimpleNamespace(by=None, selector=None) @@ -50,7 +50,7 @@ class AccountSetting: @staticmethod def remove_account_connection(): - AccountSetting.account_action("Remove") + AccountSetting.account_action("Remove account") app().find_element( AccountSetting.CONFIRM_REMOVE_CONNECTION_BUTTON.by, AccountSetting.CONFIRM_REMOVE_CONNECTION_BUTTON.selector, diff --git a/Desktop/test/gui/pageObjects/Settings.py b/Desktop/test/gui/pageObjects/Settings.py index 10141648..69ad1f2c 100644 --- a/Desktop/test/gui/pageObjects/Settings.py +++ b/Desktop/test/gui/pageObjects/Settings.py @@ -11,19 +11,19 @@ class Settings: ABOUT_DIALOG = SimpleNamespace(by=By.CLASS_NAME, selector="[page tab | About]") ABOUT_DIALOG_OK_BUTTON = SimpleNamespace(by=By.NAME, selector="OK") GENERAL_SETTING_START_ON_LOGIN = SimpleNamespace( - by=By.XPATH, selector="//panel/*[@name='Start on Login']" + by=By.XPATH, selector="//panel/*[@name='Start QSfera when I sign in']" ) GENERAL_SETTING_LANGUAGE = SimpleNamespace( by=By.XPATH, selector="//panel/label[@name='Language']" ) ADVANCED_SETTING_SYNC_HIDDEN_FILES = SimpleNamespace( - by=By.XPATH, selector="//panel/*[@name='Sync hidden files']" + by=By.XPATH, selector="//panel/*[@name='Sync hidden files and folders']" ) ADVANCED_SETTING_EDIT_IGNORED_FILES = SimpleNamespace( - by=By.XPATH, selector="//panel/*[@name='Edit Ignored Files']" + by=By.XPATH, selector="//panel/*[@name='Ignored files']" ) ADVANCED_SETTING_LOG_SETTINGS = SimpleNamespace( - by=By.XPATH, selector="//panel/*[@name='Log Settings']" + by=By.XPATH, selector="//panel/*[@name='Logs']" ) NETWORK_SETTING_DOWNLOAD_BANDWIDTH = SimpleNamespace( by=By.XPATH, selector="//panel[@name='Download Bandwidth']" @@ -50,7 +50,7 @@ class Settings: @staticmethod def has_general_setting(setting): - if setting.lower() == "start on login": + if setting.lower() == "start qsfera when i sign in": locator = Settings.GENERAL_SETTING_START_ON_LOGIN elif setting.lower() == "language": locator = Settings.GENERAL_SETTING_LANGUAGE @@ -60,11 +60,11 @@ class Settings: @staticmethod def has_advanced_setting(setting): - if setting.lower() == "sync hidden files": + if setting.lower() == "sync hidden files and folders": locator = Settings.ADVANCED_SETTING_SYNC_HIDDEN_FILES - elif setting.lower() == "edit ignored files": + elif setting.lower() == "ignored files": locator = Settings.ADVANCED_SETTING_EDIT_IGNORED_FILES - elif setting.lower() == "log settings": + elif setting.lower() == "logs": locator = Settings.ADVANCED_SETTING_LOG_SETTINGS else: raise ValueError(f"Unknown advanced setting: {setting}") diff --git a/Desktop/test/gui/pageObjects/SyncConnection.py b/Desktop/test/gui/pageObjects/SyncConnection.py index 1693c3bd..e2bdc695 100644 --- a/Desktop/test/gui/pageObjects/SyncConnection.py +++ b/Desktop/test/gui/pageObjects/SyncConnection.py @@ -8,7 +8,7 @@ from helpers.AppHelper import app class SyncConnection: ACCOUNT_CONNECTION_CONTAINER = SimpleNamespace( - by=By.NAME, selector="Sync connections" + by=By.NAME, selector="Synchronized folders" ) FOLDER_SYNC_CONNECTION_MENU_BUTTON = SimpleNamespace( by=By.NAME, @@ -18,7 +18,7 @@ class SyncConnection: SELECTIVE_SYNC_APPLY_BUTTON = SimpleNamespace(by=None, selector=None) CANCEL_FOLDER_SYNC_CONNECTION_DIALOG = SimpleNamespace(by=None, selector=None) CONFIRM_FOLDER_SYNC_CONNECTION_REMOVE = SimpleNamespace( - by=By.NAME, selector="Remove Space" + by=By.NAME, selector="Remove folder sync" ) PERMISSION_ERROR_LABEL = SimpleNamespace(by=None, selector=None) @@ -98,7 +98,7 @@ class SyncConnection: @staticmethod def remove_folder_sync_connection(): - SyncConnection.perform_action("Remove Space") + SyncConnection.perform_action("Remove folder sync") @staticmethod def cancel_folder_sync_connection_removal(): diff --git a/Desktop/test/gui/release-test-plan/testplan.md b/Desktop/test/gui/release-test-plan/testplan.md index f57296c4..b09eb4c1 100644 --- a/Desktop/test/gui/release-test-plan/testplan.md +++ b/Desktop/test/gui/release-test-plan/testplan.md @@ -35,7 +35,7 @@ ``` - If not stated otherwise each test should be run on every platform win/linux/mac. Record the result as per platform. -- "Enable logging to temporary folder" and "Log Http traffic" (tab 'Settings', button 'Log Settings') to have log-files available if needed to report an issue. +- "Enable logging to temporary folder" and "Log Http traffic" (tab 'Settings', button 'Logs') to have log-files available if needed to report an issue. - Make sure all automated UI tests run successfully in CI and run them locally on Windows. - all tests that are automated are marked with a :robot: in the 'Result' column (for the corresponding platform) and the name of the test in the 'Related Comment' column - If multiple people are working on the tests at the same time, mark the tests everyone is working on with the GitHub name of the tester. diff --git a/Desktop/translations/desktop_en.ts b/Desktop/translations/desktop_en.ts index 7950520f..fc64b0bc 100644 --- a/Desktop/translations/desktop_en.ts +++ b/Desktop/translations/desktop_en.ts @@ -230,12 +230,12 @@ File synchronization desktop utility. FolderDelegate - Folder Sync + Synchronized folders - Manage Account + Account @@ -255,12 +255,12 @@ File synchronization desktop utility. - Remove + Remove account - Account options Menu + Account options menu @@ -290,7 +290,7 @@ File synchronization desktop utility. - Remove Space + Remove folder sync @@ -300,12 +300,12 @@ File synchronization desktop utility. - Add Space + Add folder sync - You are synchronizing %1 out of %2 Spaces + Synchronized folders: %1 of %2 @@ -601,12 +601,12 @@ File synchronization desktop utility. - Preparing the account + Preparing account - Sync connections + Synchronized folders @@ -622,17 +622,17 @@ File synchronization desktop utility. - Confirm removal of Space + Confirm removal of folder sync - <p>Do you really want to stop syncing the Space »%1«?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p> + <p>Stop syncing <b>%1</b> on this computer?</p><p><b>Note:</b> This will not delete files in QSfera or on this device.</p> - Remove Space + Remove folder sync @@ -1269,7 +1269,7 @@ Please consider removing this folder from the account and adding it again. - Start on Login + Start QSfera when I sign in @@ -1284,27 +1284,27 @@ Please consider removing this folder from the account and adding it again. - Sync hidden files + Sync hidden files and folders - Show crash reporter + Show crash reporter after a crash - Move remotely deleted files to the local trash bin instead of deleting them + Move server-deleted files to the local trash instead of deleting them - Edit Ignored Files + Ignored files - Log Settings + Logs diff --git a/Desktop/translations/desktop_ru.ts b/Desktop/translations/desktop_ru.ts index 806a460a..e256ab81 100644 --- a/Desktop/translations/desktop_ru.ts +++ b/Desktop/translations/desktop_ru.ts @@ -231,13 +231,13 @@ File synchronization desktop utility. FolderDelegate - Folder Sync - Синхронизация папки + Synchronized folders + Синхронизированные папки - Manage Account - Управление аккаунтом + Account + Аккаунт @@ -256,13 +256,13 @@ File synchronization desktop utility. - Remove - Удалить + Remove account + Удалить аккаунт - Account options Menu - Меню настроек аккаунта + Account options menu + Меню аккаунта @@ -291,8 +291,8 @@ File synchronization desktop utility. - Remove Space - Удалить Пространство + Remove folder sync + Удалить синхронизацию папки @@ -301,13 +301,13 @@ File synchronization desktop utility. - Add Space - Добавить Пространство + Add folder sync + Добавить синхронизацию папки - You are synchronizing %1 out of %2 Spaces - Вы синхронизируете %1 из %2 Пространств + Synchronized folders: %1 of %2 + Синхронизированные папки: %1 из %2 @@ -602,13 +602,13 @@ File synchronization desktop utility. - Preparing the account - Подготовка профиля + Preparing account + Подготовка аккаунта - Sync connections - Подключения для синхронизации + Synchronized folders + Синхронизированные папки @@ -623,18 +623,18 @@ File synchronization desktop utility. - Confirm removal of Space - Подтвердите удаление Пространства + Confirm removal of folder sync + Подтвердите удаление синхронизации папки - <p>Do you really want to stop syncing the Space »%1«?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p> - <p>Вы действительно хотите остановить синхронизацию Пространства »%1«? Примечание:</b> Это <b>не</b> приведет к удалению файлов.</p> + <p>Stop syncing <b>%1</b> on this computer?</p><p><b>Note:</b> This will not delete files in QSfera or on this device.</p> + <p>Остановить синхронизацию <b>%1</b> на этом компьютере?</p><p><b>Важно:</b> Файлы в QSfera и на этом устройстве не будут удалены.</p> - Remove Space - Удалить Пространство + Remove folder sync + Удалить синхронизацию папки @@ -1254,8 +1254,8 @@ Please consider removing this folder from the account and adding it again. - Start on Login - Запускать при входе в систему + Start QSfera when I sign in + Запускать QSfera при входе в систему @@ -1269,28 +1269,28 @@ Please consider removing this folder from the account and adding it again. - Sync hidden files - Синхронизировать скрытые файлы + Sync hidden files and folders + Синхронизировать скрытые файлы и папки - Show crash reporter - Показать отчет об ошибке + Show crash reporter after a crash + Показывать отчет о сбое после ошибки - Move remotely deleted files to the local trash bin instead of deleting them - Перемещать файлы, удаленные через серверный доступ, в локальную корзину вместо их полного удаления + Move server-deleted files to the local trash instead of deleting them + Перемещать удаленные на сервере файлы в локальную корзину вместо удаления - Edit Ignored Files - Изменить игнорируемые файлф + Ignored files + Игнорируемые файлы - Log Settings - Настройки Логирования + Logs + Логи @@ -3457,4 +3457,4 @@ Note that using any logging command line options will override the settings.Некоторые параметры были установлены в более новой версии клиента и используют функции, не доступные в текущей версии - \ No newline at end of file +