From 9a4dca87c9521443cfe7a8078bcaf47d72d2cbad Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Sat, 18 Jul 2026 19:53:25 +0200 Subject: [PATCH] Update stings acc. to FEP-0007 --- AddonManagerOptions.ui | 12 ++++++------ Widgets/addonmanager_widget_addon_buttons.py | 4 ++-- Widgets/addonmanager_widget_view_selector.py | 6 +++--- addonmanager_connection_checker.py | 6 +++--- addonmanager_installer_gui.py | 8 ++++---- addonmanager_python_deps.py | 6 +++--- addonmanager_readme_controller.py | 2 +- addonmanager_uninstaller_gui.py | 8 ++++---- addonmanager_update_all_gui.py | 4 ++-- compact_view.py | 2 +- dependency_resolution_dialog.ui | 4 ++-- expanded_view.py | 2 +- select_toolbar_dialog.ui | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/AddonManagerOptions.ui b/AddonManagerOptions.ui index f8f1c0da..02aa2653 100644 --- a/AddonManagerOptions.ui +++ b/AddonManagerOptions.ui @@ -136,10 +136,10 @@ - Use a proxy server for access to addon data + Uses a proxy server to access addon data - Proxy addon manager traffic + Proxy Addon Manager traffic false @@ -156,7 +156,7 @@ - Use the system's proxy settings + Uses the system proxy settings System @@ -172,7 +172,7 @@ - Use custom proxy settings + Uses custom proxy settings Custom @@ -229,7 +229,7 @@ - Test these proxy settings + Tests these proxy settings Test Connection @@ -278,7 +278,7 @@ - The URL for the addon score data (see Addon Manager wiki page for formatting and hosting details) + Specifies the URL for addon score data AddonsScoreURL diff --git a/Widgets/addonmanager_widget_addon_buttons.py b/Widgets/addonmanager_widget_addon_buttons.py index f1f84633..0a5dde07 100644 --- a/Widgets/addonmanager_widget_addon_buttons.py +++ b/Widgets/addonmanager_widget_addon_buttons.py @@ -169,8 +169,8 @@ def retranslateUi(self, _): self.enable.setText(translate("AddonsInstaller", "Enable")) self.update.setText(translate("AddonsInstaller", "Update")) self.run_macro.setText(translate("AddonsInstaller", "Run")) - self.back.setToolTip(translate("AddonsInstaller", "Return to Package List")) - self.spinner.setToolTip(translate("AddonsInstaller", "Checking for Updates…")) + self.back.setToolTip(translate("AddonsInstaller", "Returns to the package list")) + self.spinner.setToolTip(translate("AddonsInstaller", "Checking for updates…")) if self.is_addon_manager: self.uninstall.setText(translate("AddonsInstaller", "Revert to Built-In")) else: diff --git a/Widgets/addonmanager_widget_view_selector.py b/Widgets/addonmanager_widget_view_selector.py index c7f6ee43..768edfc1 100644 --- a/Widgets/addonmanager_widget_view_selector.py +++ b/Widgets/addonmanager_widget_view_selector.py @@ -137,6 +137,6 @@ def _setup_connections(self): ) def retranslateUi(self, _): - self.composite_button.setToolTip(translate("AddonsInstaller", "Composite view")) - self.expanded_button.setToolTip(translate("AddonsInstaller", "Expanded view")) - self.compact_button.setToolTip(translate("AddonsInstaller", "Compact view")) + self.composite_button.setToolTip(translate("AddonsInstaller", "Shows the composite view")) + self.expanded_button.setToolTip(translate("AddonsInstaller", "Shows the expanded view")) + self.compact_button.setToolTip(translate("AddonsInstaller", "Shows the compact view")) diff --git a/addonmanager_connection_checker.py b/addonmanager_connection_checker.py index e22ca2c1..ad48cc0d 100644 --- a/addonmanager_connection_checker.py +++ b/addonmanager_connection_checker.py @@ -63,8 +63,8 @@ def _show_connection_check_message(self): if not self.connection_checker.isFinished(): self.connection_check_message = QtWidgets.QMessageBox( QtWidgets.QMessageBox.Information, - translate("AddonsInstaller", "Checking connection"), - translate("AddonsInstaller", "Checking for connection to addons.freecad.org..."), + translate("AddonsInstaller", "Checking Connection"), + translate("AddonsInstaller", "Checking the connection to addons.freecad.org…"), QtWidgets.QMessageBox.Cancel, ) self.connection_check_message.setObjectName("AddonManager_ConnectionCheckMessageDialog") @@ -90,7 +90,7 @@ def _network_connection_failed(self, message: str) -> None: MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_ConnectionFailedDialog", - translate("AddonsInstaller", "Connection failed"), + translate("AddonsInstaller", "Connection Failed"), message, QtWidgets.QMessageBox.Ok, ) diff --git a/addonmanager_installer_gui.py b/addonmanager_installer_gui.py index ac923b2b..a099289c 100644 --- a/addonmanager_installer_gui.py +++ b/addonmanager_installer_gui.py @@ -701,7 +701,7 @@ def _check_python_version(self) -> bool: MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_IncompatiblePythonVersionDialog", - translate("AddonsInstaller", "Incompatible Python version"), + translate("AddonsInstaller", "Incompatible Python Version"), translate( "AddonsInstaller", "This addon (or one of its dependencies) requires Python {}, and your system" @@ -783,7 +783,7 @@ def _report_no_python_exe(self) -> None: result = MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_CannotExecutePythonDialog", - translate("AddonsInstaller", "Cannot execute Python"), + translate("AddonsInstaller", "Cannot Execute Python"), translate( "AddonsInstaller", "Failed to automatically locate your Python executable, or the path is set " @@ -809,7 +809,7 @@ def _report_no_pip(self, command: str) -> None: result = MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_CannotExecutePipDialog", - translate("AddonsInstaller", "Cannot execute pip"), + translate("AddonsInstaller", "Cannot Execute pip"), translate( "AddonsInstaller", "Failed to execute pip, which may be missing from your Python installation. Please " @@ -837,7 +837,7 @@ def _report_dependency_failure(self, short_message: str, details: str) -> None: result = MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_PackageInstallationFailedDialog", - translate("AddonsInstaller", "Package installation failed"), + translate("AddonsInstaller", "Package Installation Failed"), short_message + "\n\n" + translate("AddonsInstaller", "See Report View for detailed failure log.") diff --git a/addonmanager_python_deps.py b/addonmanager_python_deps.py index 3b877ebb..e0454511 100644 --- a/addonmanager_python_deps.py +++ b/addonmanager_python_deps.py @@ -298,11 +298,11 @@ def headerData(self, section, orientation, role=...) -> Optional[str]: if section == 0: return translate("AddonsInstaller", "Package") elif section == 1: - return translate("AddonsInstaller", "Installed Version") + return translate("AddonsInstaller", "Installed version") elif section == 2: - return translate("AddonsInstaller", "Available Version") + return translate("AddonsInstaller", "Available version") elif section == 3: - return translate("AddonsInstaller", "Used By") + return translate("AddonsInstaller", "Used by") return None def flags(self, index) -> QtCore.Qt.ItemFlag: diff --git a/addonmanager_readme_controller.py b/addonmanager_readme_controller.py index 7964c99e..7ea29572 100644 --- a/addonmanager_readme_controller.py +++ b/addonmanager_readme_controller.py @@ -207,7 +207,7 @@ def _create_non_wiki_display(self): self.widget.setUrl(self.url) self.widget.setText( - translate("AddonsInstaller", "Loading page for {} from {}...").format( + translate("AddonsInstaller", "Loading page for {} from {}…").format( self.addon.display_name, self.url ) ) diff --git a/addonmanager_uninstaller_gui.py b/addonmanager_uninstaller_gui.py index 144a78e0..e830779e 100644 --- a/addonmanager_uninstaller_gui.py +++ b/addonmanager_uninstaller_gui.py @@ -83,7 +83,7 @@ def _confirm_uninstallation(self) -> bool: confirm = MessageDialog.show_modal( MessageDialog.DialogType.QUESTION, "AddonManager_ConfirmUninstallDialog", - translate("AddonsInstaller", "Confirm remove"), + translate("AddonsInstaller", "Confirm Remove"), translate("AddonsInstaller", "Are you sure you want to uninstall {}?").format( self.addon_to_remove.display_name ), @@ -96,7 +96,7 @@ def _show_progress_dialog(self): QtWidgets.QMessageBox.NoIcon, translate("AddonsInstaller", "Removing Addon"), translate("AddonsInstaller", "Removing {}").format(self.addon_to_remove.display_name) - + "...", + + "…", QtWidgets.QMessageBox.Cancel, parent=utils.get_main_am_window(), ) @@ -120,7 +120,7 @@ def _succeeded(self, addon): MessageDialog.show_modal( MessageDialog.DialogType.INFO, "AddonManager_UninstallCompleteDialog", - translate("AddonsInstaller", "Uninstall complete"), + translate("AddonsInstaller", "Uninstall Complete"), translate("AddonInstaller", "Finished removing {}").format(addon.display_name), QtWidgets.QMessageBox.Ok, ) @@ -134,7 +134,7 @@ def _failed(self, addon, message): MessageDialog.show_modal( MessageDialog.DialogType.ERROR, "AddonManager_UninstallFailedDialog", - translate("AddonsInstaller", "Uninstall failed"), + translate("AddonsInstaller", "Uninstall Failed"), translate("AddonInstaller", "Failed to remove some files") + ":\n" + message, QtWidgets.QMessageBox.Ok, ) diff --git a/addonmanager_update_all_gui.py b/addonmanager_update_all_gui.py index 01f7b68c..e6552622 100644 --- a/addonmanager_update_all_gui.py +++ b/addonmanager_update_all_gui.py @@ -407,8 +407,8 @@ def __init__(self, addons: List[Addon]): self.update_is_done: List[bool] = [] self.headers = [ translate("AddonsInstaller", "Name", "Column header"), - translate("AddonsInstaller", "Installed Version", "Column header"), - translate("AddonsInstaller", "Available Version", "Column header"), + translate("AddonsInstaller", "Installed version", "Column header"), + translate("AddonsInstaller", "Available version", "Column header"), translate("AddonsInstaller", "Update?", "Column header"), translate("AddonsInstaller", "Done", "Column header"), ] diff --git a/compact_view.py b/compact_view.py index 6ec3099d..94704e42 100644 --- a/compact_view.py +++ b/compact_view.py @@ -89,7 +89,7 @@ def retranslateUi(self, CompactView): # CompactView.setWindowTitle(QCoreApplication.translate("CompactView", "Form", None)) self.labelIcon.setText(QtCore.QCoreApplication.translate("CompactView", "Icon", None)) self.labelPackageName.setText( - QtCore.QCoreApplication.translate("CompactView", "Package Name", None) + QtCore.QCoreApplication.translate("CompactView", "Package name", None) ) self.labelVersion.setText(QtCore.QCoreApplication.translate("CompactView", "Version", None)) self.labelDescription.setText( diff --git a/dependency_resolution_dialog.ui b/dependency_resolution_dialog.ui index 330ea0e8..f0c35b80 100644 --- a/dependency_resolution_dialog.ui +++ b/dependency_resolution_dialog.ui @@ -26,9 +26,9 @@ - This installation/update has the following required and optional dependencies. + The following dependencies are required or optional for this installation or update. -Do you want the Addon Manager to install them automatically? Choose "Ignore" to install/update without installing the dependencies. +Choose "Ignore" to continue without installing dependencies. true diff --git a/expanded_view.py b/expanded_view.py index 3390fa13..53020637 100644 --- a/expanded_view.py +++ b/expanded_view.py @@ -138,7 +138,7 @@ def retranslateUi(self, ExpandedView): # ExpandedView.setWindowTitle(QCoreApplication.translate("ExpandedView", "Form", None)) self.labelIcon.setText(QtCore.QCoreApplication.translate("ExpandedView", "Icon", None)) self.labelPackageName.setText( - QtCore.QCoreApplication.translate("ExpandedView", "

Package Name

", None) + QtCore.QCoreApplication.translate("ExpandedView", "

Package name

", None) ) self.labelVersion.setText( QtCore.QCoreApplication.translate("ExpandedView", "Version", None) diff --git a/select_toolbar_dialog.ui b/select_toolbar_dialog.ui index beea7ddb..b1ccf002 100644 --- a/select_toolbar_dialog.ui +++ b/select_toolbar_dialog.ui @@ -23,7 +23,7 @@ - Select a toolbar to add this macro to + Adds this macro to the selected toolbar