Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions AddonManagerOptions.ui
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<item>
<widget class="QGroupBox" name="proxyGroupBox">
<property name="toolTip">
<string>Use a proxy server for access to addon data</string>
<string>Uses a proxy server to access addon data</string>
</property>
<property name="title">
<string>Proxy addon manager traffic</string>
<string>Proxy Addon Manager traffic</string>
</property>
<property name="flat">
<bool>false</bool>
Expand All @@ -156,7 +156,7 @@
<item>
<widget class="QRadioButton" name="systemProxyButton">
<property name="toolTip">
<string>Use the system's proxy settings</string>
<string>Uses the system proxy settings</string>
</property>
<property name="text">
<string>System</string>
Expand All @@ -172,7 +172,7 @@
<item>
<widget class="QRadioButton" name="customProxyButton">
<property name="toolTip">
<string>Use custom proxy settings</string>
<string>Uses custom proxy settings</string>
</property>
<property name="text">
<string>Custom</string>
Expand Down Expand Up @@ -229,7 +229,7 @@
<item row="1" column="4">
<widget class="QPushButton" name="proxyTestButton">
<property name="toolTip">
<string>Test these proxy settings</string>
<string>Tests these proxy settings</string>
</property>
<property name="text">
<string>Test Connection</string>
Expand Down Expand Up @@ -278,7 +278,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>The URL for the addon score data (see Addon Manager wiki page for formatting and hosting details)</string>
<string>Specifies the URL for addon score data</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>AddonsScoreURL</cstring>
Expand Down
4 changes: 2 additions & 2 deletions Widgets/addonmanager_widget_addon_buttons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Widgets/addonmanager_widget_view_selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
6 changes: 3 additions & 3 deletions addonmanager_connection_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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,
)
Expand Down
8 changes: 4 additions & 4 deletions addonmanager_installer_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 "
Expand All @@ -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 "
Expand Down Expand Up @@ -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.")
Expand Down
6 changes: 3 additions & 3 deletions addonmanager_python_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion addonmanager_readme_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)
Expand Down
8 changes: 4 additions & 4 deletions addonmanager_uninstaller_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand All @@ -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(),
)
Expand All @@ -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,
)
Expand All @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions addonmanager_update_all_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
Expand Down
2 changes: 1 addition & 1 deletion compact_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "<b>Package Name</b>", None)
QtCore.QCoreApplication.translate("CompactView", "<b>Package name</b>", None)
)
self.labelVersion.setText(QtCore.QCoreApplication.translate("CompactView", "Version", None))
self.labelDescription.setText(
Expand Down
4 changes: 2 additions & 2 deletions dependency_resolution_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>This installation/update has the following required and optional dependencies.
<string>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.</string>
Choose "Ignore" to continue without installing dependencies.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion expanded_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "<h1>Package Name</h1>", None)
QtCore.QCoreApplication.translate("ExpandedView", "<h1>Package name</h1>", None)
)
self.labelVersion.setText(
QtCore.QCoreApplication.translate("ExpandedView", "Version", None)
Expand Down
2 changes: 1 addition & 1 deletion select_toolbar_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Select a toolbar to add this macro to</string>
<string>Adds this macro to the selected toolbar</string>
</property>
</widget>
</item>
Expand Down
Loading