提交 c33c4eb5 编写于 作者: J Jonathan Thomas

Updated copyright to 2016, Improved Credits dialog with websites for...

Updated copyright to 2016, Improved Credits dialog with websites for developers and translator credits (based on which language is loaded). Fixed a bug on the JS timeline, where certain properties were not being applied (like FPS changes). Replaced Ubuntu-L font with Ubuntu-R font. Updated README and AUTHORS.
上级 846b659f
......@@ -12,6 +12,13 @@ Olivier Girard <olivier@openshot.org>
Documentation:
Jonathan Thomas <jonathan@openshot.org>
Olivier Girard <olivier@openshot.org>
Translation:
See src/locale/ folders for details on translation credits. Each
translation contains a "translator-credits" key containing the
details of each translator that contributed to that language.
Packaging:
......@@ -23,6 +30,13 @@ Foster McLane <fmkclane@gmail.com>
Artists:
Jonathan Thomas <jonathan@openshot.org>
The many great artists who contributed Creative Commons & open-source
licensed images for our transitions and icons.
Fonts:
Canonical / Ubuntu (Ubuntu-R.ttf font)
Website:
......@@ -30,5 +44,12 @@ Website:
Jonathan Thomas <jonathan@openshot.org>
For the full list of authors, please visit:
Supporters
A big thanks to all the financial backers and supporters from PayPay
and Kickstarter! Details can be found in src/settings/supporters.json
For the full list of developers and technical contributors, please visit:
http://openshot.org/developers
https://launchpad.net/~openshot.developers
\ No newline at end of file
......@@ -2,7 +2,7 @@
COPYRIGHT
#################
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......@@ -70,8 +70,8 @@ dependencies in order to run OpenShot successfully:
To run OpenShot from the command line, use the following syntax:
(be sure the change the path to match the install location of OpenShot)
$ cd /home/USER/openshot/src
$ ./openshot or $ python openshot.py
$ cd /home/USER/openshot_qt
$ python3 src/launch.py
#################
......@@ -80,7 +80,7 @@ $ ./openshot or $ python openshot.py
If you would like to install OpenShot, use this command:
$ sudo python setup.py install
$ sudo python3 setup.py install
Installing OpenShot using this command does a few extra things that
the build wizard doesn't do. It adds MIME Types, adds an icon to your
......@@ -111,8 +111,7 @@ Here is a tutorial of the current development features:
2) Use the magnet icon to have your clips magically stick to their closest neighbor clips.
HOW DO I TRIM / UN-TRIM CLIPS
1) Use the toolbar above the timeline (i.e. in the middle of the screen) and select the TRIM button
2) Then, move your mouse over the edges of any clips. Click and drag the edge of the clip to it's new location.
1) Click and drag the edge of the clip to it's new location.
THE AUDIO / VIDEO IS OUT OF SYNC. WHAT CAN I DO?
1) This is usually related to a bug in libopenshot or FFmpeg. To resolve this, re-encode the video using the
......
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......@@ -84,7 +84,7 @@ class OpenShotApp(QApplication):
self.setStyle(QStyleFactory.create("Fusion"))
# Load embedded font
font_id = QFontDatabase.addApplicationFont(os.path.join(info.IMAGES_PATH, "fonts", "Ubuntu-L.ttf"))
font_id = QFontDatabase.addApplicationFont(os.path.join(info.IMAGES_PATH, "fonts", "Ubuntu-R.ttf"))
font_family = QFontDatabase.applicationFontFamilies(font_id)[0]
font = QFont(font_family)
......
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......@@ -34,7 +34,7 @@ PRODUCT_NAME = "OpenShot Video Editor"
GPL_VERSION = "3"
DESCRIPTION = "Create and edit videos and movies"
COMPANY_NAME = "OpenShot Studios, LLC"
COPYRIGHT = "Copyright (c) 2008-2014 %s" % COMPANY_NAME
COPYRIGHT = "Copyright (c) 2008-2016 %s" % COMPANY_NAME
SUPPORTED_LANGUAGES = ["English", "Dutch", "French", "German", "Italian", "Portuguese", "Spanish", "Swedish"]
CWD = os.getcwd()
PATH = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) # Primary openshot folder
......@@ -57,11 +57,11 @@ for folder in [USER_PATH, THUMBNAIL_PATH, CACHE_PATH, BLENDER_PATH, TITLE_PATH,
os.makedirs(folder)
# names of all contributers, using "u" for unicode encoding
AF = {"name": u"Andy Finch", "email": "andy@openshot.org"}
AF = {"name": u"Andy Finch", "email": "andy@openshot.org", "website":"http://openshot.org/developers/andy"}
NF = {"name": u"Noah Figg", "email": "eggmunkee@hotmail.com"}
JT = {"name": u"Jonathan Thomas", "email": "jonathan@openshot.org"}
OG = {"name": u"Olivier Girard", "email": "olivier@openshot.org"}
CP = {"name": u"Cody Parker", "email": "cody@yourcodepro.com"}
JT = {"name": u"Jonathan Thomas", "email": "jonathan@openshot.org", "website":"http://openshot.org/developers/jonathan"}
OG = {"name": u"Olivier Girard", "email": "olivier@openshot.org", "website":"http://openshot.org/developers/olivier"}
CP = {"name": u"Cody Parker", "email": "cody@yourcodepro.com", "website":"http://openshot.org/developers/cody_parker"}
# credits
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -6,7 +6,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -6,7 +6,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -7,7 +7,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
......@@ -20,7 +20,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
此差异已折叠。
此差异已折叠。
......@@ -5,7 +5,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
此差异已折叠。
......@@ -6,7 +6,7 @@
@section LICENSE
Copyright (c) 2008-2014 OpenShot Studios, LLC
Copyright (c) 2008-2016 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册