diff -Nru smtube-17.1.0/Changelog smtube-17.5.0/Changelog --- smtube-17.1.0/Changelog 2017-01-31 22:49:01.000000000 +0000 +++ smtube-17.5.0/Changelog 2017-05-05 20:24:37.000000000 +0000 @@ -1,3 +1,9 @@ +Version 17.5: + +(2017-05-04) + * Fix youtube + + Version 17.1: (2017-01-31) diff -Nru smtube-17.1.0/clean_windows.cmd smtube-17.5.0/clean_windows.cmd --- smtube-17.1.0/clean_windows.cmd 2015-12-28 20:07:04.000000000 +0000 +++ smtube-17.5.0/clean_windows.cmd 2017-02-21 16:21:00.000000000 +0000 @@ -2,6 +2,7 @@ call mingw32-make distclean cd .. +del setup\qt_env.nsh del setup\qt_files.nsh del src\translations\smtube_*.qm del src\object_script.smtube.Release diff -Nru smtube-17.1.0/compile_windows.cmd smtube-17.5.0/compile_windows.cmd --- smtube-17.1.0/compile_windows.cmd 2016-04-15 06:57:55.000000000 +0000 +++ smtube-17.5.0/compile_windows.cmd 2017-02-21 16:21:00.000000000 +0000 @@ -105,6 +105,22 @@ :: Does string have a trailing slash? if so remove it if %SMTUBE_DIR:~-1%==\ set SMTUBE_DIR=%SMTUBE_DIR:~0,-1% +for /f "tokens=1 delims=." %%l in ("%QT_VER%") do set QT_VER_MAJOR=%%l +for /f "tokens=2 delims=." %%m in ("%QT_VER%") do set QT_VER_MINOR=%%m +for /f "tokens=3 delims=." %%n in ("%QT_VER%") do set QT_VER_BUILD=%%n + +REM Begin generate qt_env.nsh +echo !define SMTUBE_QT_VER "%QT_VER%">"%SMTUBE_DIR%\setup\qt_env.nsh" +echo !define QT_VER_COMMON_NAME "Qt %QT_VER_MAJOR%.%QT_VER_MINOR%">>"%SMTUBE_DIR%\setup\qt_env.nsh" +echo !define QT_VER_MAJOR "%QT_VER_MAJOR%">>"%SMTUBE_DIR%\setup\qt_env.nsh" +echo !define QT_VER_MINOR "%QT_VER_MINOR%">>"%SMTUBE_DIR%\setup\qt_env.nsh" +echo !define QT_VER_BUILD "%QT_VER_BUILD%">>"%SMTUBE_DIR%\setup\qt_env.nsh" +if %QT_VER_MAJOR% equ 4 ( + echo !define COMPILED_WITH_QT4>>"%SMTUBE_DIR%\setup\qt_env.nsh" +) +REM End generate qt_env.nsh + +REM Begin generate qt_files.nsh if %QT_VER% lss 5.0.0 ( echo File "%QT_DIR%\bin\QtWebKit4.dll">"%SMTUBE_DIR%\setup\qt_files.nsh" @@ -127,6 +143,7 @@ echo File "%QT_DIR%\bin\icuuc*.dll">>"%SMTUBE_DIR%\setup\qt_files.nsh" echo File "%QT_DIR%\bin\icudt*.dll">>"%SMTUBE_DIR%\setup\qt_files.nsh" ) +REM End generate qt_env.nsh :compile diff -Nru smtube-17.1.0/create_deb.sh smtube-17.5.0/create_deb.sh --- smtube-17.1.0/create_deb.sh 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/create_deb.sh 2017-05-05 20:30:21.000000000 +0000 @@ -4,7 +4,7 @@ cp debian-rvm/changelog-orig debian-rvm/changelog ./get_svn_revision.sh -#dch -v 17.1.0-`cat svn_revision` "New version" +#dch -v 17.5.0-`cat svn_revision` "New version" #dpkg-buildpackage -rfakeroot diff -Nru smtube-17.1.0/debian/changelog smtube-17.5.0/debian/changelog --- smtube-17.1.0/debian/changelog 2017-05-05 21:10:14.000000000 +0000 +++ smtube-17.5.0/debian/changelog 2017-05-05 21:10:15.000000000 +0000 @@ -1,4 +1,10 @@ -smtube (17.1.0-1~vivid2) vivid; urgency=low +smtube (17.5.0-1~vivid1) vivid; urgency=low + + * Fix for VEVO videos. + + -- Ricardo Villalba Fri, 05 May 2017 22:28:44 +0200 + +smtube (17.1.0) precise; urgency=low * Fix for VEVO videos. diff -Nru smtube-17.1.0/debian/rules smtube-17.5.0/debian/rules --- smtube-17.1.0/debian/rules 2017-05-05 21:10:14.000000000 +0000 +++ smtube-17.5.0/debian/rules 2017-05-05 21:10:15.000000000 +0000 @@ -91,7 +91,7 @@ dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z lzma + dh_builddeb -- -Z xz binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff -Nru smtube-17.1.0/debian-rvm/changelog-orig smtube-17.5.0/debian-rvm/changelog-orig --- smtube-17.1.0/debian-rvm/changelog-orig 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/debian-rvm/changelog-orig 2017-05-05 20:30:21.000000000 +0000 @@ -1,3 +1,9 @@ +smtube (17.5.0) precise; urgency=low + + * Fix for VEVO videos. + + -- Ricardo Villalba Fri, 05 May 2017 22:28:44 +0200 + smtube (17.1.0) precise; urgency=low * Fix for VEVO videos. diff -Nru smtube-17.1.0/debian-rvm/rules smtube-17.5.0/debian-rvm/rules --- smtube-17.1.0/debian-rvm/rules 2016-04-29 22:34:35.000000000 +0000 +++ smtube-17.5.0/debian-rvm/rules 2017-02-14 00:00:52.000000000 +0000 @@ -91,7 +91,7 @@ dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z lzma + dh_builddeb -- -Z xz binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff -Nru smtube-17.1.0/OBS/Makefile smtube-17.5.0/OBS/Makefile --- smtube-17.1.0/OBS/Makefile 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/OBS/Makefile 2017-05-05 20:30:21.000000000 +0000 @@ -2,7 +2,7 @@ # deb packages at build.opensuse.org PACKAGE = smtube -VERSION = 17.1.0 +VERSION = 17.5.0 #DEPENDS = debhelper (>= 5.0.0), qtbase5-dev, qt5-qmake, qtscript5-dev, qttools5-dev-tools, qt5-default, libqt5webkit5-dev DEPENDS = debhelper (>= 5.0.0), libqt4-dev, libqtwebkit-dev diff -Nru smtube-17.1.0/Release_notes.txt smtube-17.5.0/Release_notes.txt --- smtube-17.1.0/Release_notes.txt 2017-01-31 22:49:01.000000000 +0000 +++ smtube-17.5.0/Release_notes.txt 2017-05-05 20:24:37.000000000 +0000 @@ -1,3 +1,6 @@ +Version 17.5 + * Fix for VEVO videos. + Version 17.1 * Fix for VEVO videos. diff -Nru smtube-17.1.0/setup/smtube.nsi smtube-17.5.0/setup/smtube.nsi --- smtube-17.1.0/setup/smtube.nsi 2017-01-31 21:58:24.000000000 +0000 +++ smtube-17.5.0/setup/smtube.nsi 2017-02-24 05:08:25.000000000 +0000 @@ -48,7 +48,8 @@ !define SMTUBE_PE_EXE "smtube-portable.exe" !endif - !define SMTUBE_QT_VER "Qt 5.6.1" + ; Information about the Qt environment (generated by compile_windows.cmd) + !include qt_env.nsh ;-------------------------------- ;General @@ -57,9 +58,17 @@ Name "SMTube ${SMTUBE_VERSION}" BrandingText "SMTube for Windows v${SMTUBE_VERSION}" !ifdef WIN64 - OutFile "output\smtube-${SMTUBE_VERSION}-x64.exe" + !ifdef COMPILED_WITH_QT4 + OutFile "output\smtube-${SMTUBE_VERSION}-x64-Qt4.exe" + !else + OutFile "output\smtube-${SMTUBE_VERSION}-x64.exe" + !endif !else - OutFile "output\smtube-${SMTUBE_VERSION}-win32.exe" + !ifdef COMPILED_WITH_QT4 + OutFile "output\smtube-${SMTUBE_VERSION}-win32-Qt4.exe" + !else + OutFile "output\smtube-${SMTUBE_VERSION}-win32.exe" + !endif !endif ;Version tab properties @@ -376,6 +385,12 @@ Function .onInit +!ifdef COMPILED_WITH_QT4 + MessageBox MB_YESNO|MB_ICONEXCLAMATION "This build is compiled with Qt4 and is provided for compatibility with legacy CPUs (those without SSE2 or later instruction set support). If you do not meet these requirements, it is recommended to use the normal Qt5 releases.$\r$\n$\r$\nProceed with the installation?" /SD IDYES IDYES installoldcpu + Abort + installoldcpu: +!endif + !ifdef WIN64 ${IfNot} ${RunningX64} MessageBox MB_OK|MB_ICONSTOP $(Win64_Required) @@ -412,7 +427,11 @@ IfFileExists "$INSTDIR\smplayer.exe" +2 Abort +!ifdef COMPILED_WITH_QT4 + IfFileExists "$INSTDIR\QtCore4.dll" +2 +!else IfFileExists "$INSTDIR\Qt5Core.dll" +2 +!endif Abort !ifdef USE_MOREINFO diff -Nru smtube-17.1.0/setup/translations/po_files/polish.po smtube-17.5.0/setup/translations/po_files/polish.po --- smtube-17.1.0/setup/translations/po_files/polish.po 2017-01-31 21:51:41.000000000 +0000 +++ smtube-17.5.0/setup/translations/po_files/polish.po 2017-05-05 20:20:17.000000000 +0000 @@ -11,7 +11,7 @@ # Info_QtArch_Bypassed msgid "SMPlayer, architecture and Qt version check bypassed by command-line." msgstr "" -"SMPlayer, architektura i kontrola wersji Qt ominięte przez wiersz poleceń." +"SMPlayer, architektura i kontrola wersji Qt pominięte przez wiersz poleceń." # DirectoryIsNotWritable msgid "" @@ -29,11 +29,11 @@ "containing a ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} installation of SMPlayer." msgstr "" "$(^DirText)[:r:][:n:][:r:][:n:]SMTube musi być zainstalowany do katalogu " -"zawierającego ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} instalację of SMPlayer." +"zawierającego ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} instalację SMPlayer." # Section_SMTube msgid "SMTube (required)" -msgstr "SMPlayer (wymagany)" +msgstr "SMTube (wymagany)" # WelcomePage_Text msgid "" @@ -68,15 +68,17 @@ # # Translators: # M T , 2016 +# Piotr Strębski , 2017 msgid "" msgstr "" "Project-Id-Version: smplayer\n" -"PO-Revision-Date: 2016-11-09 15:56+0000\n" -"Last-Translator: M T \n" +"PO-Revision-Date: 2017-02-10 08:42+0000\n" +"Last-Translator: Piotr Strębski \n" "Language-Team: Polish (http://www.transifex.com/rvm/smplayer/language/pl/)\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" diff -Nru smtube-17.1.0/setup/translations/po_files/serbian.po smtube-17.5.0/setup/translations/po_files/serbian.po --- smtube-17.1.0/setup/translations/po_files/serbian.po 2017-01-31 21:51:41.000000000 +0000 +++ smtube-17.5.0/setup/translations/po_files/serbian.po 2017-05-05 20:20:17.000000000 +0000 @@ -1,14 +1,16 @@ # Info_Portable_Detected msgid "Found portable version of SMPlayer." -msgstr "" +msgstr "Нађена је портабилна верзија СМПлејера." # Info_Portable_Bypassed msgid "Portable check overriden by command-line, forcing portable." msgstr "" +"Провера портабилности избегнута из командне линије. Форсирам портабилну" # Info_QtArch_Bypassed msgid "SMPlayer, architecture and Qt version check bypassed by command-line." msgstr "" +"Провера архитектуре, КуТ верзије и СМПлејера је избегнута из командне линије." # DirectoryIsNotWritable msgid "" @@ -16,16 +18,21 @@ "the installer with administrator privileges.[:r:][:n:][:r:][:n:]Proceed with " "installation?" msgstr "" +"Изабрани директоријум није уписив и може захтевати поновно покретање " +"инсталације са администраторским овлашћењима.[:r:][:n:][:r:][:n:]Наставити " +"са инсталацијом?" # DirectoryPage_Text msgid "" "$(^DirText)[:r:][:n:][:r:][:n:]SMTube must be installed to a directory " "containing a ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} installation of SMPlayer." msgstr "" +"$(^DirText)[:r:][:n:][:r:][:n:]СМТјуб мора бити инсталиран у директоријум " +"који садржи ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} инсталацију СМПлејера." # Section_SMTube msgid "SMTube (required)" -msgstr "" +msgstr "СМТјуб (потребно)" # WelcomePage_Text msgid "" @@ -34,26 +41,40 @@ "setup. This will make it possible to update relevant program files without " "having to reboot your computer.[:r:][:n:][:r:][:n:]$_CLICK" msgstr "" +"Програм инсталације ће вас водити кроз инсталацију $(^NameDA).[:r:][:n:][:r:]" +"[:n:]Препорука је да затворите претходно отворени СМТјуб пре почетка " +"инсталације. То ће омогућити ажурирање битних фајлова без потребе за " +"поновним покретањем вашег рачунара.[:r:][:n:][:r:][:n:]$_CLICK" # WelcomePage_Title msgid "$(^NameDA) Setup" -msgstr "" +msgstr "$(^NameDA) програм инсталације" # Win64_Required msgid "A 64-bit Windows operating system is required to install this software." msgstr "" +"64-битни Виндоуз оперативни систем је потребан за инсталацију овог програма." # Installer_No_Admin msgid "You must be logged in as an administrator when installing this program." msgstr "" +"Морате бити пријављени као администратор када инсталирате овај програм." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Slobodan Simić , 2017 msgid "" msgstr "" -"Project-Id-Version: SMPlayer\n" +"Project-Id-Version: smplayer\n" +"PO-Revision-Date: 2017-02-18 18:09+0000\n" +"Last-Translator: Slobodan Simić \n" +"Language-Team: Serbian (http://www.transifex.com/rvm/smplayer/language/sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" diff -Nru smtube-17.1.0/setup/translations/po_files/slovak.po smtube-17.5.0/setup/translations/po_files/slovak.po --- smtube-17.1.0/setup/translations/po_files/slovak.po 2017-01-31 21:51:41.000000000 +0000 +++ smtube-17.5.0/setup/translations/po_files/slovak.po 2017-05-05 20:20:17.000000000 +0000 @@ -1,14 +1,17 @@ # Info_Portable_Detected msgid "Found portable version of SMPlayer." -msgstr "" +msgstr "Nájdená prenosná verzia SMPlayer-u." # Info_Portable_Bypassed msgid "Portable check overriden by command-line, forcing portable." msgstr "" +"Kontrola prenosnej verzie obídená cez príkazový riadok, požadujúc prenosnú " +"verziu." # Info_QtArch_Bypassed msgid "SMPlayer, architecture and Qt version check bypassed by command-line." msgstr "" +"Kontrola SMPlayer-u, architektúry a verzie Qt obídená cez príkazový riadok." # DirectoryIsNotWritable msgid "" @@ -16,16 +19,21 @@ "the installer with administrator privileges.[:r:][:n:][:r:][:n:]Proceed with " "installation?" msgstr "" +"Do zvoleného inštalačného adresára nemožno zapisovať a môže byť vyžadované " +"reštartovanie inštalátora s administrátorskými oprávneniami.[:r:][:n:][:r:][:" +"n:]Pokračovať v inštalácii?" # DirectoryPage_Text msgid "" "$(^DirText)[:r:][:n:][:r:][:n:]SMTube must be installed to a directory " "containing a ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} installation of SMPlayer." msgstr "" +"$(^DirText)[:r:][:n:][:r:][:n:]SMTube musí byť inštalovaný do adresára " +"obsahujúceho ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} inštaláciu SMPlayer-u." # Section_SMTube msgid "SMTube (required)" -msgstr "" +msgstr "SMTube (vyžadované)" # WelcomePage_Text msgid "" @@ -34,26 +42,40 @@ "setup. This will make it possible to update relevant program files without " "having to reboot your computer.[:r:][:n:][:r:][:n:]$_CLICK" msgstr "" +"Inštalátor vás prevedie inštaláciou $(^NameDA).[:r:][:n:][:r:][:n:]Predtým, " +"než spustíte inštalátor, sa odporúča zavrieť všetky spustené inštancie " +"SMTube. Toto umožní aktualizovať príslušné súbory programu bez nutnosti " +"reštartovať váš počítač.[:r:][:n:][:r:][:n:]$_CLICK" # WelcomePage_Title msgid "$(^NameDA) Setup" -msgstr "" +msgstr "Nastavenie $(^NameDA)" # Win64_Required msgid "A 64-bit Windows operating system is required to install this software." msgstr "" +"Pre inštaláciu tohoto softvéru je požadovaný 64-bitový operačný systém " +"Windows." # Installer_No_Admin msgid "You must be logged in as an administrator when installing this program." msgstr "" +"Pri inštalovaní tohoto programu musíte byť prihlásení ako administrátor." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Radek Hrančík , 2017 msgid "" msgstr "" -"Project-Id-Version: SMPlayer\n" +"Project-Id-Version: smplayer\n" +"PO-Revision-Date: 2017-02-09 03:10+0000\n" +"Last-Translator: Radek Hrančík \n" +"Language-Team: Slovak (http://www.transifex.com/rvm/smplayer/language/sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" diff -Nru smtube-17.1.0/setup/translations/polish.nsh smtube-17.5.0/setup/translations/polish.nsh --- smtube-17.1.0/setup/translations/polish.nsh 2016-06-01 22:14:07.000000000 +0000 +++ smtube-17.5.0/setup/translations/polish.nsh 2017-05-05 20:21:29.000000000 +0000 @@ -20,13 +20,13 @@ ${LangFileString} WelcomePage_Text "Instalator poprowadzi Cię przez proces instalacji $(^NameDA).$\r$\n$\r$\nZalecane jest zamknięcie wszystkich instancji SMTube przed rozpoczęciem instalacji. Dzięki temu możliwe będzie zaktualizowanie odpowiednich plików programu, bez konieczności ponownego uruchamiania komputera.$\r$\n$\r$\n$_CLICK" ; Components Page -${LangFileString} Section_SMTube "SMPlayer (wymagany)" +${LangFileString} Section_SMTube "SMTube (wymagany)" ; Directory Page -${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube musi być zainstalowany do katalogu zawierającego ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} instalację of SMPlayer." +${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube musi być zainstalowany do katalogu zawierającego ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} instalację SMPlayer." ${LangFileString} DirectoryIsNotWritable "Wybrany katalog instalacyjny nie ma prawa zapisu i może wymagać ponownego uruchomienia instalatora z uprawnieniami administratora.$\r$\n$\r$\nKontynuować instalację?" ; Misc -${LangFileString} Info_QtArch_Bypassed "SMPlayer, architektura i kontrola wersji Qt ominięte przez wiersz poleceń." +${LangFileString} Info_QtArch_Bypassed "SMPlayer, architektura i kontrola wersji Qt pominięte przez wiersz poleceń." ${LangFileString} Info_Portable_Bypassed "Kontrola przenośna nadpisywana przez wiersz poleceń, wymuszając tryb przenośny." ${LangFileString} Info_Portable_Detected "Znaleziono przenośną wersję SMPlayer." diff -Nru smtube-17.1.0/setup/translations/serbian.nsh smtube-17.5.0/setup/translations/serbian.nsh --- smtube-17.1.0/setup/translations/serbian.nsh 2016-04-15 06:52:51.000000000 +0000 +++ smtube-17.5.0/setup/translations/serbian.nsh 2017-05-05 20:21:29.000000000 +0000 @@ -11,22 +11,22 @@ !endif ; Startup -${LangFileString} Installer_No_Admin "You must be logged in as an administrator when installing this program." +${LangFileString} Installer_No_Admin "Морате бити пријављени као администратор када инсталирате овај програм." -${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software." +${LangFileString} Win64_Required "64-битни Виндоуз оперативни систем је потребан за инсталацију овог програма." ; Welcome page -${LangFileString} WelcomePage_Title "$(^NameDA) Setup" -${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMTube before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK" +${LangFileString} WelcomePage_Title "$(^NameDA) програм инсталације" +${LangFileString} WelcomePage_Text "Програм инсталације ће вас водити кроз инсталацију $(^NameDA).$\r$\n$\r$\nПрепорука је да затворите претходно отворени СМТјуб пре почетка инсталације. То ће омогућити ажурирање битних фајлова без потребе за поновним покретањем вашег рачунара.$\r$\n$\r$\n$_CLICK" ; Components Page -${LangFileString} Section_SMTube "SMTube (required)" +${LangFileString} Section_SMTube "СМТјуб (потребно)" ; Directory Page -${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube must be installed to a directory containing a ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} installation of SMPlayer." -${LangFileString} DirectoryIsNotWritable "The chosen installation directory is not writable and may require restarting the installer with administrator privileges.$\r$\n$\r$\nProceed with installation?" +${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nСМТјуб мора бити инсталиран у директоријум који садржи ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} инсталацију СМПлејера." +${LangFileString} DirectoryIsNotWritable "Изабрани директоријум није уписив и може захтевати поновно покретање инсталације са администраторским овлашћењима.$\r$\n$\r$\nНаставити са инсталацијом?" ; Misc -${LangFileString} Info_QtArch_Bypassed "SMPlayer, architecture and Qt version check bypassed by command-line." -${LangFileString} Info_Portable_Bypassed "Portable check overriden by command-line, forcing portable." -${LangFileString} Info_Portable_Detected "Found portable version of SMPlayer." +${LangFileString} Info_QtArch_Bypassed "Провера архитектуре, КуТ верзије и СМПлејера је избегнута из командне линије." +${LangFileString} Info_Portable_Bypassed "Провера портабилности избегнута из командне линије. Форсирам портабилну" +${LangFileString} Info_Portable_Detected "Нађена је портабилна верзија СМПлејера." diff -Nru smtube-17.1.0/setup/translations/slovak.nsh smtube-17.5.0/setup/translations/slovak.nsh --- smtube-17.1.0/setup/translations/slovak.nsh 2016-04-15 06:52:51.000000000 +0000 +++ smtube-17.5.0/setup/translations/slovak.nsh 2017-05-05 20:21:29.000000000 +0000 @@ -11,22 +11,22 @@ !endif ; Startup -${LangFileString} Installer_No_Admin "You must be logged in as an administrator when installing this program." +${LangFileString} Installer_No_Admin "Pri inštalovaní tohoto programu musíte byť prihlásení ako administrátor." -${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software." +${LangFileString} Win64_Required "Pre inštaláciu tohoto softvéru je požadovaný 64-bitový operačný systém Windows." ; Welcome page -${LangFileString} WelcomePage_Title "$(^NameDA) Setup" -${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMTube before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK" +${LangFileString} WelcomePage_Title "Nastavenie $(^NameDA)" +${LangFileString} WelcomePage_Text "Inštalátor vás prevedie inštaláciou $(^NameDA).$\r$\n$\r$\nPredtým, než spustíte inštalátor, sa odporúča zavrieť všetky spustené inštancie SMTube. Toto umožní aktualizovať príslušné súbory programu bez nutnosti reštartovať váš počítač.$\r$\n$\r$\n$_CLICK" ; Components Page -${LangFileString} Section_SMTube "SMTube (required)" +${LangFileString} Section_SMTube "SMTube (vyžadované)" ; Directory Page -${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube must be installed to a directory containing a ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} installation of SMPlayer." -${LangFileString} DirectoryIsNotWritable "The chosen installation directory is not writable and may require restarting the installer with administrator privileges.$\r$\n$\r$\nProceed with installation?" +${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube musí byť inštalovaný do adresára obsahujúceho ${SMTUBE_INST_ARCH} ${SMTUBE_QT_VER} inštaláciu SMPlayer-u." +${LangFileString} DirectoryIsNotWritable "Do zvoleného inštalačného adresára nemožno zapisovať a môže byť vyžadované reštartovanie inštalátora s administrátorskými oprávneniami.$\r$\n$\r$\nPokračovať v inštalácii?" ; Misc -${LangFileString} Info_QtArch_Bypassed "SMPlayer, architecture and Qt version check bypassed by command-line." -${LangFileString} Info_Portable_Bypassed "Portable check overriden by command-line, forcing portable." -${LangFileString} Info_Portable_Detected "Found portable version of SMPlayer." +${LangFileString} Info_QtArch_Bypassed "Kontrola SMPlayer-u, architektúry a verzie Qt obídená cez príkazový riadok." +${LangFileString} Info_Portable_Bypassed "Kontrola prenosnej verzie obídená cez príkazový riadok, požadujúc prenosnú verziu." +${LangFileString} Info_Portable_Detected "Nájdená prenosná verzia SMPlayer-u." diff -Nru smtube-17.1.0/smtube.spec smtube-17.5.0/smtube.spec --- smtube-17.1.0/smtube.spec 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/smtube.spec 2017-05-05 20:30:21.000000000 +0000 @@ -1,5 +1,5 @@ Name: smtube -Version: 17.1.0 +Version: 17.5.0 Release: 1%{?dist} Summary: YouTube browser for SMPlayer diff -Nru smtube-17.1.0/src/retrieveyoutubeurl.cpp smtube-17.5.0/src/retrieveyoutubeurl.cpp --- smtube-17.1.0/src/retrieveyoutubeurl.cpp 2017-01-31 21:28:17.000000000 +0000 +++ smtube-17.5.0/src/retrieveyoutubeurl.cpp 2017-05-04 00:03:35.000000000 +0000 @@ -252,11 +252,12 @@ #ifdef YT_USE_SIG QString html5_player; #endif - //QRegExp rxplayer("player-([\\d,\\w,-]+)\\\\"); - QRegExp rxplayer("jsbin\\/player-([\\d\\w-]+)\\/base\\.js"); + QRegExp rxplayer("jsbin\\/player-([\\d\\w-]+)\\/([a-z]{2}_[A-Z]{2})\\/base\\.js"); if (rxplayer.indexIn(replyString) != -1) { - html5_player = rxplayer.cap(1); - qDebug() << "RetrieveYoutubeUrl::videoPageLoaded: html5player:" << html5_player; + QString player = rxplayer.cap(1); + QString locale = rxplayer.cap(2); + qDebug() << "RetrieveYoutubeUrl::videoPageLoaded: html5player:" << player << "locale:" << locale; + html5_player = player +"/"+ locale; } video_page = replyString; diff -Nru smtube-17.1.0/src/smtube.pro smtube-17.5.0/src/smtube.pro --- smtube-17.1.0/src/smtube.pro 2017-01-31 21:36:42.000000000 +0000 +++ smtube-17.5.0/src/smtube.pro 2017-02-14 00:00:26.000000000 +0000 @@ -67,7 +67,7 @@ contains( DEFINES, YT_USE_SCRIPT ) { DEFINES += YT_USE_SIG - DEFINES += YT_USE_YTSIG + #DEFINES += YT_USE_YTSIG QT += script } diff -Nru smtube-17.1.0/src/smtube.rc smtube-17.5.0/src/smtube.rc --- smtube-17.1.0/src/smtube.rc 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/src/smtube.rc 2017-05-05 20:30:21.000000000 +0000 @@ -1,7 +1,7 @@ #include -#define SMTUBE_FILEVERSION 17,1,0,0 -#define SMTUBE_PRODVERSION "17.1.0.0\0" +#define SMTUBE_FILEVERSION 17,5,0,0 +#define SMTUBE_PRODVERSION "17.5.0.0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION SMTUBE_FILEVERSION diff -Nru smtube-17.1.0/src/translations/smtube_da.ts smtube-17.5.0/src/translations/smtube_da.ts --- smtube-17.1.0/src/translations/smtube_da.ts 2017-01-31 21:37:29.000000000 +0000 +++ smtube-17.5.0/src/translations/smtube_da.ts 2017-05-05 00:16:56.000000000 +0000 @@ -254,7 +254,7 @@ Connecting to %1 - Forbinder til %1 + Opretter forbindelse til %1 diff -Nru smtube-17.1.0/src/translations/smtube_fr.ts smtube-17.5.0/src/translations/smtube_fr.ts --- smtube-17.1.0/src/translations/smtube_fr.ts 2017-01-31 21:37:29.000000000 +0000 +++ smtube-17.5.0/src/translations/smtube_fr.ts 2017-05-05 00:16:56.000000000 +0000 @@ -6,7 +6,7 @@ About... - A propos... + À propos... @@ -31,7 +31,7 @@ Version: %1 - Version: %1 + Version : %1 @@ -46,7 +46,7 @@ Visit our website for updates: - Visitez notre site web pour les mises à  jour: + Visitez notre site web pour les mises à jour : @@ -139,12 +139,12 @@ About this &release - &A propos de cette &version + À propos de cette &version &About SMTube - &A propos de SMTube + &À propos de SMTube @@ -206,7 +206,7 @@ About this release - A propos de cette version + À propos de cette version @@ -226,7 +226,7 @@ Important: - Important: + Important : @@ -264,7 +264,7 @@ Installed version: %1 - Version installée: %1 + Version installée : %1 @@ -323,7 +323,7 @@ Preferred &quality: - &Qualité préférée: + &Qualité préférée : @@ -348,12 +348,12 @@ &Style: - &Style: + &Style : Font: - Police: + Police : @@ -448,17 +448,17 @@ &Name: - &Nom: + &Nom : &Executable: - &Exécutable: + &Exécutable : &Parameters: - &Paramètres: + &Paramètres : @@ -473,12 +473,12 @@ Preferred &quality: - &Qualité préférée: + &Qualité préférée : Add to &menu: - Ajouter dans le &menu: + Ajouter dans le &menu : diff -Nru smtube-17.1.0/src/version.cpp smtube-17.5.0/src/version.cpp --- smtube-17.1.0/src/version.cpp 2017-01-31 22:54:42.000000000 +0000 +++ smtube-17.5.0/src/version.cpp 2017-05-05 20:30:21.000000000 +0000 @@ -20,7 +20,7 @@ #define USE_SVN_VERSIONS 0 -#define VERSION "17.1.0" +#define VERSION "17.5.0" #if USE_SVN_VERSIONS #include "svn_revision.h"