kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #15957 from hasecilu/fix/capitalization

Browse Source 
TechDraw: Fix capitalization of 2D and 3D
This commit is contained in:
Max Wilfinger
2024-11-15 18:37:47 +01:00
committed by GitHub
parent e8b7fac134 2e7a04f4e2
commit 665bee5e5a
28 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/AddonManager/AddonManagerOptions.ui
View File

@@ -24,7 +24,7 @@
installed addons will be checked for available updates</string>
</property>
<property name="text">
<string>Automatically check for updates at start (requires git)</string>
<string>Automatically check for updates at start (requires Git)</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
@@ -366,7 +366,7 @@ installed addons will be checked for available updates</string>
</size>
</property>
<property name="toolTip">
<string>The path to the git executable. Autodetected if needed and not specified.</string>
<string>The path to the Git executable. Autodetected if needed and not specified.</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>GitExecutable</cstring>
@@ -393,7 +393,7 @@ installed addons will be checked for available updates</string>
<item>
<widget class="Gui::PrefCheckBox" name="guiprefcheckboxShowBranchSwitcher">
<property name="text">
<string>Show option to change branches (requires git)</string>
<string>Show option to change branches (requires Git)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ShowBranchSwitcher</cstring>
@@ -406,7 +406,7 @@ installed addons will be checked for available updates</string>
<item>
<widget class="Gui::PrefCheckBox" name="guiprefcheckboxDisableGit">
<property name="text">
<string>Disable git (fall back to ZIP downloads only)</string>
<string>Disable Git (fall back to ZIP downloads only)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>disableGit</cstring>

6
src/Mod/AddonManager/addonmanager_git.py
View File

@@ -21,7 +21,7 @@
# * *
# ***************************************************************************
""" Wrapper around git executable to simplify calling git commands from Python. """
"""Wrapper around git executable to simplify calling git commands from Python."""
# pylint: disable=too-few-public-methods
@@ -148,7 +148,7 @@ class GitManager:
fci.Console.PrintWarning(
translate(
"AddonsInstaller",
"Basic git update failed with the following message:",
"Basic Git update failed with the following message:",
)
+ str(e)
+ "\n"
@@ -263,7 +263,7 @@ class GitManager:
self.clone(remote, local_path)
except GitFailed as e:
fci.Console.PrintError(
translate("AddonsInstaller", "Failed to clone {} into {} using git").format(
translate("AddonsInstaller", "Failed to clone {} into {} using Git").format(
remote, local_path
)
)

10
src/Mod/AddonManager/addonmanager_workers_startup.py
View File

@@ -279,7 +279,7 @@ class CreateAddonListWorker(QtCore.QThread):
if not self.git_manager:
message = translate(
"AddonsInstaller",
"Git is disabled, skipping git macros",
"Git is disabled, skipping Git macros",
)
self.status_message.emit(message)
FreeCAD.Console.PrintWarning(message + "\n")
@@ -327,7 +327,7 @@ class CreateAddonListWorker(QtCore.QThread):
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
"Attempting to change non-git Macro setup to use git\n",
"Attempting to change non-Git Macro setup to use Git\n",
)
)
self.git_manager.repair(
@@ -603,7 +603,7 @@ class UpdateChecker:
"AddonManager: "
+ translate(
"AddonsInstaller",
"Unable to fetch git updates for workbench {}",
"Unable to fetch Git updates for workbench {}",
).format(wb.name)
+ "\n"
)
@@ -617,7 +617,7 @@ class UpdateChecker:
wb.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
except GitFailed:
FreeCAD.Console.PrintWarning(
translate("AddonsInstaller", "git status failed for {}").format(wb.name)
translate("AddonsInstaller", "Git status failed for {}").format(wb.name)
+ "\n"
)
wb.set_status(Addon.Status.CANNOT_CHECK)
@@ -909,7 +909,7 @@ class GetMacroDetailsWorker(QtCore.QThread):
self.status_message.emit(translate("AddonsInstaller", "Retrieving macro description..."))
if not self.macro.parsed and self.macro.on_git:
self.status_message.emit(translate("AddonsInstaller", "Retrieving info from git"))
self.status_message.emit(translate("AddonsInstaller", "Retrieving info from Git"))
self.macro.fill_details_from_file(self.macro.src_filename)
if not self.macro.parsed and self.macro.on_wiki:
self.status_message.emit(translate("AddonsInstaller", "Retrieving info from wiki"))