Hello community, here is the log from the commit of package smtube for openSUSE:Factory checked in at 2016-07-21 08:11:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smtube (Old) and /work/SRC/openSUSE:Factory/.smtube.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smtube" Changes: -------- --- /work/SRC/openSUSE:Factory/smtube/smtube.changes 2016-06-07 23:49:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smtube.new/smtube.changes 2016-07-21 08:11:49.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Jul 10 16:25:29 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 16.7.2: + * No changelog available. +- Recommend smtube-lang. +- Use Qt4 on SLE 12 and openSUSE 13.1. +- Replace a regexp with proper "make" arguments. +- Add smtube-makeflags.patch: propagate %_smp_mflags. +- Remove smtube-src_smtube.pro.patch and + smtube-no-download-option.diff: append desired options with cat. +- Generate icon cache. + +------------------------------------------------------------------- +Thu Jun 30 15:21:12 UTC 2016 - dap.darkn...@gmail.com + +- Update to 16.7.0: + * Fix youtube. + * Load the hdpi config from the smplayer config dir. + * Change the palette only on Windows. +- Automatic man page archiving. + +------------------------------------------------------------------- Old: ---- smtube-16.6.0.tar.bz2 smtube-no-download-option.diff smtube-src_smtube.pro.patch New: ---- smtube-16.7.2.tar.bz2 smtube-makeflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smtube.spec ++++++ --- /var/tmp/diff_new_pack.Zs2xWT/_old 2016-07-21 08:11:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Zs2xWT/_new 2016-07-21 08:11:50.000000000 +0200 @@ -17,97 +17,120 @@ # +%bcond_with restricted Name: smtube -Version: 16.6.0 +Version: 16.7.2 Release: 0 -Summary: Small Youtube Browser +Summary: Small YouTube Browser License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Url: http://www.smtube.org/ -Source0: http://downloads.sourceforge.net/smtube/SMTube/%{version}/%{name}-%{version}.tar.bz2 -Source9: %{name}.1 -# Fix 'File is compiled without RPM_OPT_FLAGS' -Patch0: %{name}-src_%{name}.pro.patch -# PATCH-FIX-OPENSUSE Video downloading from Youtube seems to be illegal. -Patch1: smtube-no-download-option.diff -%if 0%{?suse_version} -BuildRequires: fdupes +Url: http://smtube.org/ +Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 +Source1: %{name}.1 +# PATCH-FIX-OPENSUSE smtube-makeflags.patch +Patch0: %{name}-makeflags.patch BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%endif -BuildRequires: dos2unix -%if 0%{?suse_version} > 1310 -BuildRequires: libqt5-linguist -%else -BuildRequires: libqt5-qttools -%endif BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: update-desktop-files +Recommends: %{name}-lang +Recommends: smplayer Suggests: MPlayer Suggests: dragon Suggests: gnome-mplayer Suggests: mpv -Recommends: smplayer Suggests: totem Suggests: vlc Suggests: youtube-dl +%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +%else +BuildRequires: libQtWebKit-devel +BuildRequires: libqt4-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif %description -SMTube is an application that allows to browse, search and play YouTube -videos. Videos are played back with a media player (by default SMPlayer) -instead of a flash player, this allows better performance, particularly -with HD content. Read more at http://www.smtube.org/ - -SMTube is included in SMPlayer's menus, to run it just select Youtube browser -in the Options menu in the SMPlayer main window, or just press F11. +SMTube is an application that allows to browse, search and play +YouTube videos. Videos are played back with a media player (by +default SMPlayer) instead of a web browser, this allows better +performance, particularly with HD content. + +SMTube is included in SMPlayer's menus, to run it just select +YouTube browser in the Options menu in the SMPlayer main window, or +just press F11. %lang_package %prep %setup -q -%patch0 -%patch1 +%patch0 -p1 -# SED-FIX-OPENSUSE -- Fix paths -sed -i -e 's|/usr/local|/usr|; - s|/share/doc/|/share/doc/packages/|' Makefile +# Fix CRLF in .txt files. +sed -i 's/\r$//' *.txt -# Some docs have the DOS line ends -dos2unix *.txt +find . -type f -name '*.pro' | while read f; do +%if %{without restricted} + # Video downloading from YouTube seems to be illegal. + cat << EOF >> "$f" +DEFINES -= D_BUTTON +EOF +%endif + cat << EOF >> "$f" +QMAKE_CFLAGS += %{optflags} +QMAKE_CXXFLAGS += %{optflags} +EOF +done %build -make %{?_smp_mflags} \ - PREFIX="%{_prefix}" \ - DATA_PATH="%{_datadir}/%{name}" \ - DOC_PATH="%{_docdir}/%{name}" \ - KDE_PREFIX="%{_prefix}" \ - QMAKE=qmake-qt5 \ - LRELEASE=lrelease-qt5 \ - OPTFLAGS="%{optflags}" +make \ + MAKEFLAGS="%{?_smp_mflags}" \ +%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) + QMAKE=%{_libqt5_bindir}/qmake \ + LRELEASE=%{_libqt5_bindir}/lrelease \ +%else + QMAKE=%{_libdir}/qt4/bin/qmake \ + LRELEASE=%{_libdir}/qt4/bin/lrelease \ +%endif + PREFIX=%{_prefix} %install -%make_install -%find_lang %name --with-qt +%make_install \ + PREFIX=%{_prefix} \ + DOC_PATH=%{_docdir}/%{name} -%if 0%{?suse_version} - %suse_update_desktop_file %{name} - %fdupes -s %{buildroot}%{_prefix} -%endif +install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1 + +rm -rf %{buildroot}%{_docdir}/%{name}/* -mkdir -p %{buildroot}%{_mandir}/man1 -gzip -c9 %{SOURCE9} | tee -a %{buildroot}%{_mandir}/man1/%{name}.1.gz +%suse_update_desktop_file %{name} +%find_lang %{name} --with-qt + +%if 0%{?suse_version} > 1130 +%post +%icon_theme_cache_post +%desktop_database_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif %files %defattr(-,root,root) %doc Changelog *.txt %{_bindir}/%{name} +%{_datadir}/%{name}/ +%exclude %{_datadir}/%{name}/translations/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1%{?ext_man} %files lang -f %{name}.lang %defattr(-,root,root) -%{_datadir}/%{name} +%{_datadir}/%{name}/translations/ %changelog ++++++ smtube-16.6.0.tar.bz2 -> smtube-16.7.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/Changelog new/smtube-16.7.2/Changelog --- old/smtube-16.6.0/Changelog 2016-06-01 23:59:47.000000000 +0200 +++ new/smtube-16.7.2/Changelog 2016-06-29 21:58:44.000000000 +0200 @@ -1,3 +1,15 @@ +Version 16.7: + +(2016-06-23) + * Fix youtube + +(2016-06-19) + * Load the hdpi config from the smplayer config dir + +(2016-06-18) + * Change the palette only on Windows. + + Version 16.6: (2016-05-09) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/OBS/Makefile new/smtube-16.7.2/OBS/Makefile --- old/smtube-16.6.0/OBS/Makefile 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/OBS/Makefile 2016-07-02 00:11:59.000000000 +0200 @@ -2,7 +2,7 @@ # deb packages at build.opensuse.org PACKAGE = smtube -VERSION = 16.6.0 +VERSION = 16.7.2 DEPENDS = debhelper (>= 5.0.0), qtbase5-dev, qt5-qmake, qtscript5-dev, qttools5-dev-tools, qt5-default, libqt5webkit5-dev DSC_FILE = $(PACKAGE).dsc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/Release_notes.txt new/smtube-16.7.2/Release_notes.txt --- old/smtube-16.6.0/Release_notes.txt 2016-06-01 23:59:47.000000000 +0200 +++ new/smtube-16.7.2/Release_notes.txt 2016-06-29 21:58:44.000000000 +0200 @@ -1,3 +1,6 @@ +Version 16.7 + * Fix for VEVO videos. + Version 16.6 * Add support for high DPI screens. * Build by default with Qt 5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/create_deb.sh new/smtube-16.7.2/create_deb.sh --- old/smtube-16.6.0/create_deb.sh 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/create_deb.sh 2016-07-02 00:11:59.000000000 +0200 @@ -4,7 +4,7 @@ cp debian-rvm/changelog-orig debian-rvm/changelog ./get_svn_revision.sh -#dch -v 16.6.0-`cat svn_revision` "New version" +#dch -v 16.7.2-`cat svn_revision` "New version" #dpkg-buildpackage -rfakeroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/debian-rvm/changelog-orig new/smtube-16.7.2/debian-rvm/changelog-orig --- old/smtube-16.6.0/debian-rvm/changelog-orig 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/debian-rvm/changelog-orig 2016-07-02 00:11:59.000000000 +0200 @@ -1,3 +1,15 @@ +smtube (16.7.2) precise; urgency=low + + * Fix for VEVO videos. + + -- Ricardo Villalba <r...@users.sourceforge.net> Sat, 02 Jul 2016 00:09:35 +0200 + +smtube (16.7.0) precise; urgency=low + + * Fix for VEVO videos. + + -- Ricardo Villalba <r...@users.sourceforge.net> Wed, 29 Jun 2016 22:01:10 +0200 + smtube (16.6.0) precise; urgency=low * Add support for high DPI screens. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/smtube.spec new/smtube-16.7.2/smtube.spec --- old/smtube-16.6.0/smtube.spec 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/smtube.spec 2016-07-02 00:11:59.000000000 +0200 @@ -1,5 +1,5 @@ Name: smtube -Version: 16.6.0 +Version: 16.7.2 Release: 1%{?dist} Summary: YouTube browser for SMPlayer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/browserwindow.cpp new/smtube-16.7.2/src/browserwindow.cpp --- old/smtube-16.6.0/src/browserwindow.cpp 2016-04-09 01:01:25.000000000 +0200 +++ new/smtube-16.7.2/src/browserwindow.cpp 2016-06-18 01:56:57.000000000 +0200 @@ -754,7 +754,9 @@ qDebug() << "BrowserWindow::setStyle:" << style; //qApp->setStyleSheet(""); qApp->setStyle(style); + #ifdef Q_OS_WIN qApp->setPalette(qApp->style()->standardPalette()); + #endif } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/configdialog.cpp new/smtube-16.7.2/src/configdialog.cpp --- old/smtube-16.6.0/src/configdialog.cpp 2016-04-11 01:10:36.000000000 +0200 +++ new/smtube-16.7.2/src/configdialog.cpp 2016-06-18 02:02:38.000000000 +0200 @@ -66,12 +66,12 @@ playback_quality_combo->addItem( "1080p (webm)", RetrieveYoutubeUrl::WEBM_1080p ); #ifdef D_BUTTON - external_download_combo->addItem("http://www.dlyoutube.com/watch?v=%YT_ID%";); external_download_combo->addItem("http://9xbuddy.com/download?url=%YT_URL%";); external_download_combo->addItem("http://www.savefrom.net/#url=%YT_URL%";); external_download_combo->addItem("http://keepvid.com/?url=%YT_URL%";); //external_download_combo->addItem("http://savemedia.com/watch?v=%YT_ID%";); //external_download_combo->addItem("http://www.telechargerunevideo.com/en/?v=%YT_ID%";); + external_download_combo->addItem("http://www.dlyoutube.com/watch?v=%YT_ID%";); #else download_group->hide(); //adjustSize(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/hdpisupport.cpp new/smtube-16.7.2/src/hdpisupport.cpp --- old/smtube-16.6.0/src/hdpisupport.cpp 2016-05-16 22:34:46.000000000 +0200 +++ new/smtube-16.7.2/src/hdpisupport.cpp 2016-06-19 11:28:40.000000000 +0200 @@ -20,10 +20,6 @@ #include <QSettings> #include <QApplication> -#if QT_VERSION >= 0x050000 -#include <QStandardPaths> -#endif - //#define DEBUG #ifdef DEBUG @@ -40,7 +36,11 @@ } HDPISupport::HDPISupport(const QString & config_path) +#ifdef Q_OS_WIN : enabled(true) +#else + : enabled(false) +#endif , auto_scale(true) , scale_factor(1) , pixel_ratio(2) @@ -49,14 +49,7 @@ #ifdef HDPI_STORE_DATA set = 0; - if (!config_path.isEmpty()) { - setConfigPath(config_path); - } - #if QT_VERSION >= 0x050000 - else { - setConfigPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)); - } - #endif + setConfigPath(config_path); #else apply(); #endif @@ -84,11 +77,11 @@ } if (!config_path.isEmpty()) { - ini_file = config_path + "/smplayerhdpi.ini"; + QString inifile = config_path + "/hdpi.ini"; #ifdef DEBUG - qDebug() << "HDPISupport::setConfigPath: ini file:" << ini_file; + qDebug() << "HDPISupport::setConfigPath: ini file:" << inifile; #endif - set = new QSettings(ini_file, QSettings::IniFormat); + set = new QSettings(inifile, QSettings::IniFormat); load(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/hdpisupport.h new/smtube-16.7.2/src/hdpisupport.h --- old/smtube-16.6.0/src/hdpisupport.h 2016-05-16 22:34:46.000000000 +0200 +++ new/smtube-16.7.2/src/hdpisupport.h 2016-06-19 11:28:40.000000000 +0200 @@ -38,8 +38,6 @@ bool load(); bool save(); - - QString iniFile() { return ini_file; }; #endif void apply(); @@ -62,7 +60,6 @@ static HDPISupport * instance_obj; #ifdef HDPI_STORE_DATA QSettings * set; - QString ini_file; #endif bool enabled; bool auto_scale; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/loadpage.cpp new/smtube-16.7.2/src/loadpage.cpp --- old/smtube-16.6.0/src/loadpage.cpp 2016-01-05 00:13:37.000000000 +0100 +++ new/smtube-16.7.2/src/loadpage.cpp 2016-06-28 09:30:17.000000000 +0200 @@ -22,6 +22,14 @@ #include <QNetworkRequest> #include <QDebug> +#ifdef Q_OS_AMIGA + #define NO_SSL_CERTIFICATE +#endif + +#ifdef NO_SSL_CERTIFICATE +#include <QtNetwork/QSslConfiguration> +#endif + QString LoadPage::default_user_agent; LoadPage::LoadPage(QNetworkAccessManager * man, QObject* parent) @@ -38,6 +46,23 @@ qDebug() << "LoadPage::fetchPage: user agent:" << userAgent(); QNetworkRequest req(url); + +#ifdef NO_SSL_CERTIFICATE + // zzd10h + // remove certificates verification to avoid "SSL Handshake failed" + // http://forum.smplayer.info/viewtopic.php?f=2&t=8466 + + QNetworkRequest request; + QSslConfiguration conf = request.sslConfiguration(); + conf.setPeerVerifyMode(QSslSocket::VerifyNone); + #if QT_VERSION >= 0x050000 + conf.setProtocol(QSsl::TlsV1_0); + #else + conf.setProtocol(QSsl::TlsV1); + #endif + req.setSslConfiguration(conf); +#endif + req.setRawHeader("User-Agent", userAgent().toLatin1()); req.setRawHeader("Accept-Language", "en-us,en;q=0.5"); reply = manager->get(req); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/main.cpp new/smtube-16.7.2/src/main.cpp --- old/smtube-16.6.0/src/main.cpp 2016-05-16 22:34:46.000000000 +0200 +++ new/smtube-16.7.2/src/main.cpp 2016-06-19 11:28:40.000000000 +0200 @@ -46,7 +46,7 @@ #endif // PORTABLE_APP } -#ifdef YT_USE_YTSIG +#if defined(YT_USE_YTSIG) || defined(HDPI_SUPPORT) QString smplayerConfigPath() { #ifdef PORTABLE_APP return qApp->applicationDirPath(); @@ -97,7 +97,7 @@ int main(int argc, char * argv[]) { #ifdef HDPI_SUPPORT - HDPISupport * hdpi = new HDPISupport(); + HDPISupport * hdpi = new HDPISupport(smplayerConfigPath()); #endif QApplication a(argc, argv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/sig.cpp new/smtube-16.7.2/src/sig.cpp --- old/smtube-16.6.0/src/sig.cpp 2016-01-05 00:13:37.000000000 +0100 +++ new/smtube-16.7.2/src/sig.cpp 2016-07-01 11:50:03.000000000 +0200 @@ -62,6 +62,7 @@ //int pos = text.indexOf("function " + sig_name); int pos = text.indexOf("var " + sig_name + "=function"); if (pos == -1) pos = text.indexOf("," + sig_name + "=function"); + if (pos == -1) pos = text.indexOf(sig_name + "=function"); if (pos > -1) { int endpos = text.indexOf("}", pos); #ifdef ULTRAVERBOSE @@ -72,6 +73,8 @@ if (sig_code.startsWith("var ")) sig_code.replace("var " + sig_name + "=function", "function " + sig_name); else if (sig_code.startsWith(",")) sig_code.replace("," + sig_name + "=function", "function " + sig_name); + else + if (sig_code.startsWith(sig_name+"=")) sig_code.replace(sig_name + "=function", "function " + sig_name); } } } @@ -93,12 +96,12 @@ qDebug() << "Sig::findFunctions: possible var:" << possible_var; #endif if ((possible_var != "a") && (possible_var != "")) { - QString s = findText(text, "var "+ possible_var, "};"); + QString s = findText(text, "var "+ possible_var +"=", "};"); #ifdef ULTRAVERBOSE qDebug() << "Sig::findFunctions: s:" << s; #endif if (!s.isEmpty()) { - function2 = "var "+ possible_var +" "+ s +" };"; + function2 = "var "+ possible_var +" = "+ s +" };"; break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/smtube.rc new/smtube-16.7.2/src/smtube.rc --- old/smtube-16.6.0/src/smtube.rc 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/src/smtube.rc 2016-07-02 00:11:59.000000000 +0200 @@ -1,7 +1,7 @@ #include <winver.h> -#define SMTUBE_FILEVERSION 16,6,0,0 -#define SMTUBE_PRODVERSION "16.6.0.0\0" +#define SMTUBE_FILEVERSION 16,7,2,0 +#define SMTUBE_PRODVERSION "16.7.2.0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION SMTUBE_FILEVERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_bg.ts new/smtube-16.7.2/src/translations/smtube_bg.ts --- old/smtube-16.6.0/src/translations/smtube_bg.ts 2016-02-29 01:11:01.000000000 +0100 +++ new/smtube-16.7.2/src/translations/smtube_bg.ts 2016-06-18 02:03:26.000000000 +0200 @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="bg"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.0"> <context> <name>About</name> <message> @@ -348,7 +346,7 @@ <message> <location filename="../configdialog.ui" line="248"/> <source>&Style:</source> - <translation type="unfinished"></translation> + <translation>&Стил:</translation> </message> <message> <location filename="../configdialog.ui" line="284"/> @@ -378,7 +376,7 @@ <message> <location filename="../configdialog.cpp" line="73"/> <source>Default</source> - <translation type="unfinished">Стандартно</translation> + <translation>По подразбиране</translation> </message> </context> <context> @@ -506,4 +504,4 @@ <translation>Стандартно</translation> </message> </context> -</TS> +</TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_cs.ts new/smtube-16.7.2/src/translations/smtube_cs.ts --- old/smtube-16.6.0/src/translations/smtube_cs.ts 2016-02-29 01:11:01.000000000 +0100 +++ new/smtube-16.7.2/src/translations/smtube_cs.ts 2016-06-18 02:03:26.000000000 +0200 @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="cs"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.0"> <context> <name>About</name> <message> @@ -89,12 +87,12 @@ <message> <location filename="../browserwindow.cpp" line="131"/> <source>Zoom +</source> - <translation type="unfinished"></translation> + <translation>Přiblížit +</translation> </message> <message> <location filename="../browserwindow.cpp" line="135"/> <source>Zoom -</source> - <translation type="unfinished"></translation> + <translation>Oddálit -</translation> </message> <message> <location filename="../browserwindow.cpp" line="139"/> @@ -149,12 +147,12 @@ <message> <location filename="../browserwindow.cpp" line="306"/> <source>Download video using an external service</source> - <translation type="unfinished"></translation> + <translation>Stáhnout video pomocí externí služby</translation> </message> <message> <location filename="../browserwindow.cpp" line="308"/> <source>Download</source> - <translation type="unfinished"></translation> + <translation>Stáhnout</translation> </message> <message> <location filename="../browserwindow.cpp" line="493"/> @@ -303,7 +301,7 @@ <message> <location filename="../configdialog.ui" line="108"/> <source>&Players</source> - <translation type="unfinished"></translation> + <translation>&Přehrávače</translation> </message> <message> <location filename="../configdialog.ui" line="156"/> @@ -343,32 +341,32 @@ <message> <location filename="../configdialog.ui" line="240"/> <source>&Interface</source> - <translation type="unfinished"></translation> + <translation>&Rozhraní</translation> </message> <message> <location filename="../configdialog.ui" line="248"/> <source>&Style:</source> - <translation type="unfinished"></translation> + <translation>&Styl:</translation> </message> <message> <location filename="../configdialog.ui" line="284"/> <source>Font:</source> - <translation type="unfinished"></translation> + <translation>Font:</translation> </message> <message> <location filename="../configdialog.ui" line="298"/> <source>C&hange...</source> - <translation type="unfinished"></translation> + <translation>Z&měnit...</translation> </message> <message> <location filename="../configdialog.ui" line="68"/> <source>Download</source> - <translation type="unfinished"></translation> + <translation>Stáhnout</translation> </message> <message> <location filename="../configdialog.ui" line="74"/> <source>Download videos using an &external service</source> - <translation type="unfinished"></translation> + <translation>Stáhnout video pomocí &externí služby</translation> </message> <message> <location filename="../configdialog.ui" line="132"/> @@ -378,7 +376,7 @@ <message> <location filename="../configdialog.cpp" line="73"/> <source>Default</source> - <translation type="unfinished">Výchozí</translation> + <translation>Výchozí</translation> </message> </context> <context> @@ -468,7 +466,7 @@ <message> <location filename="../playerdialog.ui" line="78"/> <source>This player can play &online TV</source> - <translation type="unfinished"></translation> + <translation>Tento přehrávač může zobrazovat &online TV</translation> </message> <message> <location filename="../playerdialog.ui" line="87"/> @@ -506,4 +504,4 @@ <translation>Výchozí</translation> </message> </context> -</TS> +</TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_da.ts new/smtube-16.7.2/src/translations/smtube_da.ts --- old/smtube-16.6.0/src/translations/smtube_da.ts 2016-04-11 01:11:31.000000000 +0200 +++ new/smtube-16.7.2/src/translations/smtube_da.ts 2016-06-18 02:03:26.000000000 +0200 @@ -39,7 +39,7 @@ <message> <location filename="../about.cpp" line="42"/> <source>Compiled with Qt %1 (using %2)</source> - <translation>Compileret ved brug af Qt %1 (med %2)</translation> + <translation>Kompileret ved brug af Qt %1 (med %2)</translation> </message> <message> <location filename="../about.cpp" line="44"/> @@ -64,7 +64,7 @@ <message> <location filename="../about.cpp" line="91"/> <source>Click here to know the translators from the transifex teams</source> - <translation>Klik her for at se oversætterne fra Transfex teams</translation> + <translation>Klik her for at se oversætterne fra Transifex teams</translation> </message> <message> <location filename="../about.cpp" line="117"/> @@ -82,7 +82,7 @@ <message> <location filename="../browserwindow.cpp" line="123"/> <source>Navigation</source> - <translation>Nagivation</translation> + <translation>Navigation</translation> </message> <message> <location filename="../browserwindow.cpp" line="131"/> @@ -346,12 +346,12 @@ <message> <location filename="../configdialog.ui" line="248"/> <source>&Style:</source> - <translation>&Typografi:</translation> + <translation>&Stil:</translation> </message> <message> <location filename="../configdialog.ui" line="284"/> <source>Font:</source> - <translation>Skifttype:</translation> + <translation>Skrifttype:</translation> </message> <message> <location filename="../configdialog.ui" line="298"/> @@ -418,7 +418,7 @@ <message> <location filename="../mywebview.cpp" line="49"/> <source>Copy link to clipboard</source> - <translation>Kopier til udklipsholder</translation> + <translation>Kopiér link til udklipsholder</translation> </message> <message> <location filename="../mywebview.cpp" line="48"/> @@ -433,7 +433,7 @@ <message> <location filename="../mywebview.cpp" line="51"/> <source>Copy text to clipboard</source> - <translation>Kopier tekst til udklipsholder</translation> + <translation>Kopiér tekst til udklipsholder</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_nn_NO.ts new/smtube-16.7.2/src/translations/smtube_nn_NO.ts --- old/smtube-16.6.0/src/translations/smtube_nn_NO.ts 2016-04-11 01:11:31.000000000 +0200 +++ new/smtube-16.7.2/src/translations/smtube_nn_NO.ts 2016-06-18 02:03:26.000000000 +0200 @@ -4,7 +4,7 @@ <message> <location filename="../about.ui" line="14"/> <source>About...</source> - <translation>Om …</translation> + <translation>Om…</translation> </message> <message> <location filename="../about.ui" line="33"/> @@ -112,12 +112,12 @@ <message> <location filename="../browserwindow.cpp" line="155"/> <source>Toolbar</source> - <translation>Verktylinje</translation> + <translation>Verktyline</translation> </message> <message> <location filename="../browserwindow.cpp" line="159"/> <source>Statusbar</source> - <translation>Statuslinje</translation> + <translation>Statusline</translation> </message> <message> <location filename="../browserwindow.cpp" line="163"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_pl.ts new/smtube-16.7.2/src/translations/smtube_pl.ts --- old/smtube-16.6.0/src/translations/smtube_pl.ts 2016-03-03 01:10:17.000000000 +0100 +++ new/smtube-16.7.2/src/translations/smtube_pl.ts 2016-06-18 02:03:26.000000000 +0200 @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="pl"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0"> <context> <name>About</name> <message> @@ -11,7 +9,7 @@ <message> <location filename="../about.ui" line="33"/> <source>&Info</source> - <translation>&Info</translation> + <translation>&Informacje</translation> </message> <message> <location filename="../about.ui" line="89"/> @@ -36,7 +34,7 @@ <message> <location filename="../about.cpp" line="39"/> <source>Portable Edition</source> - <translation>Edycja portable</translation> + <translation>Wydanie przenośne</translation> </message> <message> <location filename="../about.cpp" line="42"/> @@ -506,4 +504,4 @@ <translation>Domyślnie</translation> </message> </context> -</TS> +</TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_pt.ts new/smtube-16.7.2/src/translations/smtube_pt.ts --- old/smtube-16.6.0/src/translations/smtube_pt.ts 2016-04-11 01:11:31.000000000 +0200 +++ new/smtube-16.7.2/src/translations/smtube_pt.ts 2016-06-18 02:03:26.000000000 +0200 @@ -311,7 +311,7 @@ <message> <location filename="../configdialog.ui" line="121"/> <source>Up</source> - <translation>Acima</translation> + <translation>Cima</translation> </message> <message> <location filename="../configdialog.ui" line="33"/> @@ -371,7 +371,7 @@ <message> <location filename="../configdialog.ui" line="132"/> <source>Down</source> - <translation>Abaixo</translation> + <translation>Baixo</translation> </message> <message> <location filename="../configdialog.cpp" line="73"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/translations/smtube_zh_CN.ts new/smtube-16.7.2/src/translations/smtube_zh_CN.ts --- old/smtube-16.6.0/src/translations/smtube_zh_CN.ts 2016-02-29 01:11:01.000000000 +0100 +++ new/smtube-16.7.2/src/translations/smtube_zh_CN.ts 2016-06-18 02:03:26.000000000 +0200 @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="zh_CN"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0"> <context> <name>About</name> <message> @@ -89,12 +87,12 @@ <message> <location filename="../browserwindow.cpp" line="131"/> <source>Zoom +</source> - <translation type="unfinished"></translation> + <translation>放大</translation> </message> <message> <location filename="../browserwindow.cpp" line="135"/> <source>Zoom -</source> - <translation type="unfinished"></translation> + <translation>缩小</translation> </message> <message> <location filename="../browserwindow.cpp" line="139"/> @@ -149,12 +147,12 @@ <message> <location filename="../browserwindow.cpp" line="306"/> <source>Download video using an external service</source> - <translation type="unfinished"></translation> + <translation>使用外置服务下载视频</translation> </message> <message> <location filename="../browserwindow.cpp" line="308"/> <source>Download</source> - <translation type="unfinished"></translation> + <translation>下载</translation> </message> <message> <location filename="../browserwindow.cpp" line="493"/> @@ -303,7 +301,7 @@ <message> <location filename="../configdialog.ui" line="108"/> <source>&Players</source> - <translation type="unfinished"></translation> + <translation>播放器(&P)</translation> </message> <message> <location filename="../configdialog.ui" line="156"/> @@ -343,32 +341,32 @@ <message> <location filename="../configdialog.ui" line="240"/> <source>&Interface</source> - <translation type="unfinished"></translation> + <translation>界面(&I)</translation> </message> <message> <location filename="../configdialog.ui" line="248"/> <source>&Style:</source> - <translation type="unfinished"></translation> + <translation>样式(&S):</translation> </message> <message> <location filename="../configdialog.ui" line="284"/> <source>Font:</source> - <translation type="unfinished"></translation> + <translation>字体:</translation> </message> <message> <location filename="../configdialog.ui" line="298"/> <source>C&hange...</source> - <translation type="unfinished"></translation> + <translation>更改(&h)...</translation> </message> <message> <location filename="../configdialog.ui" line="68"/> <source>Download</source> - <translation type="unfinished"></translation> + <translation>下载</translation> </message> <message> <location filename="../configdialog.ui" line="74"/> <source>Download videos using an &external service</source> - <translation type="unfinished"></translation> + <translation>使用外置服务下载视频(&e)</translation> </message> <message> <location filename="../configdialog.ui" line="132"/> @@ -378,7 +376,7 @@ <message> <location filename="../configdialog.cpp" line="73"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> </context> <context> @@ -468,7 +466,7 @@ <message> <location filename="../playerdialog.ui" line="78"/> <source>This player can play &online TV</source> - <translation type="unfinished"></translation> + <translation>此播放器可以播放在线电视 (&o)</translation> </message> <message> <location filename="../playerdialog.ui" line="87"/> @@ -506,4 +504,4 @@ <translation>默认</translation> </message> </context> -</TS> +</TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smtube-16.6.0/src/version.cpp new/smtube-16.7.2/src/version.cpp --- old/smtube-16.6.0/src/version.cpp 2016-06-02 23:15:24.000000000 +0200 +++ new/smtube-16.7.2/src/version.cpp 2016-07-02 00:11:59.000000000 +0200 @@ -20,7 +20,7 @@ #define USE_SVN_VERSIONS 0 -#define VERSION "16.6.0" +#define VERSION "16.7.2" #if USE_SVN_VERSIONS #include "svn_revision.h" ++++++ smtube-makeflags.patch ++++++ --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \ src/smtube: # ./get_svn_revision.sh - +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) $(MAKE) + +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) $(MAKE) $(MAKEFLAGS) cd src && $(LRELEASE) smtube.pro clean:
