提交 486702f1 编写于 作者: A Andrea Gelmini

Stupid typos fix

上级 4349753e
...@@ -38,9 +38,9 @@ http://www.openshot.org/download/ to find your correct installer. ...@@ -38,9 +38,9 @@ http://www.openshot.org/download/ to find your correct installer.
DOCUMENTATION DOCUMENTATION
################# #################
Documenation for OpenShot 2.0 can be generated with Doxygen, a popular Documentation for OpenShot 2.0 can be generated with Doxygen, a popular
command-line application for scanning source code and generating readable command-line application for scanning source code and generating readable
documention. OpenShot contains a Doxygen input file (Doxyfile.in), but documentation. OpenShot contains a Doxygen input file (Doxyfile.in), but
you must first install the following Python filter for Doxygen: doxypy. you must first install the following Python filter for Doxygen: doxypy.
Then, run the following command: Then, run the following command:
......
...@@ -412,7 +412,7 @@ try: ...@@ -412,7 +412,7 @@ try:
output(line) output(line)
if "error".encode("UTF-8") in line: if "error".encode("UTF-8") in line:
error("AppImageKit Error: %s" % line) error("AppImageKit Error: %s" % line)
if "completed sucessfully".encode("UTF-8") in line: if "completed successfully".encode("UTF-8") in line:
app_image_success = True app_image_success = True
# Was the AppImage creation successful # Was the AppImage creation successful
......
...@@ -139,7 +139,7 @@ def createDissolveText(title,extrude,bevel_depth,spacemode,textsize,width,font): ...@@ -139,7 +139,7 @@ def createDissolveText(title,extrude,bevel_depth,spacemode,textsize,width,font):
ActiveObjectText.modifiers['Remesh'].scale=0.99 ActiveObjectText.modifiers['Remesh'].scale=0.99
ActiveObjectText.modifiers['Remesh'].mode='SMOOTH' ActiveObjectText.modifiers['Remesh'].mode='SMOOTH'
ActiveObjectText.modifiers['Remesh'].use_remove_disconnected=False ActiveObjectText.modifiers['Remesh'].use_remove_disconnected=False
#apply this mofifier #apply this modifier
bpy.ops.object.modifier_apply(apply_as='DATA', modifier="Remesh") bpy.ops.object.modifier_apply(apply_as='DATA', modifier="Remesh")
#Nb quads for particle system be careful of API version #Nb quads for particle system be careful of API version
......
...@@ -133,7 +133,7 @@ def createExplodeTxt(title,particle_number,extrude,bevel_depth,spacemode,textsiz ...@@ -133,7 +133,7 @@ def createExplodeTxt(title,particle_number,extrude,bevel_depth,spacemode,textsiz
#affect an existing material #affect an existing material
bpy.data.objects['Text'].material_slots[0].material = bpy.data.materials['TextMaterial'] bpy.data.objects['Text'].material_slots[0].material = bpy.data.materials['TextMaterial']
#solidifiy parameter #solidify parameter
bpy.data.objects['Text'].modifiers['Solidify'].edge_crease_inner=0.01 bpy.data.objects['Text'].modifiers['Solidify'].edge_crease_inner=0.01
bpy.data.objects['Text'].modifiers['Solidify'].thickness = 0.02 bpy.data.objects['Text'].modifiers['Solidify'].thickness = 0.02
#ground management #ground management
......
...@@ -46,7 +46,7 @@ try: ...@@ -46,7 +46,7 @@ try:
# Enable High-DPI resolutions # Enable High-DPI resolutions
QApplication.setAttribute(Qt.AA_EnableHighDpiScaling) QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
except AttributeError: except AttributeError:
pass # Quitely fail for older Qt5 versions pass # Quietly fail for older Qt5 versions
def get_app(): def get_app():
...@@ -75,7 +75,7 @@ class OpenShotApp(QApplication): ...@@ -75,7 +75,7 @@ class OpenShotApp(QApplication):
except: except:
pass pass
# Setup appication # Setup application
self.setApplicationName('openshot') self.setApplicationName('openshot')
self.setApplicationVersion(info.SETUP['version']) self.setApplicationVersion(info.SETUP['version'])
......
...@@ -60,7 +60,7 @@ for folder in [USER_PATH, THUMBNAIL_PATH, CACHE_PATH, BLENDER_PATH, ASSETS_PATH, ...@@ -60,7 +60,7 @@ for folder in [USER_PATH, THUMBNAIL_PATH, CACHE_PATH, BLENDER_PATH, ASSETS_PATH,
if not os.path.exists(folder.encode("UTF-8")): if not os.path.exists(folder.encode("UTF-8")):
os.makedirs(folder, exist_ok=True) os.makedirs(folder, exist_ok=True)
# names of all contributers, using "u" for unicode encoding # names of all contributors, using "u" for unicode encoding
AF = {"name": u"Andy Finch", "email": "andy@openshot.org", "website":"http://openshot.org/developers/andy"} AF = {"name": u"Andy Finch", "email": "andy@openshot.org", "website":"http://openshot.org/developers/andy"}
NF = {"name": u"Noah Figg", "email": "eggmunkee@hotmail.com"} NF = {"name": u"Noah Figg", "email": "eggmunkee@hotmail.com"}
JT = {"name": u"Jonathan Thomas", "email": "jonathan@openshot.org", "website":"http://openshot.org/developers/jonathan"} JT = {"name": u"Jonathan Thomas", "email": "jonathan@openshot.org", "website":"http://openshot.org/developers/jonathan"}
......
...@@ -66,7 +66,7 @@ try: ...@@ -66,7 +66,7 @@ try:
linux_distro = "-".join(platform.linux_distribution()) linux_distro = "-".join(platform.linux_distribution())
except Exception as Ex: except Exception as Ex:
log.error("Error determing OS version in metrics.py") log.error("Error determining OS version in metrics.py")
# Build user-agent # Build user-agent
user_agent = "Mozilla/5.0 (%s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36" % os_version user_agent = "Mozilla/5.0 (%s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36" % os_version
...@@ -176,4 +176,4 @@ def send_exception(stacktrace, source): ...@@ -176,4 +176,4 @@ def send_exception(stacktrace, source):
log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text)) log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text))
except Exception as Ex: except Exception as Ex:
log.error("Failed to Track exception: %s" % (Ex)) log.error("Failed to Track exception: %s" % (Ex))
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
This file helps you generate the POT file that contains all of the translatable This file helps you generate the POT file that contains all of the translatable
strings / text in OpenShot. Because some of our text is in custom XML files, strings / text in OpenShot. Because some of our text is in custom XML files,
the xgettext command can't correctly generate the POT file. Thus... the the xgettext command can't correctly generate the POT file. Thus... the
existance of this file. =) existence of this file. =)
Command to create the individual language PO files (Ascii files) Command to create the individual language PO files (Ascii files)
$ msginit --input=OpenShot.pot --locale=fr_FR $ msginit --input=OpenShot.pot --locale=fr_FR
...@@ -118,7 +118,7 @@ output.close() ...@@ -118,7 +118,7 @@ output.close()
shutil.copy(os.path.join(langage_folder_path, "clean.po"), os.path.join(langage_folder_path, 'OpenShot_QtUi.pot')) shutil.copy(os.path.join(langage_folder_path, "clean.po"), os.path.join(langage_folder_path, 'OpenShot_QtUi.pot'))
os.remove(os.path.join(langage_folder_path, "clean.po")) os.remove(os.path.join(langage_folder_path, "clean.po"))
# Remove duplciates (if any found) # Remove duplicates (if any found)
subprocess.call('msguniq %s --use-first -o %s' % (os.path.join(langage_folder_path, 'OpenShot_QtUi.pot'), subprocess.call('msguniq %s --use-first -o %s' % (os.path.join(langage_folder_path, 'OpenShot_QtUi.pot'),
os.path.join(langage_folder_path, 'clean.po')), shell=True) os.path.join(langage_folder_path, 'clean.po')), shell=True)
shutil.copy(os.path.join(langage_folder_path, "clean.po"), os.path.join(langage_folder_path, 'OpenShot_QtUi.pot')) shutil.copy(os.path.join(langage_folder_path, "clean.po"), os.path.join(langage_folder_path, 'OpenShot_QtUi.pot'))
......
...@@ -110,7 +110,7 @@ class TestQueryClass(unittest.TestCase): ...@@ -110,7 +110,7 @@ class TestQueryClass(unittest.TestCase):
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
"Hook method for deconstructing the class fixture after running all tests in the class." "Hook method for deconstructing the class fixture after running all tests in the class."
print ('Exiting Unittests: Quiting QApplication') print ('Exiting Unittests: Quitting QApplication')
TestQueryClass.app.window.actionQuit.trigger() TestQueryClass.app.window.actionQuit.trigger()
def test_add_clip(self): def test_add_clip(self):
......
...@@ -75,7 +75,7 @@ class About(QDialog): ...@@ -75,7 +75,7 @@ class About(QDialog):
track_metric_screen("about-screen") track_metric_screen("about-screen")
def load_credit(self): def load_credit(self):
""" Load Credits for everybody who has contribuated in several domain for Openshot """ """ Load Credits for everybody who has contributed in several domain for Openshot """
log.info('Credit screen has been opened') log.info('Credit screen has been opened')
windo = Credits() windo = Credits()
windo.exec_() windo.exec_()
......
...@@ -84,7 +84,7 @@ class Export(QDialog): ...@@ -84,7 +84,7 @@ class Export(QDialog):
# Pause playback (to prevent crash since we are fixing to change the timeline's max size) # Pause playback (to prevent crash since we are fixing to change the timeline's max size)
get_app().window.actionPlay_trigger(None, force="pause") get_app().window.actionPlay_trigger(None, force="pause")
# Clear timeline preview cache (to get more avaiable memory) # Clear timeline preview cache (to get more available memory)
get_app().window.timeline_sync.timeline.ClearAllCache() get_app().window.timeline_sync.timeline.ClearAllCache()
# Hide audio channels # Hide audio channels
...@@ -176,7 +176,7 @@ class Export(QDialog): ...@@ -176,7 +176,7 @@ class Export(QDialog):
self.cboChannelLayout.currentIndexChanged.connect(self.updateChannels) self.cboChannelLayout.currentIndexChanged.connect(self.updateChannels)
get_app().window.ExportFrame.connect(self.updateProgressBar) get_app().window.ExportFrame.connect(self.updateProgressBar)
# ********* Advaned Profile List ********** # ********* Advanced Profile List **********
# Loop through profiles # Loop through profiles
self.profile_names = [] self.profile_names = []
self.profile_paths = {} self.profile_paths = {}
......
...@@ -206,7 +206,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface): ...@@ -206,7 +206,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
# Get top line of stack trace (for metrics) # Get top line of stack trace (for metrics)
last_log_line = last_stack_trace.split("\n")[0].strip() last_log_line = last_stack_trace.split("\n")[0].strip()
# Send stacktrace for debugging (if send metrics is enalbed) # Send stacktrace for debugging (if send metrics is enabled)
track_exception_stacktrace(last_stack_trace, "libopenshot") track_exception_stacktrace(last_stack_trace, "libopenshot")
# Clear / normalize log line (so we can roll them up in the analytics) # Clear / normalize log line (so we can roll them up in the analytics)
...@@ -2256,4 +2256,4 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface): ...@@ -2256,4 +2256,4 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
QTimer.singleShot(100, self.refreshFrameSignal.emit) QTimer.singleShot(100, self.refreshFrameSignal.emit)
# Main window is initialized # Main window is initialized
self.initialized = True self.initialized = True
\ No newline at end of file
""" """
@file @file
@brief This file contains the blender model, used by the 3d anmiated titles screen @brief This file contains the blender model, used by the 3d animated titles screen
@author Jonathan Thomas <jonathan@openshot.org> @author Jonathan Thomas <jonathan@openshot.org>
@section LICENSE @section LICENSE
......
...@@ -518,7 +518,7 @@ class TitleEditor(QDialog): ...@@ -518,7 +518,7 @@ class TitleEditor(QDialog):
else: else:
ar[opacity] = "opacity:" + str(alpha) ar[opacity] = "opacity:" + str(alpha)
# rejoin the modifed parts # rejoin the modified parts
t = ";" t = ";"
self.bg_style_string = t.join(ar) self.bg_style_string = t.join(ar)
# set the node in the xml doc # set the node in the xml doc
......
...@@ -197,7 +197,7 @@ class VideoWidget(QWidget): ...@@ -197,7 +197,7 @@ class VideoWidget(QWidget):
# Apply transform # Apply transform
painter.setTransform(self.transform) painter.setTransform(self.transform)
# Draw transform corners and cernter origin circle # Draw transform corners and center origin circle
# Corner size # Corner size
cs = 6.0 cs = 6.0
os = 12.0 os = 12.0
...@@ -581,7 +581,7 @@ class VideoWidget(QWidget): ...@@ -581,7 +581,7 @@ class VideoWidget(QWidget):
# Mutex lock # Mutex lock
self.mutex = QMutex() self.mutex = QMutex()
# Init Qt style properties (black background, ect...) # Init Qt style properties (black background, etc...)
p = QPalette() p = QPalette()
p.setColor(QPalette.Window, QColor("#191919")) p.setColor(QPalette.Window, QColor("#191919"))
super().setPalette(p) super().setPalette(p)
...@@ -607,4 +607,4 @@ class VideoWidget(QWidget): ...@@ -607,4 +607,4 @@ class VideoWidget(QWidget):
# Connect to signals # Connect to signals
self.win.TransformSignal.connect(self.transformTriggered) self.win.TransformSignal.connect(self.transformTriggered)
self.win.refreshFrameSignal.connect(self.refreshTriggered) self.win.refreshFrameSignal.connect(self.refreshTriggered)
\ No newline at end of file
...@@ -450,7 +450,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface): ...@@ -450,7 +450,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface):
clipboard_clip_ids = [k for k, v in self.copy_clipboard.items() if v.get('id')] clipboard_clip_ids = [k for k, v in self.copy_clipboard.items() if v.get('id')]
clipboard_tran_ids = [k for k, v in self.copy_transition_clipboard.items() if v.get('id')] clipboard_tran_ids = [k for k, v in self.copy_transition_clipboard.items() if v.get('id')]
# Paste Menu (if entire cilps or transitions are copied) # Paste Menu (if entire clips or transitions are copied)
if self.copy_clipboard or self.copy_transition_clipboard: if self.copy_clipboard or self.copy_transition_clipboard:
if len(clipboard_clip_ids) + len(clipboard_tran_ids) > 0: if len(clipboard_clip_ids) + len(clipboard_tran_ids) > 0:
menu = QMenu(self) menu = QMenu(self)
...@@ -808,7 +808,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface): ...@@ -808,7 +808,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface):
Transform_Action.triggered.connect(partial(self.Transform_Triggered, MENU_TRANSFORM, clip_ids)) Transform_Action.triggered.connect(partial(self.Transform_Triggered, MENU_TRANSFORM, clip_ids))
menu.addAction(Transform_Action) menu.addAction(Transform_Action)
# Add clip display menu (waveform or thunbnail) # Add clip display menu (waveform or thumbnail)
menu.addSeparator() menu.addSeparator()
Waveform_Menu = QMenu(_("Display"), self) Waveform_Menu = QMenu(_("Display"), self)
ShowWaveform = Waveform_Menu.addAction(_("Show Waveform")) ShowWaveform = Waveform_Menu.addAction(_("Show Waveform"))
...@@ -2124,7 +2124,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface): ...@@ -2124,7 +2124,7 @@ class TimelineWebView(QWebView, updates.UpdateInterface):
clipboard_tran_ids = [k for k, v in self.copy_transition_clipboard.items() if v.get('id')] clipboard_tran_ids = [k for k, v in self.copy_transition_clipboard.items() if v.get('id')]
# Determine if the paste menu should be shown # Determine if the paste menu should be shown
if self.copy_transition_clipboard and len(clipboard_clip_ids) + len(clipboard_tran_ids) == 0: if self.copy_transition_clipboard and len(clipboard_clip_ids) + len(clipboard_tran_ids) == 0:
# Paste Menu (Only show when partial transition clipboard avaialble) # Paste Menu (Only show when partial transition clipboard available)
Paste_Tran = menu.addAction(_("Paste")) Paste_Tran = menu.addAction(_("Paste"))
Paste_Tran.triggered.connect(partial(self.Paste_Triggered, MENU_PASTE, 0.0, 0, [], tran_ids)) Paste_Tran.triggered.connect(partial(self.Paste_Triggered, MENU_PASTE, 0.0, 0, [], tran_ids))
...@@ -2699,4 +2699,4 @@ class TimelineWebView(QWebView, updates.UpdateInterface): ...@@ -2699,4 +2699,4 @@ class TimelineWebView(QWebView, updates.UpdateInterface):
self.cache_renderer.timeout.connect(self.render_cache_json) self.cache_renderer.timeout.connect(self.render_cache_json)
# Delay the start of cache rendering # Delay the start of cache rendering
QTimer.singleShot(1500, self.cache_renderer.start) QTimer.singleShot(1500, self.cache_renderer.start)
\ No newline at end of file
...@@ -250,7 +250,7 @@ class TutorialManager(object): ...@@ -250,7 +250,7 @@ class TutorialManager(object):
# Hide matching tutorial # Hide matching tutorial
self.hide_tips(tid) self.hide_tips(tid)
# Process the next tipe # Process the next type
self.process() self.process()
def hide_tips(self, tid, user_clicked=False): def hide_tips(self, tid, user_clicked=False):
...@@ -336,7 +336,7 @@ class TutorialManager(object): ...@@ -336,7 +336,7 @@ class TutorialManager(object):
{"id":"3", "x":150, "y":100, "object_id":"dockVideoContents", "text":_("<b>Video Preview:</b> Watch your timeline video preview here. Use the buttons (play, rewind, fast-forward) to control the video playback."), "arrow":True}, {"id":"3", "x":150, "y":100, "object_id":"dockVideoContents", "text":_("<b>Video Preview:</b> Watch your timeline video preview here. Use the buttons (play, rewind, fast-forward) to control the video playback."), "arrow":True},
{"id":"4", "x":20, "y":-35, "object_id":"propertyTableView", "text":_("<b>Properties:</b> View and change advanced properties of clips and effects here. Right-clicking on clips is usually faster than manually changing properties."), "arrow":True}, {"id":"4", "x":20, "y":-35, "object_id":"propertyTableView", "text":_("<b>Properties:</b> View and change advanced properties of clips and effects here. Right-clicking on clips is usually faster than manually changing properties."), "arrow":True},
{"id":"5", "x":20, "y":10, "object_id":"transitionsTreeView", "text":_("<b>Transitions:</b> Create a gradual fade from one clip to another. Drag and drop a transition onto the timeline and position it on top of a clip (usually at the beginning or ending)."), "arrow":True}, {"id":"5", "x":20, "y":10, "object_id":"transitionsTreeView", "text":_("<b>Transitions:</b> Create a gradual fade from one clip to another. Drag and drop a transition onto the timeline and position it on top of a clip (usually at the beginning or ending)."), "arrow":True},
{"id":"6", "x":20, "y":20, "object_id":"effectsTreeView", "text":_("<b>Effects:</b> Adjust brigthness, contrast, saturation, and add exciting special effects. Drag and drop an effect onto the timeline and position it on top of a clip (or track)"), "arrow":True}, {"id":"6", "x":20, "y":20, "object_id":"effectsTreeView", "text":_("<b>Effects:</b> Adjust brightness, contrast, saturation, and add exciting special effects. Drag and drop an effect onto the timeline and position it on top of a clip (or track)"), "arrow":True},
{"id":"7", "x":-265, "y":-22, "object_id":"export_button", "text":_("<b>Export Video:</b> When you are ready to create your finished video, click this button to export your timeline as a single video file."), "arrow":True} {"id":"7", "x":-265, "y":-22, "object_id":"export_button", "text":_("<b>Export Video:</b> When you are ready to create your finished video, click this button to export your timeline as a single video file."), "arrow":True}
] ]
...@@ -349,4 +349,4 @@ class TutorialManager(object): ...@@ -349,4 +349,4 @@ class TutorialManager(object):
# Process tutorials (1 by 1) # Process tutorials (1 by 1)
if self.tutorial_enabled: if self.tutorial_enabled:
self.process() self.process()
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册