From 0cb5ef8b91b9564dc8874b70f428fa3ea4dec3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 5 Sep 2016 03:10:51 -0300 Subject: openshot-2.1.0-2.parabola1.nonprism1: updating version --- nonprism/openshot/PKGBUILD | 27 +- nonprism/openshot/nonprism.patch | 1282 +------------------------------------- 2 files changed, 42 insertions(+), 1267 deletions(-) (limited to 'nonprism') diff --git a/nonprism/openshot/PKGBUILD b/nonprism/openshot/PKGBUILD index 99639b7e8..d2ea9538e 100644 --- a/nonprism/openshot/PKGBUILD +++ b/nonprism/openshot/PKGBUILD @@ -1,32 +1,35 @@ -# $Id: PKGBUILD 172304 2016-04-27 23:10:36Z spupykin $ +# $Id: PKGBUILD 188040 2016-08-30 08:57:04Z bluewind $ # Maintainer (Arch): Sergej Pupykin +# Maintainer (Arch): Florian Pritz # Contributor (Arch): Asa Marco # Maintainer: André Silva pkgname=openshot -pkgver=1.4.3 -pkgrel=6.parabola1.nonprism1 +pkgver=2.1.0 +pkgrel=2.parabola1.nonprism1 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support" arch=('any') url="http://www.openshotvideo.com/" license=('GPL') depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer' - 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow' 'dvgrab' - 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image') + 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab' + 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image' + 'libopenshot' 'python-pyzmq') optdepends=('frei0r-plugins: effects' 'libquicktime' 'libavc1394' 'jack' 'jack-rack') +makedepends=('python-setuptools') replaces=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") conflicts=("${pkgname}-libre" "${pkgname}-parabola" "${pkgname}-libre-nonprism" "${pkgname}-nonprism") -source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - nonprism.patch) -md5sums=('5ec82a7e8b7700ee4a359458aedf19e9' - '0b8ade6f6332d1ef9c6c153647953df7') +source=("https://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/openshot-qt-$pkgver.tar.gz" + 'nonprism.patch') +md5sums=('b4641ecebc02b1ad1047e3bfb3213774' + 'abbd28224a3044f3952e533de74e531a') prepare() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir" patch -Np1 -i $srcdir/nonprism.patch } package() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py install --root=$pkgdir/ --optimize=1 + cd "$srcdir" + python setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/nonprism/openshot/nonprism.patch b/nonprism/openshot/nonprism.patch index 0028f7013..232ba6ccc 100644 --- a/nonprism/openshot/nonprism.patch +++ b/nonprism/openshot/nonprism.patch @@ -1,1257 +1,29 @@ -diff -Nur openshot-1.4.3.orig/docs/gnome/C/openshot.xml openshot-1.4.3/docs/gnome/C/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/C/openshot.xml 2012-10-01 04:53:22.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/C/openshot.xml 2014-04-20 02:08:55.200417436 -0300 -@@ -131,7 +131,7 @@ - - - Step 5 – Export your Video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -927,7 +927,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3985,7 +3985,7 @@ - - - Upload to Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3995,7 +3995,7 @@ - - - Upload Video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4019,17 +4019,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/cs/openshot.xml openshot-1.4.3/docs/gnome/cs/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/cs/openshot.xml 2012-10-01 04:53:25.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/cs/openshot.xml 2014-04-20 02:09:38.920744917 -0300 -@@ -128,7 +128,7 @@ - - - Krok 5 - Export videa -- Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou YouTube, Vimeo atd.). -+ Když jste spokojení s videem prezentace, je dalším krokem export videa. To převede váš projekt do jednoho video souboru, který by měl fungovat v kterémkoliv linuxovém přehrávači (jako jsou Totem, VLC atd.) nebo na webových stránkách (jako jsou Vimeo atd.). - Klikněte na ikonu Exportovat video nahoře (nebo použijte nabídku (Soubor > Exportovat video...). Vyberte jeden z mnoha přednastavených voleb exportu a klikněte na tlačítko Exportovat video. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3969,7 +3969,7 @@ - - - Nahrát na web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3979,7 +3979,7 @@ - - - Nahrát video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4003,17 +4003,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/da/openshot.xml openshot-1.4.3/docs/gnome/da/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/da/openshot.xml 2012-10-01 04:53:27.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/da/openshot.xml 2014-04-20 02:12:07.785194708 -0300 -@@ -130,7 +130,7 @@ - - - Trin 5 - Eksporter din video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -926,7 +926,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3984,7 +3984,7 @@ - - - Upload til Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3994,7 +3994,7 @@ - - - Upload video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4018,17 +4018,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/de/openshot.xml openshot-1.4.3/docs/gnome/de/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/de/openshot.xml 2012-10-01 04:53:29.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/de/openshot.xml 2014-04-20 02:12:22.628639484 -0300 -@@ -138,7 +138,7 @@ - - Schritt 5 - Den fertigen Film exportieren - Wenn Sie mit der Diashow zufrieden sind, wollen wir den Film exportieren. -- Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Youtube, Vimeo u.a.) richtig gelesen werden kann. -+ Dieser Vorgang erzeugt aus Ihrem OpenShot-Projekt eine einzelne Video-Datei, die von den meisten Abspielprogrammen (wie Totem, VLC usw.) und Websites (z.B. Vimeo u.a.) richtig gelesen werden kann. - Wählen Sie das Video exportierenSymbol am oberen Bildschirmrand (oder klicken Sie auf Datei > Video exportieren...). -  Wählen Sie eine der Export-Voreinstellungen und klicken Sie auf Video exportieren. - -@@ -938,7 +938,7 @@ - STRG + U - - -- Aktuelles Projekt als Videodatei zu YouTube oder Vimeo hochladen -+ Aktuelles Projekt als Videodatei zu Vimeo hochladen - - - -@@ -3978,7 +3978,7 @@ - - - Ins Web hochladen -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - Die erweiterten Optionen sollten nur von Leuten die FFmpeg vertraut sind benutzt werden, da es sehr einfach ist ungültige Kombinationen der Einstellung von Codec, Format und Bitrate vorzunehmen. Sind sie jedoch mit diesen Einstellungen vertraut können alle unterstützten Formate/Codec/Bitraten verwendet werden, was duzende zusätzlicher Formate eröffnet die während des Exportvorgangs benutzt werden können. Sie können Ihr Video auch als Bildsequenz exportieren, was hilfreich sein kann wenn Sie vorhaben dieses Video in ein Programm zu importieren das Bildsequenzen benötigt, wie z.B. Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3988,7 +3988,7 @@ - - - Video hochladen -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4012,17 +4012,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/el/openshot.xml openshot-1.4.3/docs/gnome/el/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/el/openshot.xml 2012-10-01 04:53:31.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/el/openshot.xml 2014-04-20 02:12:42.675456689 -0300 -@@ -128,7 +128,7 @@ - - - Βήμα 5 - Εξαγωγή βίντεο -- Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το YouTube, Vimeo, κ.λπ. ..). -+ Μόλις είστε ευχαριστημένοι με την εργασία σας, το επόμενο βήμα είναι να εξάγετε το βίντεο σας.   Το OpenShot θα μετατρέψει το έργο σας σε ένα ενιαίο αρχείο βίντεο, το οποίο πρέπει να λειτουργεί σε κάθε αναπαραγωγέα (όπως το Totem, VLC, κ.λπ. ..) ή δικτυακούς τόπους (όπως το Vimeo, κ.λπ. ..). - Κάντε κλικ στο εικονίδιο Εξαγωγή βίντεο guibutton> guimenuitem>> guimenuitem> guibutton>. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο YouTube ή στο Vimeo -+ Αποστολή του τρέχοντος έργου σαν αρχείο βίντεο στο Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Αποστολή στον Ιστό -- Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε μεταξύ YouTube και Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία -+ Επιλέξτε Αποστολή στον Ιστό από την κορυφή αυτής της οθόνης για να επιλέξετε Vimeo.  Είναι δύο πολύ συνηθισμένες ιστοσελίδες διαμοιρασμού βίντεο.  Θα επιλεγούν αυτόματα οι ρυθμίσεις εξαγωγής βίντεο που είναι συμβατές με την ιστοσελίδα, και θα εμφανιστεί η οθόνη Αποστολή Βίντεο μόλις το βίντεο ετοιμαστεί.Προχωρημένη Λειτουργία - Οι προηγμένες επιλογές θα πρέπει να χρησιμοποιούνται μόνο από κάποιον που γνωρίζει το FFmpeg, δεδομένου ότι είναι τόσο εύκολο να δημιουργηθούν άκυροι συνδυασμοί κωδικοποιητών, μορφών και ρυθμίσεων ταχύτητας.   Ωστόσο, εάν είστε εξοικειωμένοι με αυτές τις ρυθμίσεις, οποιαδήποτε υποστηριζόμενη μορφή FFmpeg μπορεί να χρησιμοποιηθεί, η οποία ανοίγει δεκάδες πρόσθετες μορφές που μπορεί να χρησιμοποιηθoύν κατά τη διαδικασία εξαγωγής.   Μπορείτε επίσης να εξαγάγετε το βίντεό σας ως μία ακολουθία εικόνας, το οποίο μπορεί να είναι χρήσιμο αν σκοπεύετε να εισαγάγετε αυτό το βίντεο σε ένα πρόγραμμα που απαιτεί ακολουθίες εικόνων, όπως το Blender. - Επίσης, αν έχετε πρώτα επιλέξει τιμές για την Απλή Λειτουργία guibutton>, guibutton>, - -@@ -3938,7 +3938,7 @@ - - - Αποστολή βίντεο -- Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο YouTube ή στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. -+ Εάν θέλετε να στείλετε ένα βίντεο απευθείας στο Vimeo, επιλέξτε Αρχείο > Αποστολή Βίντεο.  Επίσης, στην οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που πρώτα θα εξάγει το έργο σας στην σωστή μορφή, και μετά θα εμφανίσει την οθόνη αποστολής. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Αρχείο βίντεο -- -- -- Επιλέξτε ένα αρχείο για αποστολή στο YouTube.  Σιγουρευτείτε πρώτα πως είναι συμβατή μορφή με το YouTube, διαφορετικά (ίσως) δεν θα λειτουργήσει σωστά.  Εάν χρησιμοποιήσετε πρώτα την οθόνη Εξαγωγή Βίντεο, μπορείτε να επιλέξετε Αποστολή στον Ιστό, που θα επιλέξει αυτόματα μία συμβατή μορφή, και θα συμπληρώσει τα "κουτάκια" για εσάς. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml openshot-1.4.3/docs/gnome/en_GB/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/en_GB/openshot.xml 2012-10-01 04:53:33.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/en_GB/openshot.xml 2014-04-20 02:09:15.273901103 -0300 -@@ -128,7 +128,7 @@ - - - Step 5 – Export your Video -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Upload to Web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3938,7 +3938,7 @@ - - - Upload Video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/es/openshot.xml openshot-1.4.3/docs/gnome/es/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/es/openshot.xml 2012-10-01 04:53:36.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/es/openshot.xml 2014-04-20 02:07:46.399902484 -0300 -@@ -129,7 +129,7 @@ - - - Paso 5 - Exporte su vídeo -- Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como YouTube, Vimeo, etc...). -+ Cuando esté satisfecho con el resultado de su pase de diapositivas, el siguiente paso será exportar su vídeo. Esto convertirá su proyecto de OpenShot en un archivo de vídeo que podría reproducirse en cualquier reproductor multimedia de Linux (como Totem, VLC, etc...) o sitios web (como Vimeo, etc...). - Presione sobre el icono Exportar Vídeo en la parte superior de la pantalla (o utilice el menú Archivo > Exportar vídeo...). Elija una de las muchas opciones de exportación preconfiguradas, y haga clic en el botón Exportar Vídeo. - - -@@ -924,7 +924,7 @@ - Control+U - - -- Subir el proyecto actual como archivo de vídeo a Youtube o Vimeo -+ Subir el proyecto actual como archivo de vídeo a Vimeo - - - -@@ -3929,7 +3929,7 @@ - - - Subir a la web -- Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger entre Youtube y Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado -+ Elige la opción de Subir a Web en la parte superior de esta pantalla para escoger Vimeo.  Estos son dos sitios muy comunes para compartir vídeos.  Esto definirá automáticamente la configuración de exportación para que sea compatible con la web seleccionada y lanzará la pantalla de Subir Vídeo una vez el vídeo haya sido creado.Modo avanzado - Las opciones avanzadas sólo deberían ser utilizados por alguien familiarizado con FFmpeg, ya que es muy fácil crear combinaciones no válidas de codecs, formatos y tasas de bits.   Sin embargo, si usted está familiarizado con estos ajustes, puede utilizar cualquier formato/codec/tasa de bits soportado por FFmpeg, lo cual abre docenas y docenas de formatos adicionales que pueden ser utilizados durante el proceso de exportación.   También puede exportar el vídeo como una secuencia de imágenes, que puede ser útil si tiene previsto importar este vídeo en un programa que requiere secuencias de imágenes, como Blender. - Además, si primero selecciona valores en el Modo simple y luego cambia al Modo avanzado los ajustes del modo simple serán recordados y aparecerán preseleccionados. - -@@ -3939,7 +3939,7 @@ - - - Subir vídeo -- Si quieres subir un vídeo directamente a Youtube o Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. -+ Si quieres subir un vídeo directamente a Vimeo, elige Archivo > Subir Vídeo.  Además, en la pantalla Exportar Vídeo, puedes escoger Subir a Web, que primero exportará tu proyecto en el formato correcto y luego mostrará la pantalla para subir el archivo. - - - -@@ -3963,17 +3963,6 @@ - - - -- -- 1 -- -- -- Archivo de vídeo -- -- -- Escoge un archivo de vídeo para subir a Youtube.  Asegúrate primero, de que tiene un formato compatible con Youtube, o puede que no funcione correctamente.  Si usas primero la pantalla de Exportar Vídeo, puedes utilizar Subir a Web, que autom -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/fr/openshot.xml openshot-1.4.3/docs/gnome/fr/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/fr/openshot.xml 2012-10-01 04:53:37.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/fr/openshot.xml 2014-04-20 02:08:24.680188941 -0300 -@@ -128,7 +128,7 @@ - - - Etape 5 – Exporter votre Vidéo -- Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que YouTube, Vimeo, etc...). -+ Une fois que vous êtes content du réslutat final de votre diaporama photovidéo, l'étape suivante est l'exportation de votre vidéo. Celle-ci transformera votre projet OpenShot en un simple fichier vidéo, lequel fonctionnera sur n'importe quel lecteur vidéo sur Linux (tel que Totem, VLC, etc...) ou de sites en lignes (tel que Vimeo, etc...). - Cliquez sur l'icône Exporter la Vidéoen haut de l'écran (ou utilisez le menu guimenuitem>Fichier - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Envoyer le projet actuel en tant que fichier vidéo sur YouTube ou Viméo -+ Envoyer le projet actuel en tant que fichier vidéo sur Viméo - - - -@@ -3930,7 +3930,7 @@ - - - Télécharger sur le Web -- Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir entre YouTube et Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé -+ Choisissez l'option Envoyer sur leWeb en haut de cette fenêtre pour choisir Viméo.  Ce sont les deux sites de partages en ligne les plus utilisés.  Ceci affichera automatiquement les paramètres d'exportations qui sont compatibles avec le site web sélectionné, et lancera l'écran Envoyer une vidéo une fois que le fichier vidéo aura été créer.Le mode avancé - Les options avancées seront seulement utilisées par les personnes familières avec FFmpeg, depuis qu'il est si facile de créer de combinaisons valides de codec, de format, et de réglage des bitrates.  Toutefois, si vous êtes familiers avec ces réglages, n'importe quel format/codec/bitrate supporté par FFmpeg peut-être utilisé, ce qui ouvre des dizaines et des dizaines de combinaisons qui peuvent être utiliser lors du processus d'exportation. - Aussi, si vous sélectionnez les premières valeurs pour le Mode Simple, puis basculez en Mode Avancé, cela présélectionnera tous les paramètre du mode simple. - -@@ -3940,7 +3940,7 @@ - - - Télécharger une vidéo -- Si vous désirez envoyer directement une vidéo sur YouTube ou Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran -+ Si vous désirez envoyer directement une vidéo sur Viméo, choisissez Fichier > Envoyer une Vidéo.  Aussi, sur l'écran - - - -@@ -3964,17 +3964,6 @@ - - - -- -- 1 -- -- -- Fichier vidéo -- -- -- Choisissez un fichier vidéo à envoyer sur YouTube.  Assurez vous qu'il est d'abord dans un format compatible avec YouTube, ou il ne fonctionnera peut-être pas correctement.  If vous utilisez en premier le menu Exporter la Vidéo, vous pouvez choisir Envoyer sur le Web -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/he/openshot.xml openshot-1.4.3/docs/gnome/he/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/he/openshot.xml 2012-10-01 04:53:40.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/he/openshot.xml 2014-04-20 02:15:15.533272469 -0300 -@@ -128,7 +128,7 @@ - - - שלב 5 - יצוא הוידיאו -- ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת youtube, vimeo וכו'). -+ ברגע שהתוצאה משביעת רצון, הצעד הבא הוא יצוא הוידיאו. זה ימיר את פרויטק האופןשוט לקובץ וידיאו יחיד, שיעבוד בכל נגן מדיה בלינוקס (כדוגמת טוטם, vlc וכו') או אתר (כדוגמת vimeo וכו'). - לחיצה על הסמל Export Video בחלקו העליון של החלון (או שמוש בתפריט File > Export Video...). בחירה באחת האפשרויות המוגדרות מראש, ולחיצה על לחצן Export Video . - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- העלאת הפרויקט הנוכחי כוידיאו לyoutube או לvimeo -+ העלאת הפרויקט הנוכחי כוידיאו ל או לvimeo - - - -@@ -3928,7 +3928,7 @@ - - - העלאה לאינטרנט -- בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור youtube או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם -+ בחירה באפשרות Upload to Web (העלאה לרשת) שבראש המסך תפתח אפשרות לבחור או vimeo. אלו שני אתרי שיתוף הוידיאו השכיחים ביותר. בחירה זו תגדיר אוטומטית את הגדרות היצוא שתואמות לאתר הנבחר, ותפעיל את מסך Upload Video לאחר מכן.מצב מתקדם - מפני שקל מדי ליצור צרופים מטופשים של קידודים, פורמטים וקצבים, האפשרויות המתקדמות מיועדות לשמוש רק בידי משתמשים שמכירים את FFmpeg. למשתמשים המנוסים בהגדרות אלו, כל מה שנתמך עם FFmpeg מותר בשמוש, כך שתריסרים על תריסרים של הגדרות עומדות בפניו. ניתן ליצא וידיאו כרצף תמונות, ולהשתמש בהן לעריכה נוספת או ליבא אותן לתכנות עריכה שונות כדוגמת בלנדר. - יתר על כן, בבחירת הגדרה במצב פשוט ואז מעבר למצב מתקדם, תתבצע הגדרה של כל המאפיינים שקיימים במצב הפשוט לתוך המצב המתקדם. - -@@ -3938,7 +3938,7 @@ - - - העלאת וידאו -- להעלאת וידיאו ישירות לVimeo או Youtube, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. -+ להעלאת וידיאו ישירות לVimeo, יש לבחור מהתפריט File > Upload Video. לחליפין, במסך יצוא וידיאו ניתן לבחור Upload to Web (העלה לרשת), כך שהפרויטק ייוצא לקובץ מתאים ואז יישלח. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- קובץ וידאו -- -- -- בחירה בוידיאו למשלוח לyoutube. יש לודא מראש תאימות לפורמט המקובל בyoutube, או שזה לא יעבוד. אם בוצע שמוש במסך יצוא וידיאו, ניתן לבחור באפשרות משלוח לרשת, שתבצע התאמה אוטומטית של הפורמט, ותמלא את תיבת הבחירה עבורך. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/it/openshot.xml openshot-1.4.3/docs/gnome/it/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/it/openshot.xml 2012-10-01 04:53:42.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/it/openshot.xml 2014-04-20 02:15:57.893591295 -0300 -@@ -128,7 +128,7 @@ - - - Passo 5 - Esportare il Video -- Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Youtube, Vimeo, ecc...). -+ Una volta felici del vostro slideshow di foto, il passo successivo è l'esportazione del video.   Questo passaggio convertirà il progetto di Openshot in un singolo file video, che dovrebbe funzionare su ogni Media Player per Linux /cosa Totem, VLC, ecc..) o con Siti Web (come Vimeo, ecc...). - Clicca sull'icona Esporta Video in alto alla schermata (o usa il menu: File >Esporta Video...).  Scegli tra una delle tante opzioni di esportazione predefinite, e clicca sul Bottone Esporta Video. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Carica il progetto corrente come un file video di YouTube o Vimeo -+ Carica il progetto corrente come un file video di Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Carica sul Web -- Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere tra YouTube e Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata -+ Seleziona l'opzione Upload sul Web in cima allo schermo per scegliere Vimeo.   Questi sono due noti siti di condivisione video.  La selezione imposta automaticamente i settaggi di esportazione che sono compatibili con il sito selezionato, e lancia la schermata Upload Video quando il file del video è stato creato.Modalità avanzata - Le opzioni avanzate dovrebbero essere usate solo da chi ha familiarità con FFmpeg, dal momento che è molto facile scegliere combinazioni non valide di codec, formati e bit-rate.  In ogni caso, se si ha familiarità con queste impostazioni, è possibile utilizzare ogni formato, codec o bit-rate supportato da FFmpeg, che include innumerevoli formati addizionali utilizzabili durante il processo di esportazione.  In aggiunta è possibile esportare il video come sequenza di immagini, una scelta utile se si intende importare il video in un'applicazione che richieda dellle sequenze di immagini, come Blender. - In aggiunta, se inizialmente si scelgono dei valori nella modalità Semplice, e in seguito si passa alla modalità Avanzata, verranno importate automaticamente le scelte effettuate nella modalità Semplice. - -@@ -3938,7 +3938,7 @@ - - - Carica il Video -- Per inviare direttamente un video su Youtube o su Vimeo, seleziona guimenu>File -+ Per inviare direttamente un video su Vimeo, seleziona guimenu>File - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- File video -- -- -- Seleziona un file video da inviare a YouTube.  Assicurati che il formato sia compatibile con YouTube prima di inviarlo, o potrebbe non funzionare correttamente.  Se utilizzi la pagina Esporta Video, puoi selezionare Upload sul Web, che automaticamente imposta un formato compatibile e riempie questa casella. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/nb/openshot.xml openshot-1.4.3/docs/gnome/nb/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/nb/openshot.xml 2012-10-01 04:53:44.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/nb/openshot.xml 2014-04-20 02:17:10.954141568 -0300 -@@ -128,7 +128,7 @@ - - - Trinn 5 - Eksporter videoen -- Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som YouTube, Vimeo etc...). -+ Når du er fornøyd med lysbildeshow-videoen er neste trinn å eksportere videoen.  Dette vil gjøre om OpenShot-prosjektet til en enkelt videofil, som burde kunne spilles på en hvilken som helst Linux mediaspiller (som Totem, VLC etc...) eller nettsteder (som Vimeo etc...). - Klikk på Eksporter video-ikonet øverst på skjermen (eller bruk menyen Fil > Eksporter video...).  Velg en av de mange forhåndsdefinerte eksportalternativene og klikk Eksporter video -knappen. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Last opp prosjekt som en videofil på YouTube eller Vimeo -+ Last opp prosjekt som en videofil på Vimeo - - - -@@ -3928,7 +3928,7 @@ - - - Last opp til nettsted -- Velg Last opp til web øverst i dette vinduet for å velge mellom YouTube og Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus -+ Velg Last opp til web øverst i dette vinduet for å velge Vimeo. Dette er to vanlige nettsteder for å dele video. Dette vil automatisk velge eksportinnstillinger som er kompatible med det valgte nettstedet og åpen vinduet Last opp video når videofilen er ferdig rendret.Avansert modus - De avanserte innstillingene bør bare brukes dersom du kjenner FFmpeg, siden det er lett å lage ugyldige kombinasjoner av kodeker, formater og bitrateinnstillinger. Men er du kjent med disse innstillingene kan du bruke en hvilken som helst kombinasjon av format, kodek og bitrate som støttes av FFmpeg. Dette åpner for mengder av andre formater som kan brukes til å eksportere video. Du kan også eksportere som en bildesekvens, noe som kan være nyttig hvis du tenker å importere videoen i et program som krever bildesekvenser, som f eks Blender. - Også, hvis du først velger innstillinger i Enkel og deretter bytter til Avansert vil innstillingene du valgte i Enkel modus være forvalgt. - -@@ -3938,7 +3938,7 @@ - - - Last opp video -- Hvis du vil laste opp en video direkte til YouTube eller Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. -+ Hvis du vil laste opp en video direkte Vimeo, velg Fil > Last opp video. I vinduet Eksporter video kan du velge Last opp til Web, som først eksporterer prosjektet til det riktige videoformatet og deretter åpner opplastingsvinduet. - - - -@@ -3962,17 +3962,6 @@ - - - -- -- 1 -- -- -- Videofil -- -- -- Velg en videofil for opplasting til YouTube. Sjekk at formatet er kompatibelt med YouTube først, ellers virker det kanskje ikke skikkelig. Hvis du først bruker Eksporter video-vinduet kan du bruke Last opp til Web, som automatisk velger et kompatibelt format og fyller ut denne boksen for deg. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/nl/openshot.xml openshot-1.4.3/docs/gnome/nl/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/nl/openshot.xml 2012-10-01 04:53:46.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/nl/openshot.xml 2014-04-20 02:18:00.447847945 -0300 -@@ -129,7 +129,7 @@ - - - Stap 5 - Exporteer uw video -- Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (YouTube, Vimeo, etc.). -+ Zodra u tevreden bent met uw foto diashow, kunt u deze exporteren als video. Dit zal uw OpenShot project omzetten in één enkel videobestand dat u kunt afspelen op een mediaspeler (Totem, VLC, etc.) of op websites kunt plaatsen (Vimeo, etc.). - Klik op het Exporteer video pictogram in de hoofdwerkbalk (of klik in het hoofdmenu op Bestand > Exporteer video...). Kies uit één van de vele voorinstellingen, en klik op de Exporteer video knop. - - -@@ -924,7 +924,7 @@ - Ctrl + u - - -- Een videobestand uploaden naar YouTube of Vimeo -+ Een videobestand uploaden naar Vimeo - - - -@@ -3929,7 +3929,7 @@ - - - Uploaden naar het internet -- Kies de optie Uploaden naar het web bovenaan het scherm om de video op YouTube of Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu -+ Kies de optie Uploaden naar het web bovenaan het scherm om de video op Vimeo te plaatsen. Dit zijn twee veelgebruikte websites om video's met elkaar te delen. Deze optie zal automatisch het juiste profiel kiezen en - zodra het videobestand klaar is - het Video uploaden dialoogvenster openen.Geavanceerd keuzemenu - Het geavanceerde keuzemenu kunt u het beste alleen gebruiken als u bekend bent met FFmpeg, omdat gemakkelijk ongeldige combinaties van videotypes, compressietypes en bitsnelheden gemaakt kunnen worden. Bent u echter bekend met deze instellingen, dan kan elk video/compressietype/bitsnelheid gebruikt worden wat FFmpeg ondersteund, en heeft u de keuze uit tientallen extra formaten. De video kan ook als een afbeeldingsreeks geëxporteerd worden, wat handig kan zijn als u de video wilt importeren in een programma dat afbeeldingsreeksen vereist, zoals Blender. - Opmerking: als u eerst het Eenvoudig keuzescherm heeft gebruikt en vervolgens het Geavanceerde keuzescherm kiest, zijn de waardes vanuit het eenvoudige keuzescherm al ingevuld. - -@@ -3939,7 +3939,7 @@ - - - Video uploaden -- Wilt u een video direct naar YouTube of Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. -+ Wilt u een video direct naar Vimeo sturen, kies dan in het hoofdmenu Bestand > Video uploaden. Of kies in het Video exporteren scherm voor de optie Uploaden naar het web: de video zal dan eerst naar de juiste bestandsindeling geëxporteerd worden en daarna opent zich automatisch het upload venster. - - - -@@ -3970,7 +3970,7 @@ - Videobestand - - -- Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor YouTube of Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor YouTube of Vimeo. -+ Kies het videobestand om te uploaden. Controleer of de videobestandsindeling geschikt is voor Vimeo, om te voorkomen dat de upload mislukt. Als u gebruik maakt van het Video exporteren venster en de optie Uploaden naar het web wordt automatisch de juiste bestandsindeling gekozen voor Vimeo. - - - -diff -Nur openshot-1.4.3.orig/docs/gnome/pl/openshot.xml openshot-1.4.3/docs/gnome/pl/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pl/openshot.xml 2012-10-01 04:53:48.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pl/openshot.xml 2014-04-20 02:18:53.378247130 -0300 -@@ -128,7 +128,7 @@ - - - Krok 5 - Eksport i zapisanie Twojego filmu -- Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na YouTube, Vimeo i innych. -+ Gdy jesteś zadowolony/a z pokazu slajdów, który przygotowałeś/aś, to następnym krokiem jest wyeksportowanie Twojego filmu. Eksport skonwertuje Twój projekt OpenShot do końcowego, pojedynczego pliku wideo, który powinien być poprawnie odtwarzany na każdym linuksowym programie do obsługi wideo (np. Totem, VLC itp.) lub, który możesz użyć w internecie np. na Vimeo i innych. - Kliknij w przycisk Eksport Wideo u góry ekranu (lub użyj menu Plik > Eksport Video...).  Wybierz jedną z wielu dostępnych opcji eksportu i kliknij przycisk Eksport Wideo. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Wysyła bieżący projekt jako plik wideo na YouTube lub Vimeo -+ Wysyła bieżący projekt jako plik wideo na Vimeo - - - -@@ -3969,7 +3969,7 @@ - - - Wyślij do Internetu -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Tryb zaawansowany - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3979,7 +3979,7 @@ - - - Wyślij wideo -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4003,17 +4003,6 @@ - - - -- -- 1 -- -- -- Plik wideo -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/pt/openshot.xml openshot-1.4.3/docs/gnome/pt/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pt/openshot.xml 2012-10-01 04:53:50.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pt/openshot.xml 2014-04-20 02:19:30.651861715 -0300 -@@ -128,7 +128,7 @@ - - - Passo 5 – Exportar o seu Vídeo -- Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as YouTube, Vimeo, etc...). -+ Once you are happy with your photo slide-show video, the next step is to export your video.  This will convert your OpenShot project into a single video file, which should work on any Linux media player (such as Totem, VLC, etc...) or websites (such as Vimeo, etc...). - Click on the Export Video icon at the top of the screen (or use the File > Export Video... menu).  Choose from one of the many preset export options, and click the Export Video button. - - -@@ -924,7 +924,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3981,7 +3981,7 @@ - - - Enviar para a web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Modo avançado - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3991,7 +3991,7 @@ - - - Enviar vídeo -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4015,17 +4015,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml openshot-1.4.3/docs/gnome/pt_BR/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/pt_BR/openshot.xml 2012-10-01 04:53:52.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/pt_BR/openshot.xml 2014-04-20 02:20:05.515458224 -0300 -@@ -128,7 +128,7 @@ - - - 5º Passo - Exportar o seu Vídeo -- Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Youtube, Vimeo, etc...) -+ Quando você estiver satisfeito com sua apresentação de fotos, o próximo passo é exportar o seu vídeo.  Isto converterá o seu projeto OpenShot em um único arquivo de vídeo, que deve funcionar em qualquer tocador de mídia do Linux (tais como o Totem, VCL, etc...) ou sites (tais como Vimeo, etc...) - Clique sobre o ícone Exportar Vídeo na parte superior da tela (ou utilize o menu Arquivo > Exportar vídeo...). Excolha uma das diversas opções de exportação pré-configuradas, e clique no botão Exportar Vídeo. - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Envia o projeto atual como um arquivo de vídeo para o YouTube ou Vimeo -+ Envia o projeto atual como um arquivo de vídeo para o Vimeo - - - -@@ -3936,7 +3936,7 @@ - - - Publicar na Web -- Esolha a opção Upload to Web no topo da tela para escolher entre Youtube e Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado -+ Esolha a opção Upload to Web no topo da tela para escolher Vimeo.  Estes são os dois mais comuns sites de compartilhamento de vídeos.  Isso vai selecionar automaticamente as opções de exportação compatíveis com o site selecionado e iniciará a tela Upload Video uma vez que o arquivo de vídeo for criado.Modo Avançado - As opções avançadas somente devem ser utilizadas por pessoas familiarizadas com o FFmpeg, já que é muito fácil criar combinações inválidas de codecs, formatos e taxas de bits. No entanto, se você conhecer essas configurações, qualquer formato/codec/bit-rate suportado pode ser utilizado, o que fornece dezenas de formatos adicionais que podem ser utilizador para exportar. Você pode também exportar o seu vídeo como uma sequência de imagens, que pode ser útil se você pretende importar seu vídeo em um programa que requer sequências de imagens, como o blender. - E também, se você primeiro selecionar valores no Modo simples, e então trocar para o Modo avançado, ele pré-selecionará todas as configurações do modo simples. - -@@ -3946,7 +3946,7 @@ - - - Enviar Vídeo -- Se você quiser fazer o upload do vídeo diretamente no Youtube ou Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. -+ Se você quiser fazer o upload do vídeo diretamente no Vimeo, escolha File > Upload Video.  Então, na tela de Export Video você pode escolher Upload to Web, o qual vai primeiro exportar seu projeto com o formato correto de vídeo e depois mostrrar a tela de upload. - - - -@@ -3970,17 +3970,6 @@ - - - -- -- 1 -- -- -- Arquivo de vídeo -- -- -- Escolha um arquivo de vídeo para upload para o youtube.  Tenha certeza de que é um formato compatível com o Youtube, ou pode não funcionar corretamente.  Se você primeiro usar a tela Export Video , você pode escolher Upload to Web, o qual escolherá automaticamente um formato compatível e preencherá essa caixa para você. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/sk/openshot.xml openshot-1.4.3/docs/gnome/sk/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/sk/openshot.xml 2012-10-01 04:53:54.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/sk/openshot.xml 2014-04-20 02:20:54.589162174 -0300 -@@ -128,7 +128,7 @@ - - - Step 5 – Exportovanie vášho videa -- Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. YouTube, Vime, atď ..) -+ Akonáhle ste spokojní s vašou prezentáciou, ďalším krokom je export videa.   Tu budete prevádzať OpenShot projekt do jedného video súboru, ktorý by mal fungovať na akomkoľvek médiu Linux prehrávača (napr. Totem, VLC, atď ..) alebo web stránky (napr. Vime, atď ..) - Kliknite na Export videa na ikonu v hornej časti obrazovky (alebo použite Súbor > Export Video ...).   Vyberte si z jednej z mnohých prednastavených možností exportu, a kliknite na tlačidlo Export videa . - - -@@ -924,7 +924,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3982,7 +3982,7 @@ - - - Nahrať na web -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.Advanced Mode - The advanced options should only be used by someone familiar with FFmpeg, since it is so easy to create invalid combinations of codecs, formats, and bit-rate settings.  However, if you are familiar with these settings, any FFmpeg supported format/codec/bit-rate can be used, which opens up dozens and dozens of additional formats that can be used during the export process.  You can also export your video as an image sequence, which can be useful if you intend to import this video into a program that requires image sequences, such as Blender. - Also, if you first select values for the Simple Mode, and then switch to the Advanced Mode, it will preselect all of the Simple Mode settings. - -@@ -3992,7 +3992,7 @@ - - - Nahrať video -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4016,17 +4016,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml openshot-1.4.3/docs/gnome/zh_TW/openshot.xml ---- openshot-1.4.3.orig/docs/gnome/zh_TW/openshot.xml 2012-10-01 04:53:56.000000000 -0300 -+++ openshot-1.4.3/docs/gnome/zh_TW/openshot.xml 2014-04-20 02:21:34.279462075 -0300 -@@ -128,7 +128,7 @@ - - - 步驟 5 - 匯出您的影音 -- 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 YouTube、Vimeo... 等) l的影片檔。 -+ 您覺得照片幻燈秀影片看起來不錯，下一步就是匯出檔案了。 將 OpenShot 專案轉換成單一、可用於大多摩體播放程式 (例如 Totem、VLC、MPlayer... 等) 或網站 (例如 Vimeo... 等) l的影片檔。 - 點畫面最頂端的 匯出視訊 圖示 (或使用「檔案」>「匯出視訊...」選單)，從許多預先設定中選擇一個適合的，點「匯出視訊按鈕」。 - - -@@ -923,7 +923,7 @@ - CTRL + U - - -- Upload current project as a video file to YouTube or Vimeo -+ Upload current project as a video file to Vimeo - - - -@@ -3970,7 +3970,7 @@ - - - 上傳到網路 -- Choose the Upload to Web option at the top of this screen to choose between YouTube and Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 -+ Choose the Upload to Web option at the top of this screen to choose Vimeo.  These are two very common video sharing websites.  This will automatically set the export settings that are compatible with the selected video website, and launch the Upload Video screen once the video file has been created.進階模式 - 進階選項應該只限由熟悉 FFmpeg 的人來使用，因為很容易弄出不正確的編解碼器、格式與位元率設定組合。 然而，如果您熟悉這些設定，則可以利用 FFmpeg 支援的格式/編解碼器/位元率來組合出更多用在匯出程序的格式。 您也可以將視訊匯出為連續影像，在類似 Blender 這類需要連續影像的程式時會很有用。 - 如果您先選取 簡單模式 的數值後再切換到 進階模式，則會預先選取簡單模式的所有設定。 - -@@ -3980,7 +3980,7 @@ - - - 上傳影片 -- If you would like to directly upload a video to YouTube or Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. -+ If you would like to directly upload a video to Vimeo, choose File > Upload Video.  Also, on the Export Video screen, you can choose Upload to Web, which will first export your project to the correct video format, and then display the upload screen. - - - -@@ -4004,17 +4004,6 @@ - - - -- -- 1 -- -- -- Video File -- -- -- Choose a video file to upload to YouTube.  Be sure it's a compatible format with YouTube first, or it might not work correctly.  If you first use the Export Video screen, you can choose Upload to Web, which automatically chooses a compatible format, and fills in this box for you. -- -- -- - - 2 - -diff -Nur openshot-1.4.3.orig/openshot/classes/info.py openshot-1.4.3/openshot/classes/info.py ---- openshot-1.4.3.orig/openshot/classes/info.py 2012-10-01 04:55:03.000000000 -0300 -+++ openshot-1.4.3/openshot/classes/info.py 2014-04-20 01:54:35.430638280 -0300 -@@ -52,7 +52,7 @@ - 'url' : 'http://www.openshotvideo.com/', - 'license' : 'GNU GPL v.' + GPL_VERSION, - 'description' : 'Create and edit videos and movies', -- 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (YouTube and Vimeo supported)", -+ 'long_description' : "Create and edit videos and movies\n OpenShot Video Editor is a free, open-source, non-linear video editor. It\n can create and edit videos and movies using many popular video, audio, and\n image formats. Create videos for Vimeo, Metacafe, iPod,\n Xbox, and many more common formats!\n .\n Features include:\n * Multiple tracks (layers)\n * Compositing, image overlays, and watermarks\n * Support for image sequences (rotoscoping)\n * Key-frame animation\n * Video and audio effects (chroma-key)\n * Transitions (lumas and masks)\n * 3D animation (titles and simulations)\n * Upload videos (Vimeo supported)", - +diff --git a/src/windows/main_window.py b/src/windows/main_window.py +index 2e77fc2..670727f 100644 +--- a/src/windows/main_window.py ++++ b/src/windows/main_window.py +@@ -470,17 +470,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface): + else: + log.info('canceled') - # see http://pypi.python.org/pypi?%3Aaction=list_classifiers -diff -Nur openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot ---- openshot-1.4.3.orig/openshot/locale/OpenShot/OpenShot.pot 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/locale/OpenShot/OpenShot.pot 2014-04-20 01:56:55.698378410 -0300 -@@ -1058,11 +1058,6 @@ - msgid "Export to Folder" - msgstr "" +- def actionUploadVideo_trigger(self, event): +- # show window +- from windows.upload_video import UploadVideo +- win = UploadVideo() +- # Run the dialog event loop - blocking interaction on this window during this time +- result = win.exec_() +- if result == QDialog.Accepted: +- log.info('Upload Video add confirmed') +- else: +- log.info('Upload Video add cancelled') +- + def actionExportVideo_trigger(self, event): + # show window + from windows.export import Export +@@ -1888,4 +1877,4 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface): + self.tutorial_manager = TutorialManager(self) --#: /home/jonathan/openshot/openshot/windows/ExportVideo.py:114 --#: /home/jonathan/openshot/openshot/export_presets/youtube.xml --msgid "YouTube" --msgstr "" -- - #: /home/jonathan/openshot/openshot/windows/ExportVideo.py:306 - #: /home/jonathan/openshot/openshot/export_presets/format_avi_mpeg2.xml - msgid "All Formats" -@@ -1498,17 +1493,6 @@ - msgid "Opened project" - msgstr "" - --#: /home/jonathan/openshot/openshot/uploads/manager.py:66 --#: /home/jonathan/openshot/openshot/uploads/manager.py:293 --#: /home/jonathan/openshot/openshot/export_presets/youtube.xml --msgid "Web" --msgstr "" -- --#: /home/jonathan/openshot/openshot/uploads/manager.py:66 --#: /home/jonathan/openshot/openshot/export_presets/youtube_HD.xml --msgid "YouTube-HD" --msgstr "" -- - #: /home/jonathan/openshot/openshot/uploads/manager.py:91 - #: /home/jonathan/openshot/openshot/uploads/manager.py:315 - msgid "Please choose a valid video file." -@@ -1532,12 +1516,6 @@ - msgid "Please enter a valid password." - msgstr "" - --#: /home/jonathan/openshot/openshot/uploads/manager.py:186 --msgid "" --"There was an error uploading this video to YouTube. Please check your " --"username, password, and be sure a valid video file is selected and try again." --msgstr "" -- - #: /home/jonathan/openshot/openshot/uploads/manager.py:261 - msgid "Vimeo authentication has expired." - msgstr "" -diff -Nur openshot-1.4.3.orig/openshot/uploads/manager.py openshot-1.4.3/openshot/uploads/manager.py ---- openshot-1.4.3.orig/openshot/uploads/manager.py 2011-02-22 04:20:53.000000000 -0200 -+++ openshot-1.4.3/openshot/uploads/manager.py 2014-04-20 01:50:59.295653314 -0300 -@@ -21,201 +21,11 @@ - - def get_services(self): - services = {} -- services["YouTube"] = YouTubeService(self.project, self.settings) - if sys.version_info[0] == 2 and sys.version_info[1] == 6 and vimeo_imported == True: - # vimeo only works on Python 2.6 right now - services["Vimeo"] = VimeoService(self.project, self.settings) - return services - --class YouTubeService(): -- def __init__(self, project, settings): -- self.project = project -- self.filename = None -- self.settings = settings -- self.form = None -- -- # Add language support -- _ = Language_Init.Translator(project).lang.gettext -- self._ = _ -- -- def initialize(self, form): -- """ Prepare the upload form for this service """ -- self.form = form -- -- form.login_divider.set_property("visible", True) -- form.lblUsername.set_property("visible", True) -- form.txtUsername.set_property("visible", True) -- form.lblPassword.set_property("visible", True) -- form.txtPassword.set_property("visible", True) -- form.btnAuthorize.set_property("visible", False) -- form.lblVerification.set_property("visible", False) -- form.txtVerification.set_property("visible", False) -- form.lnkForgot.set_label("http://www.youtube.com") -- form.lnkForgot.set_uri("http://www.youtube.com") -- -- # get saved username (if any) -- if self.settings.app_state["upload_username"]: -- form.txtUsername.set_text(self.settings.app_state["upload_username"]) -- -- def get_export_presets(self): -- """ Get a tuple of related export presets for this service (if any) """ -- -- # get reference to gettext -- _ = self._ -- -- return (_("Web"), _("YouTube-HD")) -- -- def get_authorization_url(self): -- return None -- -- def get_logo(self): -- logo_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "logos", "youtube.png") -- return gtk.gdk.pixbuf_new_from_file(logo_path) -- -- def validate(self, form): -- """ Validate the upload form... check for missing values. """ -- -- # get reference to gettext -- _ = self._ -- -- # get settings -- title = form.txtTitle.get_text() -- start, end = form.txtDescription.get_buffer().get_bounds() -- description = form.txtDescription.get_buffer().get_text(start, end) -- username = form.txtUsername.get_text() -- password = form.txtPassword.get_text() -- -- # Validate the the form is valid -- if not os.path.isfile(str(self.filename)): -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please choose a valid video file.")) -- return False -- -- if not title: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid title.")) -- return False -- -- if not description: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid description.")) -- return False -- -- if not username: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid username.")) -- return False -- else: -- # save username -- self.settings.app_state["upload_username"] = username -- -- if not password: -- # Show error message -- messagebox.show(_("Validation Error!"), _("Please enter a valid password.")) -- return False -- -- # form is valid -- return True -- -- def set_file(self, filename): -- self.filename = filename -- -- def start_upload(self, form): -- -- # get reference to gettext -- _ = self._ -- -- # Get the absolute path of this project -- import os, sys -- google_api_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "youtube") -- if google_api_path not in sys.path: -- sys.path.append(google_api_path) -- -- # get settings -- username = form.txtUsername.get_text() -- password = form.txtPassword.get_text() -- title = form.txtTitle.get_text() -- start, end = form.txtDescription.get_buffer().get_bounds() -- description = form.txtDescription.get_buffer().get_text(start, end) -- -- # remember username (but not password) -- self.settings.app_state["upload_username"] = username -- -- import getopt -- import mimetypes -- import atom.data -- import gdata.youtube -- import gdata.youtube.service -- import gdata.client -- import gdata.data -- import gdata.gauth -- import gdata.youtube.client -- import gdata.youtube.data -- import gdata.sample_util -- import helper -- -- # prepare a media group object to hold our video's meta-data -- my_media_group = gdata.media.Group( -- title=gdata.media.Title(text=title), -- description=gdata.media.Description(description_type='plain', -- text=description), -- keywords=gdata.media.Keywords(text=''), -- category=[gdata.media.Category( -- text='People', -- scheme='http://gdata.youtube.com/schemas/2007/categories.cat', -- label='People')], -- player=None -- ) -- -- # create the gdata.youtube.YouTubeVideoEntry to be uploaded -- video_entry = gdata.youtube.YouTubeVideoEntry(media=my_media_group) -- -- # create -- try: -- # disable upload button -- form.btnUpload.set_sensitive(False) -- -- # start upload -- uploader = helper.ResumableUploadDemo(self.filename, chunk_size=1024*64, convert="false", ssl=False, debug=False, host="uploads.gdata.youtube.com", username=username, password=password) -- -- # upload chunks -- entry = uploader.UploadInManualChunks(video_entry, os.path.split(self.filename)[-1], self.on_chunk_complete) -- -- except: -- # Show error message -- messagebox.show(_("Validation Error!"), _("There was an error uploading this video to YouTube. Please check your username, password, and be sure a valid video file is selected and try again.")) -- -- # enable upload button -- form.btnUpload.set_sensitive(True) -- return False -- -- -- # enable upload button -- form.btnUpload.set_sensitive(True) -- -- # successful -- return True -- -- def on_chunk_complete(self, *args): -- #print "on_chunk_complete" -- -- total_size = args[0] -- current_bytes = args[1] -- -- if current_bytes >= total_size: -- # don't exceed the total bytes -- current_bytes = total_size -- -- # calculate percentage -- percent = float(current_bytes) / float(total_size) -- gobject.idle_add(self.form.update_progressbar, percent) -- -- # allow other gtk operations to happen -- while gtk.events_pending(): -- gtk.main_iteration() -- -- -- - class VimeoService(): - def __init__(self, project, settings): - self.project = project -diff -Nur openshot-1.4.3.orig/openshot/windows/ExportVideo.py openshot-1.4.3/openshot/windows/ExportVideo.py ---- openshot-1.4.3.orig/openshot/windows/ExportVideo.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/windows/ExportVideo.py 2014-04-20 01:51:37.659279587 -0300 -@@ -111,7 +111,6 @@ - for option in upload_types: - # append profile to list - self.cboUploadServices.append_text(option) -- self.set_dropdown_values(_("YouTube"), self.cboUploadServices) - - - #populate the format/codec drop downs -diff -Nur openshot-1.4.3.orig/openshot/windows/preferences.py openshot-1.4.3/openshot/windows/preferences.py ---- openshot-1.4.3.orig/openshot/windows/preferences.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/openshot/windows/preferences.py 2014-04-20 01:52:19.739601020 -0300 -@@ -382,7 +382,6 @@ - "clip_property_window_height" : "345", - "clip_property_window_maximized" : "False", - "clip_property_hpane_position" : "260", -- "upload_service" : "YouTube", - "upload_username" : "", - "vimeo_token" : "", - "vimeo_token_secret" : "", -diff -Nur openshot-1.4.3.orig/setup.py openshot-1.4.3/setup.py ---- openshot-1.4.3.orig/setup.py 2012-09-30 17:33:29.000000000 -0300 -+++ openshot-1.4.3/setup.py 2014-04-20 01:28:48.698575950 -0300 -@@ -57,7 +57,7 @@ - # ------------------------------------- - dist = setup( - scripts = ['bin/openshot','bin/openshot-render'], -- packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients', 'openshot.uploads.youtube', 'openshot.uploads.youtube.atom', 'openshot.uploads.youtube.gdata', 'openshot.uploads.youtube.gdata.geo', 'openshot.uploads.youtube.gdata.media', 'openshot.uploads.youtube.gdata.oauth', 'openshot.uploads.youtube.gdata.opensearch', 'openshot.uploads.youtube.gdata.tlslite', 'openshot.uploads.youtube.gdata.tlslite.integration', 'openshot.uploads.youtube.gdata.tlslite.utils', 'openshot.uploads.youtube.gdata.youtube'], -+ packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients'], - package_data = { - 'openshot' : ['export_presets/*', 'images/*', 'locale/OpenShot/*', 'locale/README', 'profiles/*', 'themes/*/*.png', 'themes/*/*.xml', 'themes/*/icons/*.png', 'titles/*/*.svg', 'transitions/icons/medium/*.png', 'transitions/icons/small/*.png', 'transitions/*.pgm', 'transitions/*.png', 'transitions/*.svg', 'effects/icons/medium/*.png', 'effects/icons/small/*.png', 'effects/*.xml', 'blender/blend/*.blend', 'blender/icons/*.png', 'blender/earth/*.jpg', 'blender/scripts/*.py', 'blender/*.xml'] + locale_files, - 'openshot.windows' : ['ui/*.ui', 'ui/icons/*'], + # Install event filter +- self.installEventFilter(self) +\ No newline at end of file ++ self.installEventFilter(self) -- cgit v1.2.2