From fe0f862997a06b505545688c8d433ad54f7147a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Boismenu?=
The task that the selected item will be associated with "
- "in Shotgun after publishing. It is recommended to always "
+ "in ShotGrid after publishing. It is recommended to always "
"fill out the Task field when publishing. The menu button "
"to the right will provide suggestions for Tasks to publish "
"including the Tasks assigned to you, recently used Tasks, "
@@ -94,7 +94,7 @@ def __init__(self, parent=None):
)
self.ui.context_widget.set_link_tooltip(
" The entity that the selected item will be associated with "
- "in Shotgun after publishing. By selecting a Task in the field "
+ "in ShotGrid after publishing. By selecting a Task in the field "
"above, the Link will automatically be populated. It is "
"recommended that you always populate the Task field when "
"publishing. The Task menu above will display any tasks associated "
@@ -306,7 +306,7 @@ def closeEvent(self, event):
# shut down main threadpool
self._task_manager.shut_down()
except Exception:
- logger.exception("Error running Shotgun Panel App closeEvent()")
+ logger.exception("Error running ShotGrid Panel App closeEvent()")
# ensure the context widget's recent contexts are saved
self.ui.context_widget.save_recent_contexts()
diff --git a/python/tk_multi_publish2/progress/progress_handler.py b/python/tk_multi_publish2/progress/progress_handler.py
index b7a45242..ed438563 100644
--- a/python/tk_multi_publish2/progress/progress_handler.py
+++ b/python/tk_multi_publish2/progress/progress_handler.py
@@ -384,7 +384,7 @@ def _process_action(self, item, action):
# add a tooltip if not supplied
if "tooltip" not in action:
- action["tooltip"] = "Reveal the entity in Shotgun"
+ action["tooltip"] = "Reveal the entity in ShotGrid"
elif action["type"] == "show_more_info":
# A common action for showing more information than what
diff --git a/python/tk_multi_publish2/progress/ui/progress_details_widget.py b/python/tk_multi_publish2/progress/ui/progress_details_widget.py
index 4ed8d714..1552d19c 100644
--- a/python/tk_multi_publish2/progress/ui/progress_details_widget.py
+++ b/python/tk_multi_publish2/progress/ui/progress_details_widget.py
@@ -62,9 +62,9 @@ def setupUi(self, ProgressDetailsWidget):
def retranslateUi(self, ProgressDetailsWidget):
ProgressDetailsWidget.setWindowTitle(QtGui.QApplication.translate("ProgressDetailsWidget", "Form", None, QtGui.QApplication.UnicodeUTF8))
self.progress_label.setText(QtGui.QApplication.translate("ProgressDetailsWidget", "Progress Details", None, QtGui.QApplication.UnicodeUTF8))
- self.copy_log_button.setToolTip(QtGui.QApplication.translate("ProgressDetailsWidget", " Open the publisher\'s log file. The log file is useful for deeper debugging of publish issues. For issues involving Shotgun Support, please include a copy of this file when submitting a support request. File versioning
The version
field of the resulting Publish in
- Shotgun will also reflect the version number identified in the filename.
+ ShotGrid will also reflect the version number identified in the filename.
The basic worklfow recognizes the following version formats by default:
@@ -210,7 +210,7 @@ def settings(self):
],
"description": (
"List of file types to include. Each entry in the list "
- "is a list in which the first entry is the Shotgun "
+ "is a list in which the first entry is the ShotGrid "
"published file type and subsequent entries are file "
"extensions that should be associated."
),
@@ -321,7 +321,7 @@ def validate(self, settings, item):
# happening.
error_msg = (
"Can not validate file path. There is already a publish in "
- "Shotgun that matches this path. Please uncheck this "
+ "ShotGrid that matches this path. Please uncheck this "
"plugin or save the file to a different path."
)
self.logger.error(error_msg)
@@ -334,17 +334,17 @@ def validate(self, settings, item):
"
%s
" % (pprint.pformat(publishes),)
)
self.logger.warn(
- "Found %s conflicting publishes in Shotgun" % (len(publishes),),
+ "Found %s conflicting publishes in ShotGrid" % (len(publishes),),
extra={
"action_show_more_info": {
"label": "Show Conflicts",
- "tooltip": "Show conflicting publishes in Shotgun",
+ "tooltip": "Show conflicting publishes in ShotGrid",
"text": conflict_info,
}
},
)
- self.logger.info("A Publish will be created in Shotgun and linked to:")
+ self.logger.info("A Publish will be created in ShotGrid and linked to:")
self.logger.info(" %s" % (path,))
return True
@@ -425,11 +425,11 @@ def publish(self, settings, item):
item.properties.sg_publish_data = sgtk.util.register_publish(**publish_data)
self.logger.info("Publish registered!")
self.logger.debug(
- "Shotgun Publish data...",
+ "ShotGrid Publish data...",
extra={
"action_show_more_info": {
- "label": "Shotgun Publish Data",
- "tooltip": "Show the complete Shotgun Publish Entity dictionary",
+ "label": "ShotGrid Publish Data",
+ "tooltip": "Show the complete ShotGrid Publish Entity dictionary",
"text": "%s
"
% (pprint.pformat(item.properties.sg_publish_data),),
}
@@ -466,7 +466,7 @@ def finalize(self, settings, item):
extra={
"action_show_in_shotgun": {
"label": "Show Publish",
- "tooltip": "Open the Publish in Shotgun.",
+ "tooltip": "Open the Publish in ShotGrid.",
"entity": publish_data,
}
},
diff --git a/hooks/upload_version.py b/hooks/upload_version.py
index 513fabfb..ef3c4dc8 100644
--- a/hooks/upload_version.py
+++ b/hooks/upload_version.py
@@ -52,12 +52,12 @@ def description(self):
review_url = "https://www.shotgunsoftware.com/features/#review"
return """
- Upload the file to Shotgun for review.
+ Upload the file to ShotGrid for review.
- A Version entry will be created in Shotgun and a transcoded
+ A Version entry will be created in ShotGrid and a transcoded
copy of the file will be attached to it. The file can then be reviewed
via the project's Media page, RV, or
- the Shotgun Review mobile app.
+ the ShotGrid Review mobile app.
""" % (
media_page_url,
review_url,
@@ -94,12 +94,12 @@ def settings(self):
"Upload": {
"type": "bool",
"default": True,
- "description": "Upload content to Shotgun?",
+ "description": "Upload content to ShotGrid?",
},
"Link Local File": {
"type": "bool",
"default": True,
- "description": "Should the local file be referenced by Shotgun",
+ "description": "Should the local file be referenced by ShotGrid",
},
}
@@ -292,7 +292,7 @@ def finalize(self, settings, item):
extra={
"action_show_in_shotgun": {
"label": "Show Version",
- "tooltip": "Reveal the version in Shotgun.",
+ "tooltip": "Reveal the version in ShotGrid.",
"entity": version,
}
},
diff --git a/info.yml b/info.yml
index 16407961..b74fe45d 100644
--- a/info.yml
+++ b/info.yml
@@ -79,7 +79,7 @@ configuration:
allows_empty: True
default_value:
# Default hook 1: publish any file to SG
- - name: Publish to Shotgun
+ - name: Publish to ShotGrid
hook: "{self}/publish_file.py"
settings: {}
# Default hook 2: upload known, reviewable types to SG
@@ -131,7 +131,7 @@ requires_shotgun_fields:
# More verbose description of this item
display_name: "Publish"
-description: "Provides UI and functionality to publish files to Shotgun."
+description: "Provides UI and functionality to publish files to ShotGrid."
# Required minimum versions for this item to run
requires_shotgun_version:
diff --git a/python/tk_multi_publish2/api/plugins/publish_plugin_instance.py b/python/tk_multi_publish2/api/plugins/publish_plugin_instance.py
index c9d781c9..862c534b 100644
--- a/python/tk_multi_publish2/api/plugins/publish_plugin_instance.py
+++ b/python/tk_multi_publish2/api/plugins/publish_plugin_instance.py
@@ -183,7 +183,7 @@ def run_validate(self, settings, item):
if item.context.project is None:
status = False
self.logger.error(
- "Please link '%s' to a Shotgun object and task!" % item.name
+ "Please link '%s' to a ShotGrid object and task!" % item.name
)
if status:
diff --git a/python/tk_multi_publish2/dialog.py b/python/tk_multi_publish2/dialog.py
index 6b8529ee..e2287cf2 100644
--- a/python/tk_multi_publish2/dialog.py
+++ b/python/tk_multi_publish2/dialog.py
@@ -85,7 +85,7 @@ def __init__(self, parent=None):
# tooltips for the task and link inputs
self.ui.context_widget.set_task_tooltip(
"
Open the publisher\'s log file. The log file is useful for deeper debugging of publish issues. For issues involving ShotGrid Support, please include a copy of this file when submitting a support request.
", None, QtGui.QApplication.UnicodeUTF8)) self.copy_log_button.setText(QtGui.QApplication.translate("ProgressDetailsWidget", "Copy to Clipboard", None, QtGui.QApplication.UnicodeUTF8)) self.close.setToolTip(QtGui.QApplication.translate("ProgressDetailsWidget", "Close", None, QtGui.QApplication.UnicodeUTF8)) - self.log_tree.setAccessibleName(QtGui.QApplication.translate("ProgressDetailsWidget", "Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the Shotgun Support team.
", None, QtGui.QApplication.UnicodeUTF8)) + self.log_tree.setAccessibleName(QtGui.QApplication.translate("ProgressDetailsWidget", "Opens the log file for the current engine which will include log messages from the publisher. This file is extremely useful for deeper debugging and understanding of publish issues. A copy of this file should be included when submitting support requests to the ShotGrid Support team.
", None, QtGui.QApplication.UnicodeUTF8)) from . import resources_rc diff --git a/python/tk_multi_publish2/ui/dialog.py b/python/tk_multi_publish2/ui/dialog.py index 99171f6f..5debf8d5 100644 --- a/python/tk_multi_publish2/ui/dialog.py +++ b/python/tk_multi_publish2/ui/dialog.py @@ -528,7 +528,7 @@ def setupUi(self, Dialog): Dialog.setTabOrder(self.stop_processing, self.scrollArea) def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Shotgun Publish", None, QtGui.QApplication.UnicodeUTF8)) + Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "ShotGrid Publish", None, QtGui.QApplication.UnicodeUTF8)) Dialog.setAccessibleName(QtGui.QApplication.translate("Dialog", "publish dialog", None, QtGui.QApplication.UnicodeUTF8)) self.main_stack.setAccessibleName(QtGui.QApplication.translate("Dialog", "stackedwidget", None, QtGui.QApplication.UnicodeUTF8)) self.large_drop_area_label.setText(QtGui.QApplication.translate("Dialog", "Drag and drop files or folders here", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/resources/dialog.ui b/resources/dialog.ui index 526abdcc..450a82e8 100644 --- a/resources/dialog.ui +++ b/resources/dialog.ui @@ -11,7 +11,7 @@