Merge lp:~alivema4ever/ubuntu/trusty/smtube/lp-1350406-fix into lp:ubuntu/trusty/smtube

[Alif M. Ahmad]

Built for use with smplayer 14.3.0

[Jamie Strandboge (jdstrand)]

Thank you for preparing this merge request. Updating trusty to a new version like this does not meet the SRU criteria as laid out in https://wiki.ubuntu.com/StableReleaseUpdates. This would be better served to include in trusty-backports. See https://help.ubuntu.com/community/UbuntuBackports.

review: Disapprove

Unmerged revisions

7. By Alif M. Ahmad on 2014-07-30

Packaging 2.1-2 for trusty (lp: #1350406)

6. By Alessio Treglia on 2014-07-11

Add mpv as optional dependency. (Closes: #752590)

5. By Alessio Treglia on 2014-03-30

* New upstream release.
* Fix VCS field. (Closes: #722434)
* Update copyright holders of debian/* files.
* Bump Standards.

=== modified file 'Changelog'
--- Changelog	2013-10-03 17:16:56 +0000
+++ Changelog	2014-07-30 15:30:47 +0000
@@ -1,3 +1,62 @@
+Version 2.1:
+
+(2014-03-25)
+ * When saving DASH 1080, be sure the video and audio files 
+   have the same name.
+ * Disable the retry option for DASH streams since that option 
+   doesn't work well yet.
+
+(2014-03-24)
+ * Increase speed when downloading DASH streams.
+
+
+Version 2.0:
+
+(2014-03-10)
+ * If there's no 1080p video in the normal format, try
+   to download the 1080p video in the DASH format. That
+   actually downloads two files, a mp4 with the video only
+   and a m4a with the audio.
+
+(2014-03-09)
+ * Add an option to record audio.
+
+(2014-03-08)
+ * Use the user's country for default region.
+
+(2014-02-18)
+ * Add two actions to increase or reduce the font size
+   (shortcuts Ctrl+Plus and Ctrl+Minus).
+
+(2014-01-23)
+ * Add a patch to support AmigaOS4 by zzd10h:
+   http://forum.smplayer.info/viewtopic.php?f=4&t=7081
+
+(2014-01-17)
+ * Add the Italian translation.
+
+(2014-01-13)
+ * Add the French translation.
+
+(2013-12-05)
+ * Add mpv to the list of players.
+
+(2013-10-21)
+ * Add an option to add URL to the SMPlayer playlist.
+
+(2013-10-17)
+ * Replace the 'Most Rated' tab with 'Sports'.
+
+(2013-09-12)
+ * Keys work now in the video list.
+
+(2013-09-09)
+ * Improve support for the encrypted signatures of Youtube.
+
+(2013-08-30 - 2013-10-10)
+ * Adapt the code for Qt 5.
+
+
 Version 1.8:
 
 (2013-08-05) 

=== modified file 'Readme.txt'
--- Readme.txt	2013-04-13 00:30:34 +0000
+++ Readme.txt	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
     smtube - a small youtube browser
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'Release_notes.txt'
--- Release_notes.txt	2013-10-03 17:16:56 +0000
+++ Release_notes.txt	2014-07-30 15:30:47 +0000
@@ -1,3 +1,20 @@
+Version 2.1
+
+ * Improve the download speed for DASH formats.
+
+
+Version 2.0
+
+ * New option to record audio.
+ * Download 1080p in DASH format.
+ * The 'Most Rated' tab has been replaced with 'Sports'.
+ * An option to add the URL to the SMPlayer playlist has been added.
+ * A default region is selected according to the user's language and country.
+ * Better support for encrypted signatures.
+ * New translations: Italian and French.
+ * Possibility to compile with Qt 5.
+
+
 Version 1.8
 
  * Adapt for Youtube changes.

=== modified file 'create_deb.sh'
--- create_deb.sh	2013-10-03 17:16:56 +0000
+++ create_deb.sh	2014-07-30 15:30:47 +0000
@@ -4,7 +4,7 @@
 cp debian-rvm/changelog-orig debian-rvm/changelog
 
 ./get_svn_revision.sh
-#dch -v 1.8-`cat svn_revision` "New version"
+#dch -v 2.1-`cat svn_revision` "New version"
 
 #dpkg-buildpackage -rfakeroot
 

=== modified file 'debian-rvm/changelog-orig'
--- debian-rvm/changelog-orig	2013-10-03 17:16:56 +0000
+++ debian-rvm/changelog-orig	2014-07-30 15:30:47 +0000
@@ -1,3 +1,22 @@
+smtube (2.1) precise; urgency=low
+
+  * Improve the download speed for DASH formats.
+
+ -- Ricardo Villalba <[e-mail]>  Tue, 25 Mar 2014 23:03:47 +0100
+
+smtube (2.0) precise; urgency=low
+
+  * New option to record audio.
+  * Download 1080p in DASH format.
+  * The 'Most Rated' tab has been replaced with 'Sports'.
+  * An option to add the URL to the SMPlayer playlist has been added.
+  * A default region is selected according to the user's language and country.
+  * Better support for encrypted signatures.
+  * New translations: Italian and French.
+  * Possibility to compile with Qt 5.
+
+ -- Ricardo Villalba <[e-mail]>  Thu, 13 Mar 2014 23:22:31 +0100
+
 smtube (1.8) precise; urgency=low
 
   * Adapt for Youtube changes.

=== modified file 'debian-rvm/rules'
--- debian-rvm/rules	2013-02-13 11:48:44 +0000
+++ debian-rvm/rules	2014-07-30 15:30:47 +0000
@@ -34,7 +34,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) PREFIX=/usr
+	$(MAKE) PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4
 
 	touch $@
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 17:16:56 +0000
+++ debian/changelog	2014-07-30 15:30:47 +0000
@@ -1,3 +1,24 @@
+smtube (2.1-2ubuntu1) trusty; urgency=medium
+
+  * Packaging 2.1-2 for trusty (lp: #1350406)
+
+ -- Alif M. Ahmad <[e-mail]>  Wed, 30 Jul 2014 11:25:36 -0400
+
+smtube (2.1-2) unstable; urgency=medium
+
+  * Add mpv as optional dependency. (Closes: #752590)
+
+ -- Alessio Treglia <[e-mail]>  Fri, 11 Jul 2014 16:13:26 +0100
+
+smtube (2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix VCS field. (Closes: #722434)
+  * Update copyright holders of debian/* files.
+  * Bump Standards.
+
+ -- Alessio Treglia <[e-mail]>  Sun, 30 Mar 2014 19:03:04 +0100
+
 smtube (1.8-1) unstable; urgency=low
 
   * Upload to unstable.

=== modified file 'debian/control'
--- debian/control	2013-02-13 11:48:44 +0000
+++ debian/control	2014-07-30 15:30:47 +0000
@@ -8,15 +8,15 @@
  debhelper (>= 9~),
  libqt4-dev (>= 4.3),
  zlib1g-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://smplayer.sourceforge.net/smtube.php
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/smplayer.git
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/smtube.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/smtube.git
 
 Package: smtube
 Architecture: any
 Depends:
- smplayer | mplayer2 | mplayer | vlc | totem | gnome-mplayer,
+ smplayer | mplayer2 | mpv | mplayer | vlc | totem | gnome-mplayer,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: YouTube videos browser

=== modified file 'debian/copyright'
--- debian/copyright	2013-04-13 00:30:34 +0000
+++ debian/copyright	2014-07-30 15:30:47 +0000
@@ -24,7 +24,7 @@
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2013 Alessio Treglia <[e-mail]>
+Copyright: 2013-2014 Alessio Treglia <[e-mail]>
 License: GPL-2+
 
 License: GPL-2+

=== modified file 'smtube.desktop'
--- smtube.desktop	2013-02-13 11:48:44 +0000
+++ smtube.desktop	2014-07-30 15:30:47 +0000
@@ -4,7 +4,7 @@
 Comment[es]=Permite realizar búsquedas y descargar vídeos de YouTube
 Comment[ja]=YouTube �らビデオを検索�よ�ダウンロード���
 Comment[pt]=Procurar e transferir vídeos do YouTube
-Comment[eu]=YouTubeko bideoak bilatzea eta jeistea ahalbidetzen du
+Comment[eu]=Bilatu eta jeitsi bideoak YouTube-tik
 Comment[zh_CN]=�索和下载 YouTube 视频
 GenericName=Youtube Browser
 GenericName[es]=Buscar vídeos en YouTube
@@ -16,7 +16,7 @@
 Name=SMPlayer YouTube Browser
 Name[ja]=SMPlayer - YouTube ブラウザー
 Name[pt]=SMPlayer - Explorador YouTube
-Name[eu]=SMPlayer - YouTube Bilatzailea
+Name[eu]=SMPlayer - YouTube Nabigatzailea
 Name[zh_CN]=SMPlayer - YouTube �览器
 Type=Application
 Categories=Qt;KDE;AudioVideo;Player;Video;

=== added directory 'src/Amiga'
=== added file 'src/Amiga.info'
Binary files src/Amiga.info	1970-01-01 00:00:00 +0000 and src/Amiga.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/AmigaOS4_ReadMe.txt'
--- src/Amiga/AmigaOS4_ReadMe.txt	1970-01-01 00:00:00 +0000
+++ src/Amiga/AmigaOS4_ReadMe.txt	2014-07-30 15:30:47 +0000
@@ -0,0 +1,66 @@
+SMTube for AmigaOS 4.1
+
+
+SMTube for AmigaOS4 is a port of SMTube for AmigaOS 4 computers (aka Amiga-NG, successor of popular Classic Commodore Amiga) 
+
+
+A) Building 
+
+Prerequisites : 
+
+- AmigaOS4 SDK (Hyperion website) 
+
+- Qt port from Alfkil Thorbjørn Wennermark (OS4Depot) 
+
+
+1- Download the current svn sources : 
+
+svn co https://subversion.assembla.com/svn/smplayer/smtube/trunk/ smtube 
+
+2- in the SMTube svn drawer, in a CLI window, type : 
+
+sh 
+
+./get_svn_revision.sh to build the svn version file used in version.cpp 
+
+cd src 
+
+qmake *to build the Qt project file*
+
+gmake *to build SMTube*
+
+lrelease smtube.pro *to build the translations files. Cancel Requesters if needed*
+
+cd Amiga 
+
+rx Populate_info.rexx *to copy the .info file for SMTube executable, Amiga and Translations drawers*
+
+
+B) Usage ? 
+
+Before launching SMTube, review Amiga/PlayVideo.rexx file to 
+
+1- specify the location of your MPlayer binary (stream support needed, MUIMplayer or SDLMplayer) 
+example: MPLAYER = "APPDIR:MPlayer" 
+
+2- optionally, add options to MPlayer 
+For example: MPLAYER_OPTIONS = "-vo cgx_wpa -cache 8192"  for MUIMplayer on NON overlay compatible system. 
+
+3- optionally, specify the position of the output console 
+For example: MPLAYER_CONSOLE = "1450/975/465/99"  to get a log console in the bottom right corner on a 1920x1080 screen 
+
+4- optionally, specify the number of seconds that the Console will be kept opened after MPlayer has started. 
+Could be useful to debug if the streaming failed. 
+SECONDS = 10 
+
+
+Many thanks to : 
+
+Ricardo 'rvm' Villalba for his SMTube program and for having included AmigaOS4 modifications 
+
+Alfkil Thorbjørn Wennermark for the AmigaOS 4.1 port of Qt
+
+
+  
+Guillaume 'zzd10h' Boesel 
+2014/01/23 
\ No newline at end of file

=== added file 'src/Amiga/AmigaOS4_ReadMe.txt.info'
Binary files src/Amiga/AmigaOS4_ReadMe.txt.info	1970-01-01 00:00:00 +0000 and src/Amiga/AmigaOS4_ReadMe.txt.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/OpenWorkbench.rexx'
--- src/Amiga/OpenWorkbench.rexx	1970-01-01 00:00:00 +0000
+++ src/Amiga/OpenWorkbench.rexx	2014-07-30 15:30:47 +0000
@@ -0,0 +1,17 @@
+/* REXX */
+parse arg PATH
+ADDRESS WORKBENCH
+
+PATH = right(PATH,length(PATH)-1)
+A = pos("/",PATH)
+if A > 0,
+then do
+  /*say A*/
+  PATH = OVERLAY(':',PATH,A)
+end
+
+PATH = INSERT('"',PATH)
+PATH = INSERT('"',PATH,length(PATH))
+/*say PATH*/
+
+WINDOW PATH OPEN
\ No newline at end of file

=== added file 'src/Amiga/OpenWorkbench.rexx.info'
Binary files src/Amiga/OpenWorkbench.rexx.info	1970-01-01 00:00:00 +0000 and src/Amiga/OpenWorkbench.rexx.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/PlayVideo.rexx'
--- src/Amiga/PlayVideo.rexx	1970-01-01 00:00:00 +0000
+++ src/Amiga/PlayVideo.rexx	2014-07-30 15:30:47 +0000
@@ -0,0 +1,103 @@
+/* REXX */
+parse arg type url
+
+/* UPDATE THESE PARAMETERS IF NEEDED */
+
+/* TAKE CARE TO SPECIFY THE PATH OF MUI-MPlayer OR SDL MPlayer SVN-r32561 TO ALLOW STREAMING IN OPTION MPLAYER = "" */  
+/* Others players or, even, other versions of MPlayer are NOT supported */  
+
+
+MPLAYER_OPTIONS = ""					
+DEBUG = ON
+WAIT = ON
+SECONDS = 10
+MPLAYER = "APPDIR:MPlayer" 
+MPLAYER_CONSOLE = "0/400/640/400" 
+/*MPLAYER_CONSOLE = "1450/975/465/99" */	/* console in lower right corner ONLY for 1920x1080 screen */
+
+
+/* END OF UPDATABLES PARAMETERS */
+
+/* examples */
+/*MPLAYER = "APPDIR:MPlayer_SDL_1.1.4" */
+/*MPLAYER = "APPDIR:MPlayer_MUI" */	 	
+/*MPLAYER_OPTIONS = "-vo cgx_wpa -cache 8192" */		/* for MUI-Mplayer without overlay */
+
+
+/* DON'T MODIFY BELOW THESE LINES */
+/* DON'T MODIFY BELOW THESE LINES */
+/* DON'T MODIFY BELOW THESE LINES */
+/* DON'T MODIFY BELOW THESE LINES */
+
+
+/* for SDL-MPlayer 4.2.4 complaining about a HTTP: assign at startup */
+ADDRESS COMMAND "ASSIGN http: RAM:"
+
+
+if type = "file",		/* pour lire les vidéos déjà téléchargées */
+then do
+	url = strip(url)
+	url = right(url,length(url)-1)
+	A = pos("/",url)
+	if A > 0,
+	then do
+ 	 url = OVERLAY(':',url,A)
+	end
+
+	url = INSERT('"',url)
+	url = INSERT('"',url,length(url))
+end
+
+if DEBUG = ON, 
+then do
+	/* console open for debug log */
+	call close STDOUT		
+	/*open(STDOUT, 'con:0/400/640/400/smTube AmigaOS4 console/CLOSE',W) */
+	open(STDOUT, 'con:'MPLAYER_CONSOLE'/smTube AmigaOS4 console/CLOSE',W) 
+
+	say "URL = "url
+	say "Mplayer options ="MPLAYER_OPTIONS 
+
+	ADDRESS COMMAND MPLAYER MPLAYER_OPTIONS url
+
+	SAY " "	
+	SAY "-------------------------  smTube AmigaOS4  -------------------------"
+	SAY " "
+	SAY "If you encounter playback problems, check MPlayer option (MPLAYER_OPTIONS = " ") in Amiga\PlayVideo.rexx."
+	SAY " "
+	SAY "Streaming seems to work only with MUI-Mplayer (MPlayer UNKNOWN-4.4.3 (C) 2000-2010 MPlayer Team)"
+	SAY "or SDL MPlayer SVN-r32561-snapshot-4.2.4"
+	SAY " "
+	SAY "This DEBUG console can be turned OFF in Amiga\PlayVideo.rexx (DEBUG = OFF)."
+	SAY " "	
+
+	if wait = ON, 
+	then do
+		SAY "Waiting "SECONDS" seconds before to close this debug window..."
+		SAY " "
+		SAY "Wait seconds can be modified in Amiga\PlayVideo.rexx (SECONDS = x)"
+		SAY " "
+		SAY "Wait time can be turned OFF in Amiga\PlayVideo.rexx (WAIT = OFF)"
+		SAY " "
+		SAY "----------------------------------------------------------------------"
+		ADDRESS COMMAND "WAIT "SECONDS	
+	end	
+	else do
+		SAY "----------------------------------------------------------------------"
+	end
+
+	call close STDOUT
+end
+else do	
+	/* no debug output */
+	ADDRESS COMMAND MPLAYER MPLAYER_OPTIONS url ">NIL: *>NIL:"
+end
+
+
+EXIT
+
+
+	
+
+
+

=== added file 'src/Amiga/PlayVideo.rexx.info'
Binary files src/Amiga/PlayVideo.rexx.info	1970-01-01 00:00:00 +0000 and src/Amiga/PlayVideo.rexx.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/Populate_info.rexx'
--- src/Amiga/Populate_info.rexx	1970-01-01 00:00:00 +0000
+++ src/Amiga/Populate_info.rexx	2014-07-30 15:30:47 +0000
@@ -0,0 +1,9 @@
+/* REXX */
+
+ADDRESS COMMAND 'COPY icons/smtube.info  TO /smtube.info ALL CLONE QUIET'
+ADDRESS COMMAND 'COPY icons/Amiga.info  TO /Amiga.info ALL CLONE QUIET'	
+ADDRESS COMMAND 'COPY icons/AmigaOS4_ReadMe.txt.info  TO AmigaOS4_ReadMe.txt.info ALL CLONE QUIET'	
+ADDRESS COMMAND 'COPY icons/translations.info  TO /translations.info ALL CLONE QUIET'			
+ADDRESS COMMAND 'PROTECT PlayVideo.rexx +S QUIET'	
+ADDRESS COMMAND 'PROTECT OpenWorkbench.rexx +S QUIET'	
+exit
\ No newline at end of file

=== added file 'src/Amiga/Populate_info.rexx.info'
Binary files src/Amiga/Populate_info.rexx.info	1970-01-01 00:00:00 +0000 and src/Amiga/Populate_info.rexx.info	2014-07-30 15:30:47 +0000 differ
=== added directory 'src/Amiga/Videos'
=== added file 'src/Amiga/Videos.info'
Binary files src/Amiga/Videos.info	1970-01-01 00:00:00 +0000 and src/Amiga/Videos.info	2014-07-30 15:30:47 +0000 differ
=== added directory 'src/Amiga/icons'
=== added file 'src/Amiga/icons.info'
Binary files src/Amiga/icons.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/icons/Amiga.info'
Binary files src/Amiga/icons/Amiga.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons/Amiga.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/icons/AmigaOS4_ReadMe.txt.info'
Binary files src/Amiga/icons/AmigaOS4_ReadMe.txt.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons/AmigaOS4_ReadMe.txt.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/icons/smtube.info'
Binary files src/Amiga/icons/smtube.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons/smtube.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/icons/smtube_Drawer.info'
Binary files src/Amiga/icons/smtube_Drawer.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons/smtube_Drawer.info	2014-07-30 15:30:47 +0000 differ
=== added file 'src/Amiga/icons/translations.info'
Binary files src/Amiga/icons/translations.info	1970-01-01 00:00:00 +0000 and src/Amiga/icons/translations.info	2014-07-30 15:30:47 +0000 differ
=== modified file 'src/about.cpp'
--- src/about.cpp	2013-10-03 17:16:56 +0000
+++ src/about.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 
     info->setHtml(
         "<b>"+ tr("YouTube%1 Browser for SMPlayer").arg(QChar(0x2122)) +"</b>"
-        "<p>&copy; 2012-2013 Ricardo Villalba &lt;[e-mail]&gt;" + 
+        "<p>&copy; 2012-2014 Ricardo Villalba &lt;[e-mail]&gt;" + 
         "<br>" + tr("Based on UMPlayer") + " &copy; 2010 Ori Rejwan" 
         "<p><b>" +
         tr("Version: %1").arg(smtubeVersion()) + "</b>"
@@ -89,35 +89,55 @@
 
 QString About::getTranslators() {
 	return QString(
-		 tr("The following people have contributed with translations:") +
-         "<p>" + 
-         trad(tr("Spanish"), "Ricardo Villalba <[e-mail]>") +
-         trad(tr("Russian"), QString::fromUtf8("Белый Владимир <[e-mail]>")) +
-         trad(tr("Lithuanian"), QString::fromUtf8("Algimantas Margevi�ius <[e-mail]>")) +
-         trad(tr("Japanese"), "Nardog <[e-mail]>") +
-         trad(tr("Simplified-Chinese"), "OpenBDH <[e-mail]>") +
-         trad(tr("Basque"), "Xabier Aramendi <[e-mail]>") +
-         trad(tr("Portuguese"), QString::fromUtf8("Sérgio Marques <[e-mail]>")) +
-         trad(tr("Hungarian"), "Gojko <[e-mail]>") +
-         trad(tr("Polish"), "Adam <[e-mail]>") +
-         trad(tr("Galician"), QString::fromUtf8("Adrián Chaves Fernández <[e-mail]>")) +
-         trad(tr("Greek"), "dglent") +
-         trad(tr("Hebrew"), "Genghis Khan <[e-mail]>") +
-         trad(tr("Portuguese (Brazil)"), QString::fromUtf8("Maico Sertório <[e-mail]>")) +
-         trad(tr("Ukrainian"), "zubr139 (transifex)") +
-         trad(tr("Norwegian Nynorsk"), "bjorni (transifex)") +
-         trad(tr("Czech"), QString::fromUtf8("Petr Šimá�ek (transifex)")) +
-         trad(tr("Malay"), "abuyop (transifex)") +
-         trad(tr("Swedish"), QStringList() << "XC (transifex)" << "Andreas Gustafsson (transifex)") +
-         trad(tr("Turkish"), QStringList() << "Emre FIRAT (transifex)" << QString::fromUtf8("Hasan Akgöz (transifex)")) +
-         trad(tr("Finnish"), QString::fromUtf8("Jiri Grönroos (transifex)")) +
-         trad(tr("Georgian"), "George Machitidze (transifex)") +
-         trad(tr("Serbian"), QStringList() << QString::fromUtf8("Mladen Pejaković (transifex)") << "miroslav (transifex)") +
-         trad(tr("Croatian"), "gogo (transifex)") +
-         trad(tr("Bulgarian"), "Ivailo Monev (transifex)") +
-         trad(tr("Vietnamese"), QStringList() << "Phan Anh (transifex)" << "Biz Over (transifex)" << "Thu Thao Nguyen Ngoc (transifex)") +
-         trad(tr("Indonesian"), "Mohamad Hasan Al Banna (transifex)") +
-         "");
+		 tr("Many people contributed with translations.") +" "+
+		 tr("You can also help to translate SMPlayer into your own language.") +"<p>"+
+		 tr("Visit %1 and join a translation team.").arg("<a href=\"http://www.transifex.com/projects/p/smplayer/\">http://www.transifex.com/projects/p/smplayer/</a>") +
+		"<p>" +
+		 tr("Current translators from the transifex teams:") +
+		"<p>" + 
+		trad(tr("Spanish"), "Ricardo Villalba") +
+		trad(tr("Basque"), "Xabier Aramendi") +
+		trad(tr("Croatian"), "Gogo") +
+		trad(tr("Czech"), QStringList() << QString::fromUtf8("Petr Šimá�ek") << QString::fromUtf8("Jakub Kožíšek")) +
+		trad(tr("Japanese"), QStringList() << "Ever_green" << "Nardog") +
+		trad(tr("Korean"), QStringList() << "ParkJS" << "Potato") +
+		trad(tr("Portuguese"), QStringList() << QString::fromUtf8("Sérgio Marques") << "Hugo Carvalho") +
+		trad(tr("Serbian"), QStringList() << QString::fromUtf8("Mladen Pejaković") << "Miroslav" << "Rancher") +
+		trad(tr("Ukrainian"), QStringList() << "Zubr139" << "evmir2") +
+		trad(tr("Galician"), QStringList() << QString::fromUtf8("Adrián Chaves Fernández") << "Miguel Branco" << "antiparvos") +
+		trad(tr("Lithuanian"), QString::fromUtf8("Algimantas Margevi�ius")) +
+		trad(tr("Malay"), "Abuyop") +
+		trad(tr("Portuguese - Brazil"), QStringList() << QString::fromUtf8("Maico Sertório") << "Vinicius" << "Ronnie Dilli" << QString::fromUtf8("Lucas Simões")) +
+		trad(tr("Hebrew"), "GenghisKhan") +
+		trad(tr("Simplified Chinese"), QStringList() << "OpenBDH" << "Zhangzheliuli" << "Zhnagmin" << "wwj402" << "775405984") +
+		trad(tr("Vietnamese"), QStringList() << "Anh Phan" << "Biz Over" << "Thu Thao Nguyen Ngoc" << "Duy Truong Nguyen") +
+		trad(tr("Polish"), QStringList() <<"Filux" << QString::fromUtf8("�ukasz Hryniuk") << QString::fromUtf8("Piotr Strębski") << QString::fromUtf8("Michał Trzebiatowski") << "Grzegorz Pruchniakowski") +
+		trad(tr("Russian"), QStringList() << "WiseLord" << "Viktor" << "DmitryKX" << "Gleb Mekhrenin" << "ElFrio" << "Semen V. Dubina" << "Denis" << "angry_snake" << "Andrei Stepanov") +
+		trad(tr("French"), QStringList() << "Olivier Devineau" << "Ybsar" << "Janmaro" << "Guillaume 'zzd10h' Boesel" << "tneskovic" << "Calinou") +
+		trad(tr("Indonesian"), QStringList() << "Mohamad Hasan Al Banna" << "Aulia Firdaus Simbolon" << "Muhammad Fikri Hariri") +
+		trad(tr("Danish"), "Michael Larsen") +
+		trad(tr("Hungarian"), QStringList() << "Gojko" << QString::fromUtf8("Zsolt Péter Basák") << "chris020891") +
+		trad(tr("Turkish"), QStringList() << "Emre Firat" << QString::fromUtf8("Hasan Akgöz") << QString::fromUtf8("�куп")) +
+		trad(tr("Finnish"), QString::fromUtf8("Jiri Grönroos")) +
+		trad(tr("German"), QStringList() << "Shaggy" << QString::fromUtf8("Michał Trzebiatowski") << "Eclipse" << "j5lx" << "Tobias Bannert") +
+		trad(tr("Traditional Chinese"), QStringList() << "Taijuin Lee" << "Wpliao" << QString::fromUtf8("冥王�西里斯")) +
+		trad(tr("Bulgarian"), QStringList() << "Ivailo Monev" << QString::fromUtf8("Радо�лав") << "Elusiv_man") +
+		trad(tr("Norwegian Nynorsk"), QStringList() << "Bjorni" << "F_Sauce") +
+		trad(tr("Swedish"), QStringList() << "XC" << "Andreas Gustafsson") +
+		trad(tr("Arabic"), QStringList() << "Riyadh" << "Muhammad Fawwaz Orabi" << "Mohamed Sakhri") +
+		trad(tr("Georgian"), "George Machitidze") +
+		trad(tr("Arabic - Saudi Arabia"), "Mohamed") +
+		trad(tr("Sinhala"), "Rathnayake") +
+		trad(tr("Greek"), QString::fromUtf8("Γιάννης Ανθυμίδης")) +
+		trad(tr("Estonian"), QString::fromUtf8("Olav Mägi")) +
+		trad(tr("N'ko"), QStringList() << QString::fromUtf8("Kairaba Cissé") << "Youssouf Diaby" << "Lasnei Kante" << "Kante Soufiane") +
+		trad(tr("Italian"), QStringList() << "Damtux" << "Samir Hawamdeh" << "Fabio Mazza") +
+		trad(tr("Uzbek"), "Umid Almasov") +
+		trad(tr("Catalan"), QStringList() << "Anna Fenoy" << "Jmontane") +
+		trad(tr("Slovak"), QString::fromUtf8("Ján Ďanovský")) +
+		trad(tr("British English"), "F_Sauce") +
+		trad(tr("Albanian"), "rigels.gordani") +
+		"");
 }
 
 QString About::trad(const QString & lang, const QString & author) {
@@ -129,9 +149,10 @@
 	for (int n = 0; n < authors.count(); n++) {
 		QString author = authors[n];
 		s += author.replace("<", "&lt;").replace(">", "&gt;");
-		if (n < (authors.count()-1)) s += "<br>";
+		if (n < (authors.count()-1)) s += ", ";
 	}
-	return QString("<h3>%1:</h3><h4>%2</h4><hr>").arg(lang).arg(s);
+	//return QString("<h3>%1:</h3><h4>%2</h4><hr>").arg(lang).arg(s);
+	return QString("<p><b>%1</b>: %2</p>").arg(lang).arg(s);
 }
 
 QString About::link(const QString & url, QString name) {

=== modified file 'src/about.h'
--- src/about.h	2013-04-13 00:30:34 +0000
+++ src/about.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/codedownloader.cpp'
--- src/codedownloader.cpp	2013-10-03 17:16:56 +0000
+++ src/codedownloader.cpp	2014-07-30 15:30:47 +0000
@@ -112,7 +112,9 @@
 }
 
 void CodeDownloader::updateDataReadProgress(qint64 bytes_read, qint64 total_bytes) {
+#ifndef QT_NO_DEBUG_OUTPUT
 	qDebug() << "CodeDownloader::updateDataReadProgress: " << bytes_read << " " << total_bytes;
+#endif
 	if (total_bytes > -1) {
 		setMaximum(total_bytes);
 		setValue(bytes_read);

=== modified file 'src/codedownloader.h'
--- src/codedownloader.h	2013-10-03 17:16:56 +0000
+++ src/codedownloader.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2006-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/configdialog.cpp'
--- src/configdialog.cpp	2013-10-03 17:16:56 +0000
+++ src/configdialog.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,56 +19,23 @@
 #include "configdialog.h"
 #include "ytdialog.h"
 #include "retrieveyoutubeurl.h"
+#include "regions.h"
 
 ConfigDialog::ConfigDialog(QWidget * parent, Qt::WindowFlags f)
     : QDialog(parent, f) 
 {
     setupUi(this);
- 
+
     directory_edit->setDialogType(FileChooser::GetDirectory);
     //layout()->setSizeConstraint(QLayout::SetFixedSize);
 
-    region_combo->addItem( tr("Argentina"), "AR");
-    region_combo->addItem( tr("Australia"), "AU");
-    //region_combo->addItem( tr("Austria"), "AT"); // Invalid code :?
-    region_combo->addItem( tr("Belgium"), "BE");
-    region_combo->addItem( tr("Brazil"), "BR");
-    region_combo->addItem( tr("Canada"), "CA");
-    region_combo->addItem( tr("Chile"), "CL");
-    region_combo->addItem( tr("Colombia"), "CO");
-    region_combo->addItem( tr("Czech Republic"), "CZ");
-    region_combo->addItem( tr("Egypt"), "EG");
-    region_combo->addItem( tr("France"), "FR");
-    region_combo->addItem( tr("Germany"), "DE");
-    region_combo->addItem( tr("Great Britain"), "GB");
-    region_combo->addItem( tr("Hong Kong"), "HK");
-    region_combo->addItem( tr("Hungary"), "HU");
-    region_combo->addItem( tr("India"), "IN");
-    region_combo->addItem( tr("Ireland"), "IE");
-    region_combo->addItem( tr("Israel"), "IL");
-    region_combo->addItem( tr("Italy"), "IT");
-    region_combo->addItem( tr("Japan"), "JP");
-
-    region_combo->addItem( tr("Jordan"), "JO");
-    region_combo->addItem( tr("Malaysia"), "MY");
-    region_combo->addItem( tr("Mexico"), "MX");
-    region_combo->addItem( tr("Morocco"), "MA");
-    region_combo->addItem( tr("Netherlands"), "NL");
-    region_combo->addItem( tr("New Zealand"), "NZ");
-    region_combo->addItem( tr("Peru"), "PE");
-    region_combo->addItem( tr("Philippines"), "PH");
-    region_combo->addItem( tr("Poland"), "PL");
-    region_combo->addItem( tr("Russia"), "RU");
-    region_combo->addItem( tr("Saudi Arabia"), "SA");
-    region_combo->addItem( tr("Singapore"), "SG");
-    region_combo->addItem( tr("South Africa"), "ZA");
-    region_combo->addItem( tr("South Korea"), "KR");
-    region_combo->addItem( tr("Spain"), "ES");
-    region_combo->addItem( tr("Sweden"), "SE");
-    //region_combo->addItem( tr("Switzerland"), "CH"); // Invalid code :?
-    region_combo->addItem( tr("Taiwan"), "TW");
-    region_combo->addItem( tr("United Arab Emirates"), "AE");
-    region_combo->addItem( tr("United States"), "US");
+	// Populate the region_combo combobox
+	QMap<QString,QString> regions_list = Regions::list();
+	QMapIterator<QString,QString> it(regions_list);
+	while (it.hasNext()) {
+		it.next();
+		region_combo->addItem( it.value(), it.key() );
+	}
 
     time_combo->addItem( tr("All time"), "all_time");
     time_combo->addItem( tr("This month"), "this_month");
@@ -101,10 +68,16 @@
 	record_quality_combo->addItem( "1080p (webm)", RetrieveYoutubeUrl::WEBM_1080p );
 
 #ifdef Q_OS_WIN
-    playback_group->hide();
+	playback_group->hide();
+#else
+#ifndef USE_PLAYERS
+	player_widget->hide();
+#endif
 #endif
 
+#ifdef USE_PLAYERS
     connect(player_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(playerChanged(int)));
+#endif
 
     adjustSize();
 }
@@ -131,6 +104,7 @@
 	return record_quality_combo->itemData(index).toInt();
 }
 
+#ifdef USE_PLAYERS
 void ConfigDialog::setPlayerNames(QStringList names)
 {
     player_combo->clear();
@@ -158,6 +132,7 @@
 		playback_quality_label->setEnabled(true);
 	}
 }
+#endif
 
 void ConfigDialog::setRegion(const QString & region) {
     int i = region_combo->findData(region);

=== modified file 'src/configdialog.h'
--- src/configdialog.h	2013-10-03 17:16:56 +0000
+++ src/configdialog.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -35,8 +35,10 @@
     void setRecordingDirectory( const QString & folder );
     void setRecordingQuality( int quality );
     void setPlaybackQuality( int quality );
+#ifdef USE_PLAYERS
     void setPlayerNames(QStringList names);
     void setPlayer(QString name);
+#endif
     void setRegion(const QString & region);
     void setPeriod(const QString & period);
 
@@ -44,12 +46,16 @@
     QString recordingDirectory();
     int recordingQuality();
     int playbackQuality();
+#ifdef USE_PLAYERS
     QString player();
+#endif
     QString region();
     QString period();
 
+#ifdef USE_PLAYERS
 protected slots:
     void playerChanged(int);
+#endif
 };
 
 #endif

=== modified file 'src/configdialog.ui'
--- src/configdialog.ui	2013-10-03 17:16:56 +0000
+++ src/configdialog.ui	2014-07-30 15:30:47 +0000
@@ -13,13 +13,13 @@
   <property name="windowTitle">
    <string>Settings</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="recording_group">
      <property name="title">
       <string>Recording</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -79,7 +79,7 @@
      <property name="title">
       <string>Playback</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -111,34 +111,42 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>&amp;Player:</string>
-          </property>
-          <property name="buddy">
-           <cstring>player_combo</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="player_combo"/>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       <widget class="QWidget" name="player_widget" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>&amp;Player:</string>
+           </property>
+           <property name="buddy">
+            <cstring>player_combo</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="player_combo"/>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
       </item>
      </layout>
     </widget>

=== modified file 'src/downloadfile.cpp'
--- src/downloadfile.cpp	2013-04-13 00:30:34 +0000
+++ src/downloadfile.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 
 void DownloadFile::getRequest(QString url)
 {
-        QUrl realUrl = QUrl::fromEncoded(url.toAscii(), QUrl::StrictMode);
+        QUrl realUrl = QUrl::fromEncoded(url.toLatin1(), QUrl::StrictMode);
         getRequest(realUrl);
 }
 
@@ -64,7 +64,9 @@
         static unsigned int count = 0;
         count++;
 
-        if (count % 50 == 0) 
+        #if QT_VERSION < 0x050000
+        if (count % 50 == 0)
+        #endif
         {
             totalSize = total;
             completed = bytesReceived;
@@ -207,10 +209,6 @@
                 file->close();
                 emit errorOcurred((int)error);
         }
-        /*
-        else
-                qDebug() << "Hello Darling";
-        */
 }
 
 #include "moc_downloadfile.cpp"

=== modified file 'src/downloadfile.h'
--- src/downloadfile.h	2013-04-13 00:30:34 +0000
+++ src/downloadfile.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/filechooser.cpp'
--- src/filechooser.cpp	2013-04-13 00:30:34 +0000
+++ src/filechooser.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/filechooser.h'
--- src/filechooser.h	2013-04-13 00:30:34 +0000
+++ src/filechooser.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== added file 'src/fontpref.h'
--- src/fontpref.h	1970-01-01 00:00:00 +0000
+++ src/fontpref.h	2014-07-30 15:30:47 +0000
@@ -0,0 +1,28 @@
+/*  smtube, a small youtube browser.
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef FONTPREF_H
+#define FONTPREF_H
+
+class FontPref
+{
+public:
+	static int base_size;
+};
+
+#endif

=== added file 'src/hcplayer.h'
--- src/hcplayer.h	1970-01-01 00:00:00 +0000
+++ src/hcplayer.h	2014-07-30 15:30:47 +0000
@@ -0,0 +1,53 @@
+/*  smtube, a small youtube browser.
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef HCPLAYERS_H
+#define HCPLAYERS_H
+
+#ifdef Q_OS_WIN
+
+#define HCPLAYER_EXECUTABLE qApp->applicationDirPath() + "/smplayer.exe"
+#define HCPLAYER_DIRECTPLAY true
+#define HCPLAYER_TITLEOPTION QString::null
+
+#else
+
+#ifdef Q_OS_AMIGA //zzd10h
+
+#define HCPLAYER_EXECUTABLE "Amiga/PlayVideo.rexx"
+#define HCPLAYER_DIRECTPLAY false
+#define HCPLAYER_TITLEOPTION QString::null
+
+#else
+
+#define HCPLAYER_EXECUTABLE "smplayer"
+#define HCPLAYER_DIRECTPLAY true
+#define HCPLAYER_TITLEOPTION QString::null
+
+#endif
+
+/*
+#define HCPLAYER_EXECUTABLE "mplayer"
+#define HCPLAYER_DIRECTPLAY false
+#define HCPLAYER_TITLEOPTION "-title "
+*/
+
+#endif
+
+#endif // HCPLAYERS_H
+

=== modified file 'src/icons.qrc'
--- src/icons.qrc	2013-04-13 00:30:34 +0000
+++ src/icons.qrc	2014-07-30 15:30:47 +0000
@@ -24,5 +24,17 @@
         <file>icons/previous.png</file>
         <file>icons/next.png</file>
         <file>icons/recordings.png</file>
+        <file>icons/stage01.png</file>
+        <file>icons/stage02.png</file>
+        <file>icons/stage03.png</file>
+        <file>icons/stage04.png</file>
+        <file>icons/stage05.png</file>
+        <file>icons/stage06.png</file>
+        <file>icons/stage07.png</file>
+        <file>icons/stage08.png</file>
+        <file>icons/stage09.png</file>
+        <file>icons/stage10.png</file>
+        <file>icons/stage11.png</file>
+        <file>icons/stage12.png</file>
     </qresource>
 </RCC>

=== added file 'src/icons/stage01.png'
Binary files src/icons/stage01.png	1970-01-01 00:00:00 +0000 and src/icons/stage01.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage02.png'
Binary files src/icons/stage02.png	1970-01-01 00:00:00 +0000 and src/icons/stage02.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage03.png'
Binary files src/icons/stage03.png	1970-01-01 00:00:00 +0000 and src/icons/stage03.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage04.png'
Binary files src/icons/stage04.png	1970-01-01 00:00:00 +0000 and src/icons/stage04.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage05.png'
Binary files src/icons/stage05.png	1970-01-01 00:00:00 +0000 and src/icons/stage05.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage06.png'
Binary files src/icons/stage06.png	1970-01-01 00:00:00 +0000 and src/icons/stage06.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage07.png'
Binary files src/icons/stage07.png	1970-01-01 00:00:00 +0000 and src/icons/stage07.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage08.png'
Binary files src/icons/stage08.png	1970-01-01 00:00:00 +0000 and src/icons/stage08.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage09.png'
Binary files src/icons/stage09.png	1970-01-01 00:00:00 +0000 and src/icons/stage09.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage10.png'
Binary files src/icons/stage10.png	1970-01-01 00:00:00 +0000 and src/icons/stage10.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage11.png'
Binary files src/icons/stage11.png	1970-01-01 00:00:00 +0000 and src/icons/stage11.png	2014-07-30 15:30:47 +0000 differ
=== added file 'src/icons/stage12.png'
Binary files src/icons/stage12.png	1970-01-01 00:00:00 +0000 and src/icons/stage12.png	2014-07-30 15:30:47 +0000 differ
=== modified file 'src/lineedit_with_icon.cpp'
--- src/lineedit_with_icon.cpp	2013-04-13 00:30:34 +0000
+++ src/lineedit_with_icon.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/lineedit_with_icon.h'
--- src/lineedit_with_icon.h	2013-04-13 00:30:34 +0000
+++ src/lineedit_with_icon.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-10-03 17:16:56 +0000
+++ src/main.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,12 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifdef USE_SINGLE_APPLICATION
 #include "QtSingleApplication"
+#else
+#include <QApplication>
+#endif
+
 #include <QTranslator>
 #include <QLibraryInfo>
 #include <QSettings>
@@ -84,7 +89,11 @@
 
 int main( int argc, char ** argv ) 
 {
+#ifdef USE_SINGLE_APPLICATION
 	QtSingleApplication a("smtube", argc, argv);
+#else
+	QApplication a(argc, argv);
+#endif
 	/* a.setWheelScrollLines(1); */
 
 	QString search_term;
@@ -103,6 +112,7 @@
 		search_term = args[n];
 	}
 
+#ifdef USE_SINGLE_APPLICATION
 	QString message;
 	if (!search_term.isEmpty()) message = "search " + search_term;
 	if (a.isRunning()) { 
@@ -110,6 +120,7 @@
 		qDebug("Another instance is running. Exiting.");
 		return 0;
 	}
+#endif
 	a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
 
 	QString locale = QLocale::system().name();
@@ -133,17 +144,18 @@
 	YTDialog * yt = new YTDialog(0, &settings);
 
 #ifdef YT_USE_SCRIPT
-	QString ytcode_name = "ytcode.script";
+	QString ytcode_name = "yt.js";
 	QString ytcode_file = configPath() +"/"+ ytcode_name;
 	if (QFile::exists(smplayerConfigPath())) ytcode_file = smplayerConfigPath() +"/"+ ytcode_name;
 	qDebug("ytcode_file: %s", ytcode_file.toUtf8().constData());
 	yt->setScriptFile(ytcode_file);
 #endif
 
+#ifdef USE_SINGLE_APPLICATION
 	QObject::connect(&a, SIGNAL(messageReceived(const QString&)),
                      yt, SLOT(handleMessage(const QString&)));
-
 	a.setActivationWindow(yt);
+#endif
 
 	if (!search_term.isEmpty()) {
 		yt->setSearchTerm(search_term);

=== modified file 'src/myborder.cpp'
--- src/myborder.cpp	2013-04-13 00:30:34 +0000
+++ src/myborder.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/myborder.h'
--- src/myborder.h	2013-04-13 00:30:34 +0000
+++ src/myborder.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/myicon.cpp'
--- src/myicon.cpp	2013-04-13 00:30:34 +0000
+++ src/myicon.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/myicon.h'
--- src/myicon.h	2013-04-13 00:30:34 +0000
+++ src/myicon.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/players.cpp'
--- src/players.cpp	2013-04-13 00:30:34 +0000
+++ src/players.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include <QApplication>
 #include <QFile>
 #include <QFileInfo>
+#include <QDir>
 
 QString Player::executable(bool * found) {
 	if (found) *found = true;
@@ -33,13 +34,21 @@
 	QFileInfo fi(bin);
 	if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
 		qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
-		bin = "/usr/bin/" + player_bin;
 
+		bin = QDir::homePath() + "/bin/" + player_bin;
 		fi.setFile(bin);
+
 		if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
 			qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
-			bin = player_bin;
-			if (found) *found = false;
+
+			bin = "/usr/bin/" + player_bin;
+			fi.setFile(bin);
+
+			if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
+				qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
+				bin = player_bin;
+				if (found) *found = false;
+			}
 		}
 	}
 #endif
@@ -54,6 +63,7 @@
 	list.push_back( Player("Dragon Player", "dragon", false) );
 	list.push_back( Player("Totem", "totem", false) );
 	list.push_back( Player("GNOME-MPlayer", "gnome-mplayer", false) );
+	list.push_back( Player("mpv", "mpv", false, "--title=") );
 
 	curr = 0;
 }
@@ -74,5 +84,5 @@
 	for (int n = 0; n < list.count(); n++) {
 		if (list[n].name() == name) return n;
 	}
-	return 0;
+	return -1;
 }

=== modified file 'src/players.h'
--- src/players.h	2013-04-13 00:30:34 +0000
+++ src/players.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

=== modified file 'src/qtsingleapplication/qtlocalpeer.cpp'
--- src/qtsingleapplication/qtlocalpeer.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlocalpeer.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,20 +34,23 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 
 #include "qtlocalpeer.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTime>
+#include <QCoreApplication>
+#include <QTime>
 
 #if defined(Q_OS_WIN)
-#include <QtCore/QLibrary>
-#include <QtCore/qt_windows.h>
+#include <QLibrary>
+#include <qt_windows.h>
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif
 #if defined(Q_OS_UNIX)
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #endif
@@ -195,6 +197,7 @@
     QString message(QString::fromUtf8(uMsg));
     socket->write(ack, qstrlen(ack));
     socket->waitForBytesWritten(1000);
+    socket->waitForDisconnected(1000); // make sure client reads ack
     delete socket;
     emit messageReceived(message); //### (might take a long time to return)
 }

=== modified file 'src/qtsingleapplication/qtlocalpeer.h'
--- src/qtsingleapplication/qtlocalpeer.h	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlocalpeer.h	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,14 +34,16 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QDir>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
 
 #include "qtlockedfile.h"
 

=== modified file 'src/qtsingleapplication/qtlockedfile.cpp'
--- src/qtsingleapplication/qtlockedfile.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlockedfile.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #include "qtlockedfile.h"

=== modified file 'src/qtsingleapplication/qtlockedfile.h'
--- src/qtsingleapplication/qtlockedfile.h	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlockedfile.h	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,17 +34,19 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #ifndef QTLOCKEDFILE_H
 #define QTLOCKEDFILE_H
 
-#include <QtCore/QFile>
+#include <QFile>
 #ifdef Q_OS_WIN
-#include <QtCore/QVector>
+#include <QVector>
 #endif
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT)
 #    define QT_QTLOCKEDFILE_EXPORT
 #  elif defined(QT_QTLOCKEDFILE_IMPORT)

=== modified file 'src/qtsingleapplication/qtlockedfile_unix.cpp'
--- src/qtsingleapplication/qtlockedfile_unix.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlockedfile_unix.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #include <string.h>

=== modified file 'src/qtsingleapplication/qtlockedfile_win.cpp'
--- src/qtsingleapplication/qtlockedfile_win.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtlockedfile_win.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,16 +34,22 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #include "qtlockedfile.h"
 #include <qt_windows.h>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 #define MUTEX_PREFIX "QtLockedFile mutex "
 // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
 #define MAX_READERS MAXIMUM_WAIT_OBJECTS
 
+#if QT_VERSION >= 0x050000
+#define QT_WA(unicode, ansi) unicode
+#endif
+
 Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
 {
     if (mutexname.isEmpty()) {

=== modified file 'src/qtsingleapplication/qtsingleapplication.cpp'
--- src/qtsingleapplication/qtsingleapplication.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtsingleapplication.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,12 +34,14 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 
 #include "qtsingleapplication.h"
 #include "qtlocalpeer.h"
-#include <QtGui/QWidget>
+#include <QWidget>
 
 
 /*!
@@ -169,6 +170,7 @@
     sysInit(appId);
 }
 
+#if QT_VERSION < 0x050000
 
 /*!
     Creates a QtSingleApplication object. The application identifier
@@ -182,7 +184,7 @@
 }
 
 
-#if defined(Q_WS_X11)
+#  if defined(Q_WS_X11)
 /*!
   Special constructor for X11, ref. the documentation of
   QApplication's corresponding constructor. The application identifier
@@ -220,7 +222,8 @@
 {
     sysInit(appId);
 }
-#endif
+#  endif // Q_WS_X11
+#endif // QT_VERSION < 0x050000
 
 
 /*!

=== modified file 'src/qtsingleapplication/qtsingleapplication.h'
--- src/qtsingleapplication/qtsingleapplication.h	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtsingleapplication.h	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,16 +34,18 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
-#include <QtGui/QApplication>
+#include <QApplication>
 
 class QtLocalPeer;
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT)
 #    define QT_QTSINGLEAPPLICATION_EXPORT
 #  elif defined(QT_QTSINGLEAPPLICATION_IMPORT)
@@ -67,12 +68,14 @@
 public:
     QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
     QtSingleApplication(const QString &id, int &argc, char **argv);
+#if QT_VERSION < 0x050000
     QtSingleApplication(int &argc, char **argv, Type type);
-#if defined(Q_WS_X11)
+#  if defined(Q_WS_X11)
     QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
     QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
     QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
-#endif
+#  endif // Q_WS_X11
+#endif // QT_VERSION < 0x050000
 
     bool isRunning();
     QString id() const;

=== modified file 'src/qtsingleapplication/qtsingleapplication.pri'
--- src/qtsingleapplication/qtsingleapplication.pri	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtsingleapplication.pri	2014-07-30 15:30:47 +0000
@@ -2,6 +2,7 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 QT *= network
+greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
 
 qtsingleapplication-uselib:!qtsingleapplication-buildlib {
     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME

=== modified file 'src/qtsingleapplication/qtsinglecoreapplication.cpp'
--- src/qtsingleapplication/qtsinglecoreapplication.cpp	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtsinglecoreapplication.cpp	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 

=== modified file 'src/qtsingleapplication/qtsinglecoreapplication.h'
--- src/qtsingleapplication/qtsinglecoreapplication.h	2013-02-13 11:48:44 +0000
+++ src/qtsingleapplication/qtsinglecoreapplication.h	2014-07-30 15:30:47 +0000
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-**
-** Contact: Nokia Corporation ([e-mail])
-**
-** This file is part of a Qt Solutions component.
-**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,12 +34,14 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #ifndef QTSINGLECOREAPPLICATION_H
 #define QTSINGLECOREAPPLICATION_H
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 class QtLocalPeer;
 

=== modified file 'src/recordingdialog.cpp'
--- src/recordingdialog.cpp	2013-10-03 17:16:56 +0000
+++ src/recordingdialog.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,10 @@
 /* #include "helper.h" */
 #include "myborder.h"
 
+#ifdef Q_WS_AMIGA // zzd10h
+#include <QProcess>
+#endif
+
 RecordingDelegate::RecordingDelegate(QObject *parent)
     :QStyledItemDelegate(parent), selectedBrush(QPixmap(":/Control/bg-download-active.png"))
 {
@@ -52,7 +56,7 @@
     QPixmap retryPix(":/Control/bt-download-retry.png");
     playIcon = getIcon(playPix);
     cancelIcon = getIcon(cancelPix);
-    retryIcon = getIcon(retryPix);    
+    retryIcon = getIcon(retryPix);
 }
 
 void RecordingDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -101,7 +105,7 @@
         painter->drawText(QRect(13, optionProgress.rect.bottom() + 3, rect.width(), rect.height()), Qt::AlignLeft | Qt::AlignTop, dd->downloadProgress);
     }
     else if(dd->downloadState == DownloadData::Canceled || dd->downloadState == DownloadData::Error)
-    {        
+    {
         QDateTime time = dd->completionTime;
         QString currentDateString;
         if(time.date() == QDate::currentDate())
@@ -118,7 +122,7 @@
                                 headerTextRect.height()), Qt::AlignVCenter | Qt::AlignRight, currentDateString );
         painter->drawText(QRect(headerTextRect.left(), headerTextRect.bottom() + 5, rect.width(), rect.height()),
                           Qt::AlignLeft | Qt::AlignTop, dd->downloadState == DownloadData::Canceled ? tr("Canceled") : tr("Error"));
-        currentPix = retryIcon.pixmap(dd->buttonState, MyIcon::Off );
+        currentPix = retryIcon.pixmap(dd->retry_possible ? dd->buttonState : MyIcon::Disabled, MyIcon::Off );
         QRect buttonRect(rect.width() - 13 - currentPix.width(), headerTextRect.bottom() + 5, currentPix.width(), currentPix.height());
         if(dd->buttonRect != buttonRect) dd->buttonRect = buttonRect;
         painter->drawPixmap(buttonRect, currentPix);
@@ -182,7 +186,7 @@
     return icon;
 }
 
-QSize RecordingDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize RecordingDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex &index) const
 {
     DownloadData* dd = index.data(RecordingDialog::DownloadDataRole).value<DownloadData*>();
     if(dd->downloadState == DownloadData::Progressing)
@@ -252,24 +256,94 @@
     RetrieveVideoUrl* rvu = new RetrieveVideoUrl(this);
     rvu->setPreferredQuality((RetrieveYoutubeUrl::Quality) recording_quality);
     connect(rvu, SIGNAL(signatureNotFound(const QString &)), this, SIGNAL(signatureNotFound(const QString &)));
-    connect(rvu, SIGNAL(gotPreferredUrl(const QString &, QString, QString)), this, SLOT(recordVideo(const QString &,QString,QString)));
-    connect(rvu, SIGNAL(gotPreferredUrl(const QString &, QString, QString)), rvu, SLOT(deleteLater()));
-    rvu->fetchYTVideoPage(videoId, title);
-
-    if(!isVisible()) show();
-}
-
-void RecordingDialog::recordVideo(const QString & url, QString title, QString id)
-{
-    if(url.isNull())
-    {
-        QMessageBox::warning(0, tr("Recording failed"), tr("There was an error in retrieving the download URL."));
-        return;
-    }
-    download(url, title, id, 0);
-}
-
-void RecordingDialog::download(QString url, QString title, QString id, double duration)
+    connect(rvu, SIGNAL(gotUrls(const QMap<int, QString>&, QString, QString)), this, SLOT(recordVideo(const QMap<int, QString>&, QString, QString)));
+    connect(rvu, SIGNAL(gotUrls(const QMap<int, QString>&, QString, QString)), rvu, SLOT(deleteLater()));
+    rvu->fetchYTVideoPage(videoId, title);
+
+    if(!isVisible()) show();
+}
+
+void RecordingDialog::downloadAudioId(QString videoId, QString title, double) {
+	qDebug("RecordingDialog::downloadAudioId");
+
+    RetrieveVideoUrl* rvu = new RetrieveVideoUrl(this);
+    rvu->setPreferredQuality((RetrieveYoutubeUrl::Quality) recording_quality);
+    connect(rvu, SIGNAL(signatureNotFound(const QString &)), this, SIGNAL(signatureNotFound(const QString &)));
+    connect(rvu, SIGNAL(gotUrls(const QMap<int, QString>&, QString, QString)), this, SLOT(recordAudio(const QMap<int, QString>&, QString, QString)));
+    connect(rvu, SIGNAL(gotUrls(const QMap<int, QString>&, QString, QString)), rvu, SLOT(deleteLater()));
+    rvu->fetchYTVideoPage(videoId, title);
+
+    if(!isVisible()) show();
+}
+
+void RecordingDialog::recordVideo(const QMap<int, QString>& map, QString title, QString id) {
+	qDebug("RecordingDialog::recordVideo");
+
+	if (recording_quality == RetrieveYoutubeUrl::MP4_1080p || recording_quality == RetrieveYoutubeUrl::WEBM_1080p) {
+		if (!map.contains(RetrieveYoutubeUrl::MP4_1080p) && !map.contains(RetrieveYoutubeUrl::WEBM_1080p)) {
+			qDebug("RecordingDialog::recordVideo: 1080p not found in normal format");
+			// Check if there's a 1080p in DASH format
+			QString video_url = map.value(RetrieveYoutubeUrl::DASH_VIDEO_1080p, QString());
+			QString audio_url = RetrieveYoutubeUrl::findBestAudio(map);
+			if (!video_url.isEmpty() && !audio_url.isEmpty()) {
+				video_url += "&ratebypass=yes";
+				audio_url += "&ratebypass=yes";
+
+				//qDebug("RecordingDialog::recordVideo: video_url: %s", video_url.toLatin1().constData());
+				//qDebug("RecordingDialog::recordVideo: audio_url: %s", audio_url.toLatin1().constData());
+
+				qDebug("RecordingDialog::recordVideo: video and audio for 1080p DASH format found");
+				QString video_name = getUniqueFileName(title +".mp4");
+				qDebug("RecordingDialog::recordVideo: video name '%s'", video_name.toUtf8().constData());
+
+				QString audio_extension = ".m4a";
+				QRegExp rx("itag=(\\d+)");
+				if (rx.indexIn(audio_url) != -1) {
+					int itag = rx.cap(1).toInt();
+					//qDebug("itag: %d", itag);
+					if ((itag == RetrieveYoutubeUrl::DASH_AUDIO_WEBM_128) || (itag == RetrieveYoutubeUrl::DASH_AUDIO_WEBM_192)) {
+						audio_extension = ".webm";
+					}
+				}
+
+				QFileInfo fi(video_name);
+				QString audio_name = fi.absolutePath() +"/"+ fi.completeBaseName() + audio_extension;
+				qDebug("RecordingDialog::recordVideo: audio name '%s'", audio_name.toUtf8().constData());
+
+				if (QFile::exists(audio_name)) {
+					qDebug("RecordingDialog::recordVideo: the audio file already exists. Skipping.");
+				} else {
+					download(audio_url, title, id, 0, audio_name, false);
+				}
+				download(video_url, title, id, 0, video_name, false);
+				return;
+			}
+		}
+	}
+
+	QString url = RetrieveYoutubeUrl::findPreferredUrl(map, (RetrieveYoutubeUrl::Quality) recording_quality);
+	if (url.isEmpty()) {
+		QMessageBox::warning(0, tr("Recording failed"), tr("There was an error in retrieving the download URL."));
+		return;
+	}
+	download(url, title, id, 0);
+}
+
+void RecordingDialog::recordAudio(const QMap<int, QString>& map, QString title, QString id) {
+	qDebug("RecordingDialog::recordAudio");
+
+	QString url = RetrieveYoutubeUrl::findBestAudio(map);
+	url += "&ratebypass=yes";
+
+	if (url.isEmpty()) {
+		QMessageBox::warning(0, tr("Recording failed"), tr("There was an error in retrieving the download URL."));
+		return;
+	}
+
+	download(url, title, id, 0, QString::null, false);
+}
+
+void RecordingDialog::download(QString url, QString title, QString id, double duration, const QString & saveas, bool retry_possible)
 {
     QUrl qurl(url);
     QListWidgetItem* item = new QListWidgetItem(0, QListWidgetItem::UserType + 1);
@@ -298,20 +372,35 @@
         case RetrieveYoutubeUrl::WEBM_1080p:
             ext = ".webm";
             break;
-    }
-
-    QFile* file = new QFile(getUniqueFileName(title + ext));
+        case RetrieveYoutubeUrl::DASH_AUDIO_MP4_48:
+        case RetrieveYoutubeUrl::DASH_AUDIO_MP4_128:
+        case RetrieveYoutubeUrl::DASH_AUDIO_MP4_256:
+            ext = ".m4a";
+            break;
+        case RetrieveYoutubeUrl::DASH_AUDIO_WEBM_128:
+        case RetrieveYoutubeUrl::DASH_AUDIO_WEBM_192:
+            ext = ".webm";
+            break;
+    }
+
+    QString output_filename = saveas;
+    if (output_filename.isEmpty()) {
+         output_filename = getUniqueFileName(title + ext);
+    }
+
+    QFile* file = new QFile(output_filename);
     dd->title = QFileInfo(*file).fileName();
     dd->filePath = QFileInfo(*file).absoluteFilePath();
     dd->videoDuration = (int)duration;
     dd->downloadProgress = tr("Starting");
     dd->completionTime = QDateTime::currentDateTime();
+    dd->retry_possible = retry_possible;
     item->setData(DownloadDataRole, QVariant::fromValue(dd));
     item->setData(emitDataChangedRole, true);
 
     DownloadFile* dfile = new DownloadFile(url, file, this);
-    file->setParent(dfile);    
-    itemDownloadMap[dfile] = item;    
+    file->setParent(dfile);
+    itemDownloadMap[dfile] = item;
     connect(dfile, SIGNAL(downloadFinished(bool)), this, SLOT(oneDownloadFinished(bool)));
     connect(dfile, SIGNAL(downloadStatus(QString)), this, SLOT(oneDownloadProgressStatus(QString)));
     connect(dfile, SIGNAL(progress(int, qint64)), this, SLOT(oneDownloadProgress(int, qint64)));
@@ -432,7 +521,7 @@
     updateWindowTitle();
 }
 
-void RecordingDialog::resizeEvent(QResizeEvent *r)
+void RecordingDialog::resizeEvent(QResizeEvent * /*r*/)
 {
     static_cast<RecordingDelegate*>(downloadList->itemDelegate())->setWidth( downloadList->viewport()->width());
 }
@@ -525,7 +614,9 @@
                     }
                     else if(dd->downloadState == DownloadData::Canceled || dd->downloadState == DownloadData::Error )
                     {
-                        contextMenu.addAction(tr("&Retry"))->setData("retry");
+                        QAction *retryAct = contextMenu.addAction(tr("&Retry"));
+                        retryAct->setData("retry");
+                        if (!dd->retry_possible) retryAct->setEnabled(false);
                         contextMenu.addSeparator();
                         contextMenu.addAction(tr("Remove from &list"))->setData("remove");
                         QAction* action = contextMenu.exec(m->globalPos());
@@ -626,6 +717,9 @@
 void RecordingDialog::retryDownload(QListWidgetItem *item)
 {
     DownloadData* dd = item->data(DownloadDataRole).value<DownloadData*>();
+
+    if (!dd->retry_possible) return;
+
     dd->downloadState = DownloadData::Progressing;
     dd->downloadProgress = tr("Fetching URL...");
     dd->downloadProgressPercent = 0;
@@ -722,7 +816,7 @@
             ++i ;
         }
         else
-        {            
+        {
             delete model->index(i, 0).data(DownloadDataRole).value<DownloadData*>();
             model->removeRow(i);
         }
@@ -761,7 +855,15 @@
 
 void RecordingDialog::openFolder()
 {
+ #ifdef Q_WS_AMIGA // zzd10h
+    QProcess *process;
+    QString programme = "Amiga/OpenWorkbench.rexx";
+    QStringList argument ;
+    argument << recordings_directory ;
+    process->startDetached(programme,argument);
+ #else
     QDesktopServices::openUrl(QUrl::fromLocalFile(recordings_directory));
+ #endif
 }
 
 void RecordingDialog::saveList()
@@ -783,6 +885,7 @@
             ddMap["videoid"] = dd->videoId;
             ddMap["video_duration"] = dd->videoDuration;
             ddMap["title"] = dd->title;
+            ddMap["retry_possible"] = dd->retry_possible;
         }
         itemList.append(ddMap);
     }
@@ -817,6 +920,7 @@
         dd->videoDuration = ddMap.value("video_duration").toInt();
         dd->completionTime = ddMap.value("time").toDateTime();
         dd->fileSize = ddMap.value("size").toLongLong();
+        dd->retry_possible = ddMap.value("retry_possible").toBool();
         item->setData(DownloadDataRole, QVariant::fromValue(dd));
         item->setData(emitDataChangedRole, true);
     }

=== modified file 'src/recordingdialog.h'
--- src/recordingdialog.h	2013-10-03 17:16:56 +0000
+++ src/recordingdialog.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -64,8 +64,7 @@
         QString title;
         QRect buttonRect;
         QString filePath;
-
-
+        bool retry_possible;
 };
 
 Q_DECLARE_METATYPE(DownloadData*)
@@ -103,7 +102,8 @@
     ~RecordingDialog();
 
     void downloadVideoId(QString videoId, QString title, double duration = 0);
-    void download(QString url, QString title, QString id, double duration);
+    void downloadAudioId(QString videoId, QString title, double duration = 0);
+    void download(QString url, QString title, QString id, double duration, const QString & saveas = QString::null, bool retry_possible = true);
     QString getUniqueFileName(QString name);
     bool eventFilter(QObject *watched, QEvent *event);
 
@@ -153,7 +153,8 @@
     void videoDoubleClicked(QListWidgetItem* item);
     void saveList();
     void loadList();
-    void recordVideo(const QString & url, QString title, QString id);
+    void recordVideo(const QMap<int, QString>&, QString title, QString id);
+    void recordAudio(const QMap<int, QString>&, QString title, QString id);
 
 protected:
     QString recordings_directory;

=== added file 'src/regions.cpp'
--- src/regions.cpp	1970-01-01 00:00:00 +0000
+++ src/regions.cpp	2014-07-30 15:30:47 +0000
@@ -0,0 +1,87 @@
+/*  smtube, a small youtube browser.
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "regions.h"
+#include <QObject>
+#include <QLocale>
+
+QMap<QString,QString> Regions::list() {
+	QMap<QString,QString> l;
+
+	l["AR"] = tr("Argentina");
+	l["AU"] = tr("Australia");
+	// l["AT"] = tr("Austria"); // Invalid code :?
+	l["BE"] = tr("Belgium");
+	l["BR"] = tr("Brazil");
+	l["CA"] = tr("Canada");
+	l["CL"] = tr("Chile");
+	l["CO"] = tr("Colombia");
+	l["CZ"] = tr("Czech Republic");
+	l["EG"] = tr("Egypt");
+	l["FR"] = tr("France");
+	l["DE"] = tr("Germany");
+	l["GB"] = tr("Great Britain");
+	l["HK"] = tr("Hong Kong");
+	l["HU"] = tr("Hungary");
+	l["IN"] = tr("India");
+	l["IE"] = tr("Ireland");
+	l["IL"] = tr("Israel");
+	l["IT"] = tr("Italy");
+	l["JP"] = tr("Japan");
+	l["JO"] = tr("Jordan");
+	l["MY"] = tr("Malaysia");
+	l["MX"] = tr("Mexico");
+	l["MA"] = tr("Morocco");
+	l["NL"] = tr("Netherlands");
+	l["NZ"] = tr("New Zealand");
+	l["PE"] = tr("Peru");
+	l["PH"] = tr("Philippines");
+	l["PL"] = tr("Poland");
+	l["RU"] = tr("Russia");
+	l["SA"] = tr("Saudi Arabia");
+	l["SG"] = tr("Singapore");
+	l["ZA"] = tr("South Africa");
+	l["KR"] = tr("South Korea");
+	l["ES"] = tr("Spain");
+	l["SE"] = tr("Sweden");
+	//l["CH"] = tr("Switzerland"); // Invalid code :?
+	l["TW"] = tr("Taiwan");
+	l["AE"] = tr("United Arab Emirates");
+	l["US"] = tr("United States");
+
+	return l;
+}
+
+QString Regions::findRegionForLocale(const QLocale & locale) {
+	QMap <QString,QString> l = list();
+	QString r = "US"; // default
+
+	QString locale_name = locale.name();
+	qDebug("Regions::findRegionForLocale: locale_name: %s", locale_name.toUtf8().constData());
+
+	int pos = locale_name.indexOf("_");
+	if (pos > -1) {
+		QString country_code = locale_name.mid(pos+1);
+		qDebug("Regions::findRegionForLocale: country: %s", country_code.toUtf8().constData());
+		if (l.contains(country_code)) return country_code;
+	}
+
+	return r;
+}
+
+#include "moc_regions.cpp"

=== added file 'src/regions.h'
--- src/regions.h	1970-01-01 00:00:00 +0000
+++ src/regions.h	2014-07-30 15:30:47 +0000
@@ -0,0 +1,38 @@
+/*  smtube, a small youtube browser.
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef REGIONS_H
+#define REGIONS_H
+
+#include <QObject>
+#include <QMap>
+#include <QString>
+
+class QLocale;
+
+class Regions : public QObject
+{
+	Q_OBJECT
+
+public:
+	static QMap<QString,QString> list();
+	static QString findRegionForLocale(const QLocale & locale);
+};
+
+#endif
+

=== modified file 'src/retrieveyoutubeurl.cpp'
--- src/retrieveyoutubeurl.cpp	2013-10-03 17:16:56 +0000
+++ src/retrieveyoutubeurl.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2006-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify
@@ -24,33 +24,65 @@
 #include <QFile>
 #include "ytsig.h"
 
+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#endif
+
+#define USE_PLAYER_NAME
+
+QString RetrieveYoutubeUrl::user_agent;
+
 RetrieveYoutubeUrl::RetrieveYoutubeUrl( QObject* parent ) : QObject(parent)
 {
 	reply = 0;
 	manager = new QNetworkAccessManager(this);
-	connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(gotResponse(QNetworkReply*)));
 
 	preferred_quality = FLV_360p;
-	user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1";
 }
 
 RetrieveYoutubeUrl::~RetrieveYoutubeUrl() {
 }
 
 void RetrieveYoutubeUrl::fetchPage(const QString & url) {
+	QString agent = user_agent;
+	if (agent.isEmpty()) agent = "Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1";
+	qDebug("RetrieveYoutubeUrl::fetchPage: user agent: %s", agent.toLatin1().constData());
+
+	QNetworkRequest req(url);
+	req.setRawHeader("User-Agent", agent.toLatin1());
+	reply = manager->get(req);
+	connect(reply, SIGNAL(finished()), this, SLOT(gotResponse()));
+	orig_url = url;
+
+	emit connecting(QUrl(url).host());
+
+#ifdef YT_GET_VIDEOINFO
+	video_id = getVideoID(url);
+#endif
+}
+
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::fetchVideoInfoPage() {
+	QString url = QString("http://www.youtube.com/get_video_info?el=detailpage&ps=default&eurl=&gl=US&hl=en&video_id=%1").arg(video_id);
+	//qDebug("RetrieveYoutubeUrl::fetchVideoInfoPage: url: %s", url.toUtf8().constData());
+
+	YTSig::check(url);
 	QNetworkRequest req(url);
 	req.setRawHeader("User-Agent", user_agent.toLatin1());
 	reply = manager->get(req);
-	orig_url = url;
+	connect(reply, SIGNAL(finished()), this, SLOT(gotVideoInfoResponse()));
 
-	emit connecting(url);
+	emit connecting(QUrl(url).host());
 }
+#endif
 
 void RetrieveYoutubeUrl::close() {
 	if (reply) reply->abort();
 }
 
-void RetrieveYoutubeUrl::gotResponse(QNetworkReply* reply) {
+void RetrieveYoutubeUrl::gotResponse() {
+	QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
 	if (reply->error() == QNetworkReply::NoError) {
 		int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 		qDebug("RetrieveYoutubeUrl::gotResponse: status: %d", status);
@@ -70,6 +102,20 @@
 	parse(reply->readAll());
 }
 
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::gotVideoInfoResponse() {
+	qDebug("RetrieveYoutubeUrl::gotVideoInfoResponse");
+
+	QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+	if (reply->error() != QNetworkReply::NoError) {
+		emit errorOcurred((int)reply->error(), reply->errorString());
+		return;
+	}
+	parseVideoInfo(reply->readAll());
+}
+#endif
+
 void RetrieveYoutubeUrl::parse(QByteArray text) {
 	qDebug("RetrieveYoutubeUrl::parse");
 
@@ -86,13 +132,37 @@
 		url_title = "Youtube video";
 	}
 
+	//qDebug("RetrieveYoutubeUrl::parse: replyString: %s",replyString.toLatin1().constData());
+
+	QString player;
+	QRegExp rxplayer("html5player-([\\d,\\w,-]+)\\.js");
+	if (rxplayer.indexIn(replyString) != -1) {
+		player = rxplayer.cap(1);
+		qDebug("RetrieveYoutubeUrl::parse: html5player: %s", player.toLatin1().constData());
+	}
+
+	QString fmtArray;
 	QRegExp regex("\\\"url_encoded_fmt_stream_map\\\"\\s*:\\s*\\\"([^\\\"]*)");
-	regex.indexIn(replyString);
-	QString fmtArray = regex.cap(1);
+	if (regex.indexIn(replyString) != -1) {
+		fmtArray = regex.cap(1);
+	}
+
+	QRegExp regex2("\\\"adaptive_fmts\\\"\\s*:\\s*\\\"([^\\\"]*)");
+	if (regex2.indexIn(replyString) != -1) {
+		if (!fmtArray.isEmpty()) fmtArray += ",";
+		fmtArray += regex2.cap(1);
+	}
+
 	fmtArray = sanitizeForUnicodePoint(fmtArray);
 	fmtArray.replace(QRegExp("\\\\(.)"), "\\1");
 
-	bool signature_not_found = false;
+#ifndef YT_GET_VIDEOINFO
+	bool failed_to_decrypt_signature = false;
+#endif
+
+	#if QT_VERSION >= 0x050000
+	QUrlQuery * q = new QUrlQuery();
+	#endif
 
 	QList<QByteArray> codeList = fmtArray.toLatin1().split(',');
 	foreach(QByteArray code, codeList) {
@@ -100,60 +170,283 @@
 		//qDebug("code: %s", code.constData());
 
 		QUrl line;
-		line.setEncodedQuery(code);
+		#if QT_VERSION >= 0x050000
+		q->setQuery(code);
+		#else
+		QUrl * q = &line;
+		q->setEncodedQuery(code);
+		#endif
 
-		if (line.hasQueryItem("url")) {
-			QUrl url( line.queryItemValue("url") );
+		if (q->hasQueryItem("url")) {
+			QUrl url( q->queryItemValue("url") );
 			line.setScheme(url.scheme());
 			line.setHost(url.host());
 			line.setPath(url.path());
-			line.setEncodedQuery( line.encodedQuery() + "&" + url.encodedQuery() );
-			line.removeQueryItem("url");
+			q->removeQueryItem("url");
+			#if QT_VERSION >= 0x050000
+			q->setQuery( q->query(QUrl::FullyDecoded) + "&" + url.query(QUrl::FullyDecoded) );
+			/*
+			QList < QPair < QString,QString > > l = q->queryItems();
+			for (int n=0; n < l.count(); n++) {
+				qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+			}
+			*/
+			#else
+			q->setEncodedQuery( q->encodedQuery() + "&" + url.encodedQuery() );
+			/*
+			QList < QPair < QString,QString > > l = q->queryItems();
+			for (int n=0; n < l.count(); n++) {
+				qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+			}
+			*/
+			#endif
 
-			if (line.hasQueryItem("sig")) {
-				line.addQueryItem("signature", line.queryItemValue("sig"));
-				line.removeQueryItem("sig");
+			if (q->hasQueryItem("sig")) {
+				q->addQueryItem("signature", q->queryItemValue("sig"));
+				q->removeQueryItem("sig");
 			}
 			else
-			if (line.hasQueryItem("s")) {
-				QString signature = YTSig::aclara(line.queryItemValue("s"));
+			if (q->hasQueryItem("s")) {
+				#ifdef USE_PLAYER_NAME
+				QString signature = YTSig::aclara(q->queryItemValue("s"), player);
+				#else
+				QString signature = YTSig::aclara(q->queryItemValue("s"));
+				#endif
 				if (!signature.isEmpty()) {
-					line.addQueryItem("signature", signature);
+					q->addQueryItem("signature", signature);
 				} else {
-					signature_not_found = true;
+				#ifndef YT_GET_VIDEOINFO
+					failed_to_decrypt_signature = true;
+				#endif
 				}
-				line.removeQueryItem("s");
+				q->removeQueryItem("s");
 			}
-			line.removeAllQueryItems("fallback_host");
-			line.removeAllQueryItems("type");
-			if ((line.hasQueryItem("itag")) && (line.hasQueryItem("signature"))) {
-				QString itag = line.queryItemValue("itag");
-				line.removeAllQueryItems("itag"); // Remove duplicated itag
-				line.addQueryItem("itag", itag);
+			q->removeAllQueryItems("fallback_host");
+			q->removeAllQueryItems("type");
+
+			if ((q->hasQueryItem("itag")) && (q->hasQueryItem("signature"))) {
+				QString itag = q->queryItemValue("itag");
+				q->removeAllQueryItems("itag"); // Remove duplicated itag
+				q->addQueryItem("itag", itag);
+				#if QT_VERSION >= 0x050000
+				line.setQuery(q->query(QUrl::FullyDecoded));
+				#endif
 				urlMap[itag.toInt()] = line.toString();
 				//qDebug("line: %s", line.toString().toLatin1().constData());
 			}
 		}
 	}
 
+	#if QT_VERSION >= 0x050000
+	delete q;
+	#endif
+
 	qDebug("RetrieveYoutubeUrl::parse: url count: %d", urlMap.count());
 
-	if ((urlMap.count() == 0) && (signature_not_found)) {
-		qDebug("RetrieveYoutubeUrl::parse: no url found with valid signature");
-		emit signatureNotFound(url_title);
-		return;
-	}
-
-	QString p_url = findPreferredUrl();
-	//qDebug("p_url: '%s'", p_url.toLatin1().constData());
-
-	if (!p_url.isNull()) {
-		emit gotUrls(urlMap);
-		emit gotPreferredUrl(p_url);
-	} else {
-		 emit gotEmptyList();
-	}
-}
+#ifndef YT_GET_VIDEOINFO
+	if ((urlMap.count() == 0) && (failed_to_decrypt_signature)) {
+		qDebug("RetrieveYoutubeUrl::parse: no url found with valid signature");
+		emit signatureNotFound(url_title);
+		return;
+	}
+#else
+	if (urlMap.count() == 0) {
+		qDebug("RetrieveYoutubeUrl::parse: no url found with valid signature");
+		fetchVideoInfoPage();
+		return;
+	}
+#endif
+
+	QString p_url = findPreferredUrl();
+	//qDebug("p_url: '%s'", p_url.toLatin1().constData());
+
+	if (!p_url.isNull()) {
+		emit gotUrls(urlMap);
+		emit gotPreferredUrl(p_url);
+	} else {
+		 emit gotEmptyList();
+	}
+}
+
+QString RetrieveYoutubeUrl::getVideoID(QString video_url) {
+	if (video_url.contains("youtu.be/")) {
+		video_url.replace("youtu.be/", "youtube.com/watch?v=");
+	}
+	else
+	if (video_url.contains("y2u.be/")) {
+		video_url.replace("y2u.be/", "youtube.com/watch?v=");
+	}
+	else
+	if (video_url.contains("m.youtube.com")) {
+		video_url.replace("m.youtube.com", "www.youtube.com");
+	}
+
+	if ((video_url.startsWith("youtube.com")) || (video_url.startsWith("www.youtube.com"))) video_url = "http://" + video_url;
+
+	//qDebug("RetrieveYoutubeUrl::getVideoID: video_url: %s", video_url.toLatin1().constData());
+
+	QUrl url(video_url);
+
+	QString ID;
+
+#if QT_VERSION >= 0x050000
+	QUrlQuery * q = new QUrlQuery(url);
+#else
+	const QUrl * q = &url;
+#endif
+
+	if ((url.host().contains("youtube")) && (url.path().contains("watch_videos"))) {
+		if (q->hasQueryItem("video_ids")) {
+			int index = 0;
+			if (q->hasQueryItem("index")) index = q->queryItemValue("index").toInt();
+			QStringList list = q->queryItemValue("video_ids").split(",");
+			if (index < list.count()) ID = list[index];
+		}
+	}
+	else
+	if ((url.host().contains("youtube")) && (url.path().contains("watch"))) {
+		if (q->hasQueryItem("v")) {
+			ID = q->queryItemValue("v");
+		}
+	}
+
+#if QT_VERSION >= 0x050000
+	delete q;
+#endif
+
+	//qDebug("RetrieveYoutubeUrl::getVideoID: ID: %s", ID.toLatin1().constData());
+
+	return ID;
+}
+
+bool RetrieveYoutubeUrl::isUrlSupported(const QString & url) {
+	return (!getVideoID(url).isEmpty());
+}
+
+QString RetrieveYoutubeUrl::fullUrl(const QString & url) {
+	QString r;
+	QString ID = getVideoID(url);
+	if (!ID.isEmpty()) r = "http://www.youtube.com/watch?v=" + ID;
+	return r;
+}
+
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::parseVideoInfo(QByteArray text) {
+	urlMap.clear();
+
+	#if QT_VERSION >= 0x050000
+	QUrlQuery all;
+	all.setQuery(text);
+	#else
+	QUrl all;
+	all.setEncodedQuery(text);
+	#endif
+
+	QByteArray fmtArray;
+	fmtArray = all.queryItemValue("url_encoded_fmt_stream_map").toLatin1();
+	if (!fmtArray.isEmpty()) fmtArray += ",";
+	fmtArray += all.queryItemValue("adaptive_fmts").toLatin1();
+
+	/*
+	qDebug("fmtArray: %s", fmtArray.constData());
+	return;
+	*/
+
+	bool failed_to_decrypt_signature = false;
+
+	#if QT_VERSION >= 0x050000
+	QUrlQuery * q = new QUrlQuery();
+	#endif
+
+	QList<QByteArray> codeList = fmtArray.split(',');
+	foreach(QByteArray code, codeList) {
+		code = QUrl::fromPercentEncoding(code).toLatin1();
+		//qDebug("code: %s", code.constData());
+
+		QUrl line;
+		#if QT_VERSION >= 0x050000
+		q->setQuery(code);
+		#else
+		QUrl * q = &line;
+		q->setEncodedQuery(code);
+		#endif
+
+		if (q->hasQueryItem("url")) {
+			QUrl url( q->queryItemValue("url") );
+			line.setScheme(url.scheme());
+			line.setHost(url.host());
+			line.setPath(url.path());
+			q->removeQueryItem("url");
+			#if QT_VERSION >= 0x050000
+			q->setQuery( q->query(QUrl::FullyDecoded) + "&" + url.query(QUrl::FullyDecoded) );
+			/*
+			QList < QPair < QString,QString > > l = q->queryItems();
+			for (int n=0; n < l.count(); n++) {
+				qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+			}
+			*/
+			#else
+			q->setEncodedQuery( q->encodedQuery() + "&" + url.encodedQuery() );
+			/*
+			QList < QPair < QString,QString > > l = q->queryItems();
+			for (int n=0; n < l.count(); n++) {
+				qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+			}
+			*/
+			#endif
+
+			if (q->hasQueryItem("sig")) {
+				q->addQueryItem("signature", q->queryItemValue("sig"));
+				q->removeQueryItem("sig");
+			}
+			else
+			if (q->hasQueryItem("s")) {
+				QString signature = YTSig::aclara(q->queryItemValue("s"), "", "aclara_f");
+				if (!signature.isEmpty()) {
+					q->addQueryItem("signature", signature);
+				} else {
+					failed_to_decrypt_signature = true;
+				}
+				q->removeQueryItem("s");
+			}
+			q->removeAllQueryItems("fallback_host");
+			q->removeAllQueryItems("type");
+			if ((q->hasQueryItem("itag")) && (q->hasQueryItem("signature"))) {
+				QString itag = q->queryItemValue("itag");
+				q->removeAllQueryItems("itag"); // Remove duplicated itag
+				q->addQueryItem("itag", itag);
+				#if QT_VERSION >= 0x050000
+				line.setQuery(q->query(QUrl::FullyDecoded));
+				#endif
+				urlMap[itag.toInt()] = line.toString();
+				//qDebug("line: %s", line.toString().toLatin1().constData());
+			}
+		}
+	}
+
+	#if QT_VERSION >= 0x050000
+	delete q;
+	#endif
+
+	qDebug("RetrieveYoutubeUrl::parseVideoInfo: url count: %d", urlMap.count());
+
+	if ((urlMap.count() == 0) && (failed_to_decrypt_signature)) {
+		qDebug("RetrieveYoutubeUrl::parseVideoInfo: no url found with valid signature");
+		emit signatureNotFound(url_title);
+		return;
+	}
+
+	QString p_url = findPreferredUrl();
+	//qDebug("p_url: '%s'", p_url.toLatin1().constData());
+
+	if (!p_url.isNull()) {
+		emit gotUrls(urlMap);
+		emit gotPreferredUrl(p_url);
+	} else {
+		 emit gotEmptyList();
+	}
+}
+#endif
 
 QString RetrieveYoutubeUrl::findPreferredUrl() {
 	latest_preferred_url = findPreferredUrl(urlMap, preferred_quality);
@@ -225,6 +518,27 @@
 	return p_url;
 }
 
+QString RetrieveYoutubeUrl::findBestAudio(const QMap<int, QString>& urlMap) {
+	QString url;
+
+	url = urlMap.value(DASH_AUDIO_MP4_256, QString());
+	if (!url.isEmpty()) return url;
+
+	url = urlMap.value(DASH_AUDIO_WEBM_192, QString());
+	if (!url.isEmpty()) return url;
+
+	url = urlMap.value(DASH_AUDIO_MP4_128, QString());
+	if (!url.isEmpty()) return url;
+
+	url = urlMap.value(DASH_AUDIO_WEBM_128, QString());
+	if (!url.isEmpty()) return url;
+
+	url = urlMap.value(DASH_AUDIO_MP4_48, QString());
+	if (!url.isEmpty()) return url;
+
+	return url;
+}
+
 QString RetrieveYoutubeUrl::sanitizeForUnicodePoint(QString string) {
 	QRegExp rx("\\\\u(\\d{4})");
 	while (rx.indexIn(string) != -1) {

=== modified file 'src/retrieveyoutubeurl.h'
--- src/retrieveyoutubeurl.h	2013-10-03 17:16:56 +0000
+++ src/retrieveyoutubeurl.h	2014-07-30 15:30:47 +0000
@@ -23,14 +23,21 @@
 #include <QNetworkReply>
 #include <QMap>
 
+#define YT_GET_VIDEOINFO
+
 class RetrieveYoutubeUrl : public QObject
 {
 	Q_OBJECT
 
 public:
 	enum Quality { FLV_240p = 5, MP4_360p = 18, MP4_720p = 22, FLV_360p = 34,
-                   FLV_480p = 35, MP4_1080p = 37, WEBM_360p = 43, 
-                   WEBM_480p = 44, WEBM_720p = 45, WEBM_1080p = 46 };
+                   FLV_480p = 35, MP4_1080p = 37, WEBM_360p = 43,
+                   WEBM_480p = 44, WEBM_720p = 45, WEBM_1080p = 46,
+                   DASH_AUDIO_MP4_48 = 139, DASH_AUDIO_MP4_128 = 140, DASH_AUDIO_MP4_256 = 141,
+                   DASH_AUDIO_WEBM_128 = 171, DASH_AUDIO_WEBM_192 = 172,
+                   DASH_VIDEO_1080p = 137, DASH_VIDEO_720p = 136,
+                   DASH_VIDEO_480p = 135, DASH_VIDEO_360p = 134,
+                   DASH_VIDEO_240p = 133 };
 
 	RetrieveYoutubeUrl( QObject* parent = 0 );
 	~RetrieveYoutubeUrl();
@@ -38,8 +45,8 @@
 	void fetchPage(const QString & url);
 	void close();
 
-	void setUserAgent(const QString & s) { user_agent = s; };
-	QString userAgent() { return user_agent; };
+	static void setUserAgent(const QString & s) { user_agent = s; };
+	static QString userAgent() { return user_agent; };
 
 	void setPreferredQuality(Quality q) { preferred_quality = q; }
 	Quality preferredQuality() { return preferred_quality; }
@@ -47,10 +54,15 @@
 	static QString findPreferredUrl(const QMap<int, QString>& urlMap, Quality q);
 	QString findPreferredUrl();
 
+	static QString findBestAudio(const QMap<int, QString>& urlMap);
+
 	QString urlTitle() { return url_title; }
 	QString latestPreferredUrl() { return latest_preferred_url; }
 	QString origUrl() { return orig_url; }
 
+	bool isUrlSupported(const QString & url);
+	QString fullUrl(const QString & url);
+
 signals:
 	void gotUrls(const QMap<int, QString>&);
 	void gotPreferredUrl(const QString &);
@@ -62,12 +74,18 @@
 	void signatureNotFound(const QString & title);
 
 protected slots:
-	void gotResponse(QNetworkReply* reply);
+	void gotResponse();
 	void parse(QByteArray text);
+#ifdef YT_GET_VIDEOINFO
+	void gotVideoInfoResponse();
+	void parseVideoInfo(QByteArray text);
+	void fetchVideoInfoPage();
+#endif
 
 protected:
 	static QString sanitizeForUnicodePoint(QString string);
 	static void htmlDecode(QString& string);
+	QString getVideoID(QString video_url);
 
 	QMap<int, QString> urlMap;
 	QString url_title;
@@ -75,7 +93,11 @@
 	QString latest_preferred_url;
 
 	Quality preferred_quality;
-	QString user_agent;
+	static QString user_agent;
+
+#ifdef YT_GET_VIDEOINFO
+	QString video_id;
+#endif
 
 private:
 	QNetworkAccessManager* manager;

=== modified file 'src/rvu.cpp'
--- src/rvu.cpp	2013-10-03 17:16:56 +0000
+++ src/rvu.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/rvu.h'
--- src/rvu.h	2013-10-03 17:16:56 +0000
+++ src/rvu.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/searchbox.cpp'
--- src/searchbox.cpp	2013-04-13 00:30:34 +0000
+++ src/searchbox.cpp	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/searchbox.h'
--- src/searchbox.h	2013-04-13 00:30:34 +0000
+++ src/searchbox.h	2014-07-30 15:30:47 +0000
@@ -1,5 +1,5 @@
 /*  smtube, a small youtube browser.
-    Copyright (C) 2012-2013 Ricardo Villalba <[e-mail]>
+    Copyright (C) 2012-2014 Ricardo Villalba <[e-mail]>
     Copyright (C) 2010 Ori Rejwan
 
     This program is free software; you can redistribute it and/or modify

=== modified file 'src/smtube.pro'
--- src/smtube.pro	2013-10-03 17:16:56 +0000
+++ src/smtube.pro	2014-07-30 15:30:47 +0000
@@ -4,21 +4,31 @@
 
 TEMPLATE = app
 QT += network xml
-TARGET = 
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
-
-CONFIG += qt warn_on release
+TARGET = smtube
+INCLUDEPATH += qtsingleapplication
+
+CONFIG += qt warn_on
+CONFIG += release
+#CONFIG += debug
+
+CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT
 
 RESOURCES = icons.qrc
 
 DEFINES += NO_SMPLAYER_SUPPORT
 DEFINES += YT_USE_SCRIPT
+DEFINES += USE_SINGLE_APPLICATION
+
+isEqual(QT_MAJOR_VERSION, 5) {
+    QT += widgets gui
+}
 
 contains( DEFINES, YT_USE_SCRIPT ) {
-	HEADERS += codedownloader.h
-	SOURCES += codedownloader.cpp
-	QT += script
+    HEADERS += codedownloader.h
+    SOURCES += codedownloader.cpp
+    QT += script
+} else {
+    #DEFINES += YTSIG_STATIC
 }
 
 # Input
@@ -36,10 +46,11 @@
            yttabbar.h \
            lineedit_with_icon.h \
            filechooser.h \
+           regions.h \
            configdialog.h \
-           players.h \
            version.h \
-           about.h
+           about.h \
+           fontpref.h
 
 SOURCES += myborder.cpp \
            myicon.cpp \
@@ -55,8 +66,8 @@
            yttabbar.cpp \
            lineedit_with_icon.cpp \
            filechooser.cpp \
+           regions.cpp \
            configdialog.cpp \
-           players.cpp \
            version.cpp \
            about.cpp \
            main.cpp
@@ -89,12 +100,16 @@
                translations/smtube_hr.ts \
                translations/smtube_bg.ts \
                translations/smtube_vi.ts \
-               translations/smtube_id.ts
-
-
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
+               translations/smtube_id.ts \
+               translations/smtube_ca.ts \
+               translations/smtube_ar.ts \
+               translations/smtube_de.ts \
+               translations/smtube_zh_TW.ts \
+               translations/smtube_nqo.ts \
+               translations/smtube_et.ts \
+               translations/smtube_ko.ts \
+               translations/smtube_fr.ts \
+               translations/smtube_it.ts
 
 unix {
     UI_DIR = .ui
@@ -102,8 +117,29 @@
     OBJECTS_DIR = .obj
 
     DEFINES += TRANSLATION_PATH=$(TRANSLATION_PATH)
+    DEFINES += USE_PLAYERS
+    #DEFINES -= USE_SINGLE_APPLICATION
 }
 
 win32 {
     RC_FILE = smtube.rc
 }
+
+amiga {
+    DEFINES -= USE_PLAYERS
+    DEFINES += QT_NO_DEBUG_OUTPUT
+    DEFINES -= USE_SINGLE_APPLICATION
+}
+
+# qtsingleapplication
+contains(DEFINES, USE_SINGLE_APPLICATION) {
+    SOURCES += qtsingleapplication/qtsingleapplication.cpp qtsingleapplication/qtlocalpeer.cpp
+    HEADERS += qtsingleapplication/qtsingleapplication.h qtsingleapplication/qtlocalpeer.h
+}
+
+contains(DEFINES, USE_PLAYERS) {
+    HEADERS += players.h
+    SOURCES += players.cpp
+} else {
+    HEADERS += hcplayer.h
+}

=== modified file 'src/smtube.rc'
--- src/smtube.rc	2013-10-03 17:16:56 +0000
+++ src/smtube.rc	2014-07-30 15:30:47 +0000
@@ -1,7 +1,7 @@
 #include <winver.h>
 
-#define SMTUBE_FILEVERSION 1,8,0,0
-#define SMTUBE_PRODVERSION "1.8.0.0\0"
+#define SMTUBE_FILEVERSION 2,1,0,0
+#define SMTUBE_PRODVERSION "2.1.0.0\0"
 
 VS_VERSION_INFO     VERSIONINFO
 FILEVERSION         SMTUBE_FILEVERSION

=== modified file 'src/translations/.tx/config'
--- src/translations/.tx/config	2013-10-03 17:16:56 +0000
+++ src/translations/.tx/config	2014-07-30 15:30:47 +0000
@@ -7,4 +7,4 @@
 source_lang = en
 source_file = smtube_en.ts
 trans.he = smtube_he_IL.ts
-minimum_perc = 90
+minimum_perc = 50

=== added file 'src/translations/smtube_ar.ts'
--- src/translations/smtube_ar.ts	1970-01-01 00:00:00 +0000
+++ src/translations/smtube_ar.ts	2014-07-30 15:30:47 +0000
@@ -0,0 +1,979 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ar">
+<context>
+    <name>About</name>
+    <message>
+        <location filename="../about.ui" line="14"/>
+        <source>About...</source>
+        <translation>حولَ...</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="33"/>
+        <source>&amp;Info</source>
+        <translation>م&amp;علومات</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="53"/>
+        <location filename="../about.ui" line="109"/>
+        <location filename="../about.ui" line="165"/>
+        <source>icon</source>
+        <translation>آيقونة</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="89"/>
+        <source>&amp;Translators</source>
+        <translation>المت&amp;رجمون</translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="145"/>
+        <source>&amp;License</source>
+        <translation>الر&amp;خصة</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="33"/>
+        <source>YouTube%1 Browser for SMPlayer</source>
+        <translation>متص�ح YouTube%1 للمشغل SMPlayer</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="35"/>
+        <source>Based on UMPlayer</source>
+        <translation>مبني على المشغل UMPlayer</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="37"/>
+        <source>Version: %1</source>
+        <translation>الإصدار: %1</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="39"/>
+        <source>Portable Edition</source>
+        <translation>نسخة محمولة</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="42"/>
+        <source>Compiled with Qt %1 (using %2)</source>
+        <translation>ج�مّع بـ Qt %1 (باستخدام %2)</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="44"/>
+        <source>Visit our web for updates:</source>
+        <translation>ز�ر موقعنا من اجل التحديثات:</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="98"/>
+        <source>Spanish</source>
+        <translation>الاسبانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="115"/>
+        <source>Russian</source>
+        <translation>الروسية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="108"/>
+        <source>Lithuanian</source>
+        <translation>اللثوانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="102"/>
+        <source>Japanese</source>
+        <translation>اليابانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="99"/>
+        <source>Basque</source>
+        <translation>الباسكية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="104"/>
+        <source>Portuguese</source>
+        <translation>البرتغالية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="119"/>
+        <source>Hungarian</source>
+        <translation>الهنغارية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="114"/>
+        <source>Polish</source>
+        <translation>البولندية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="111"/>
+        <source>Hebrew</source>
+        <translation>العبرية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="106"/>
+        <source>Ukrainian</source>
+        <translation>الاوكرانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="125"/>
+        <source>Norwegian Nynorsk</source>
+        <translation>النينورسكية النرويجية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="101"/>
+        <source>Czech</source>
+        <translation>الجيكية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="92"/>
+        <source>Many people contributed with translations.</source>
+        <translation>أسهم الكثيرون �ي الترجمات.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="93"/>
+        <source>You can also help to translate SMPlayer into your own language.</source>
+        <translation>بإمكانك أيضاً أن تساعد �ي ترجمة SMPlayer إلى لغتك.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="94"/>
+        <source>Visit %1 and join a translation team.</source>
+        <translation>ز�ر %1 وانضم إلى �ريق للترجمة.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="96"/>
+        <source>Current translators from the transifex teams:</source>
+        <translation>المترجمون الحاليون من ��رَق Transifex:</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="103"/>
+        <source>Korean</source>
+        <translation>الكورية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="109"/>
+        <source>Malay</source>
+        <translation>الملايو</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="110"/>
+        <source>Portuguese - Brazil</source>
+        <translation>البرتغالية - البرازيل</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="112"/>
+        <source>Simplified Chinese</source>
+        <translation>الصينية المبسطة</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="116"/>
+        <source>French</source>
+        <translation>ال�رنسية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="118"/>
+        <source>Danish</source>
+        <translation>الدانماركية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="122"/>
+        <source>German</source>
+        <translation>الالمانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="123"/>
+        <source>Traditional Chinese</source>
+        <translation>الصينية التقليدية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="126"/>
+        <source>Swedish</source>
+        <translation>السويدية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="120"/>
+        <source>Turkish</source>
+        <translation>التركية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="121"/>
+        <source>Finnish</source>
+        <translation>ال�لندية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="127"/>
+        <source>Arabic</source>
+        <translation>العربية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="128"/>
+        <source>Georgian</source>
+        <translation>الجيورجية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="105"/>
+        <source>Serbian</source>
+        <translation>الصربية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="100"/>
+        <source>Croatian</source>
+        <translation>الكرواتية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="124"/>
+        <source>Bulgarian</source>
+        <translation>البلغارية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="113"/>
+        <source>Vietnamese</source>
+        <translation>ال�يتنامية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="117"/>
+        <source>Indonesian</source>
+        <translation>الإندونيسية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="129"/>
+        <source>Arabic - Saudi Arabia</source>
+        <translation>العربية - المملكة العربية السعودية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="130"/>
+        <source>Sinhala</source>
+        <translation>السنهالية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="131"/>
+        <source>Greek</source>
+        <translation>اليونانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="132"/>
+        <source>Estonian</source>
+        <translation>الاستونية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="133"/>
+        <source>N&apos;ko</source>
+        <translation>أنكو</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="134"/>
+        <source>Italian</source>
+        <translation>الايطالية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="135"/>
+        <source>Uzbek</source>
+        <translation>الأوزبكية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="136"/>
+        <source>Catalan</source>
+        <translation>الكتالانية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="137"/>
+        <source>Slovak</source>
+        <translation>السلو�اكية</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="138"/>
+        <source>British English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="139"/>
+        <source>Albanian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="164"/>
+        <source>&lt;b&gt;%1&lt;/b&gt; (%2)</source>
+        <translation>&lt;b&gt;%1&lt;/b&gt; (%2)</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="107"/>
+        <source>Galician</source>
+        <translation>الجاليكية</translation>
+    </message>
+</context>
+<context>
+    <name>CodeDownloader</name>
+    <message>
+        <location filename="../codedownloader.cpp" line="37"/>
+        <source>Downloading...</source>
+        <translation>ي�نزّل...</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="58"/>
+        <source>Connecting to %1</source>
+        <translation>يتصل بـ%1</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="126"/>
+        <source>The Youtube code has been updated successfully.</source>
+        <translation>تمّ تحديث النص البرمجي لـYouTube بنجاح.</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="127"/>
+        <source>Installed version: %1</source>
+        <translation>الإصدار المثبَّت: %1</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="128"/>
+        <source>Success</source>
+        <translation>نجحَ</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="133"/>
+        <location filename="../codedownloader.cpp" line="138"/>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="133"/>
+        <source>An error happened writing %1</source>
+        <translation>حصل خطأ أثناء الكتابة الى المل� %1</translation>
+    </message>
+    <message>
+        <location filename="../codedownloader.cpp" line="138"/>
+        <source>An error happened while downloading the file:&lt;br&gt;%1</source>
+        <translation>وقع خطأ عند تنزيل المل�:&lt;br&gt;%1</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <location filename="../configdialog.ui" line="14"/>
+        <source>Settings</source>
+        <translation>الإعدادات</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="20"/>
+        <source>Recording</source>
+        <translation>يجري التسجيل</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="28"/>
+        <source>&amp;Save to this folder</source>
+        <translation>اح�&amp;ظ الى هذا المجلد</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="45"/>
+        <source>&amp;Quality</source>
+        <translation>الن&amp;وعية</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="157"/>
+        <source>Standard Feeds</source>
+        <translation>التغذية القياسية</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="163"/>
+        <source>&amp;Region:</source>
+        <translation>المن&amp;طقة:</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="189"/>
+        <source>Period of &amp;time:</source>
+        <translation>ال�ترة ال&amp;زمنية:</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="80"/>
+        <source>Playback</source>
+        <translation>تشغيل</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="88"/>
+        <source>Q&amp;uality:</source>
+        <translation>ال&amp;نوعية:</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.ui" line="125"/>
+        <source>&amp;Player:</source>
+        <translation>المشغ&amp;ل:</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="40"/>
+        <source>All time</source>
+        <translation>كل الوقت</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="41"/>
+        <source>This month</source>
+        <translation>هذا الشهر</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="42"/>
+        <source>This week</source>
+        <translation>هذا الاسبوع</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="43"/>
+        <source>Today</source>
+        <translation>اليوم</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFile</name>
+    <message>
+        <location filename="../downloadfile.cpp" line="117"/>
+        <source>%1 hours</source>
+        <translation>%1 ساعة</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="123"/>
+        <source>%1 minutes</source>
+        <translation>%1 دقيقة</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="110"/>
+        <source>unknown time remaining</source>
+        <translation>الوقت المتبقي غير معلوم</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="126"/>
+        <source>%1 seconds</source>
+        <translation>%1 ثانية</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="127"/>
+        <source>%1 remaining</source>
+        <translation>%1 متبقي</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="132"/>
+        <source>%1 of %2 MB</source>
+        <translation>%1 من %2 ميغا بايت</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="138"/>
+        <source>%1 of %2 KB</source>
+        <translation>%1 من %2 كيلوبايت</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="144"/>
+        <source>%1 of %2 bytes</source>
+        <translation>%1 من %2 بايت</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="148"/>
+        <source>%1 of unknown size</source>
+        <translation>%1 من حجم غير معلوم</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="153"/>
+        <source>%1 MB/sec</source>
+        <translation>%1 م ب/ثا</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="157"/>
+        <source>%1 KB/sec</source>
+        <translation>%1 ك ب/ثا</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="161"/>
+        <source>%1 bytes/sec</source>
+        <translation>%1 بايت/ثا</translation>
+    </message>
+</context>
+<context>
+    <name>FileChooser</name>
+    <message>
+        <location filename="../filechooser.cpp" line="54"/>
+        <source>Click to select a file or folder</source>
+        <translation>اضغط لاختيار مل� او مجلد</translation>
+    </message>
+</context>
+<context>
+    <name>RecordingDelegate</name>
+    <message>
+        <location filename="../recordingdialog.cpp" line="124"/>
+        <source>Canceled</source>
+        <translation>أ�لغيَ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="124"/>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="154"/>
+        <source>%1 MB</source>
+        <translation>%1 م ب</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="158"/>
+        <source>%1 KB</source>
+        <translation>%1 ك ب</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="162"/>
+        <source>%1 bytes</source>
+        <translation>%1 بايت</translation>
+    </message>
+</context>
+<context>
+    <name>RecordingDialog</name>
+    <message>
+        <location filename="../recordingdialog.cpp" line="207"/>
+        <location filename="../recordingdialog.cpp" line="477"/>
+        <source>Recordings</source>
+        <translation>التسجيلات</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="208"/>
+        <source>&amp;Clear list</source>
+        <translation>مسح ال&amp;قائمة</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="209"/>
+        <location filename="../recordingdialog.cpp" line="606"/>
+        <source>&amp;Open folder</source>
+        <translation>�&amp;تح المجلد</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="301"/>
+        <location filename="../recordingdialog.cpp" line="313"/>
+        <location filename="../recordingdialog.cpp" line="722"/>
+        <source>There was an error in retrieving the download URL.</source>
+        <translation>حصل خطأ اثناء استحضار رابط التحميل.</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="301"/>
+        <location filename="../recordingdialog.cpp" line="313"/>
+        <location filename="../recordingdialog.cpp" line="722"/>
+        <source>Recording failed</source>
+        <translation>�شل التسجيل</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="364"/>
+        <location filename="../recordingdialog.cpp" line="740"/>
+        <source>Starting</source>
+        <translation>يجري البدأ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="398"/>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="402"/>
+        <source>Completed</source>
+        <translation>اكتمل</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../recordingdialog.cpp" line="481"/>
+        <source>%1% of %n video - Recordings</source>
+        <translation>
+            <numerusform>لا تسجيل �يديو من %n</numerusform>
+            <numerusform>تسجيل �يديو واحد من %n</numerusform>
+            <numerusform>تسجيلا �يديو من %n</numerusform>
+            <numerusform>%1% تسجيلات �يديو من %n</numerusform>
+            <numerusform>%1% تسجيل �يديو من %n</numerusform>
+            <numerusform>%1% تسجيل �يديو من %n</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="566"/>
+        <source>&amp;Cancel</source>
+        <translation>أل&amp;غ�</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="568"/>
+        <source>&amp;Remove from list</source>
+        <translation>أز&amp;ل من القائمة</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="587"/>
+        <location filename="../recordingdialog.cpp" line="609"/>
+        <source>Remove from &amp;list</source>
+        <translation>أزل من الق&amp;ائمة</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="585"/>
+        <source>&amp;Retry</source>
+        <translation>أعد المحاول&amp;ة</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="605"/>
+        <source>&amp;Play</source>
+        <translation>تش&amp;غيل</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="608"/>
+        <source>&amp;Delete</source>
+        <translation>حذ&amp;�</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="687"/>
+        <source>Fetching URL...</source>
+        <translation>استحضار الرابط...</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="704"/>
+        <source>File error</source>
+        <translation>خطأ �ي المل�</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="705"/>
+        <source>The file does not exists, would you like to remove it from the list?</source>
+        <translation>المل� غير موجود، أترغب �ي ازالته من اللائحة؟</translation>
+    </message>
+</context>
+<context>
+    <name>Regions</name>
+    <message>
+        <location filename="../regions.cpp" line="26"/>
+        <source>Argentina</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="27"/>
+        <source>Australia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="29"/>
+        <source>Belgium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="30"/>
+        <source>Brazil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="31"/>
+        <source>Canada</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="32"/>
+        <source>Chile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="33"/>
+        <source>Colombia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="34"/>
+        <source>Czech Republic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="35"/>
+        <source>Egypt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="36"/>
+        <source>France</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="37"/>
+        <source>Germany</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="38"/>
+        <source>Great Britain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="39"/>
+        <source>Hong Kong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="40"/>
+        <source>Hungary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="41"/>
+        <source>India</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="42"/>
+        <source>Ireland</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="43"/>
+        <source>Israel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="44"/>
+        <source>Italy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="45"/>
+        <source>Japan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="46"/>
+        <source>Jordan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="47"/>
+        <source>Malaysia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="48"/>
+        <source>Mexico</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="49"/>
+        <source>Morocco</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="50"/>
+        <source>Netherlands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="51"/>
+        <source>New Zealand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="52"/>
+        <source>Peru</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="53"/>
+        <source>Philippines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="54"/>
+        <source>Poland</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="55"/>
+        <source>Russia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="56"/>
+        <source>Saudi Arabia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="57"/>
+        <source>Singapore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="58"/>
+        <source>South Africa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="59"/>
+        <source>South Korea</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="60"/>
+        <source>Spain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="61"/>
+        <source>Sweden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="63"/>
+        <source>Taiwan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="64"/>
+        <source>United Arab Emirates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../regions.cpp" line="65"/>
+        <source>United States</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>YTDelegate</name>
+    <message>
+        <location filename="../ytdelegate.cpp" line="115"/>
+        <source>%L1 views</source>
+        <translation>%L1 مشاهدة</translation>
+    </message>
+</context>
+<context>
+    <name>YTDialog</name>
+    <message>
+        <location filename="../ytdialog.cpp" line="226"/>
+        <source>YouTube Browser - SMPlayer</source>
+        <translation>متص�ح يوتيوب - المشغل SMPlayer</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="274"/>
+        <source>Settings</source>
+        <translation>إعدادات</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="280"/>
+        <source>Information</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="286"/>
+        <source>Show recordings</source>
+        <translation>أَظه�ر التسجيلات</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="474"/>
+        <source>Most Relevant</source>
+        <translation>الأكثر مشابهة</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="478"/>
+        <source>Most Recent</source>
+        <translation>الأحدث</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="482"/>
+        <source>Most Viewed</source>
+        <translation>الاكثر مشاهدة</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="486"/>
+        <source>Most Popular</source>
+        <translation>الاكثر شهرة</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="505"/>
+        <source>Most popular videos on YouTube%1</source>
+        <translation>ال�يديوات الاكثر شهرة على يوتيوب YouTube%1</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="626"/>
+        <source>Error: Could not connect to Youtube server.</source>
+        <translation>خطأ: لا يمكن الاتصال بخادوم يوتيوب Youtube .</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="735"/>
+        <source>R&amp;ecord audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="739"/>
+        <source>&amp;Add URL to the SMPlayer playlist</source>
+        <translation>أض� ال&amp;رابط الى قائمة تشغيل SMPlayer</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="893"/>
+        <location filename="../ytdialog.cpp" line="904"/>
+        <source>Problems with Youtube</source>
+        <translation>مشكلات �ي YouTube</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="895"/>
+        <source>Do you want to update the Youtube code? This may fix the problem.</source>
+        <translation>أتريد تحديث النص البرمجي لـليوتيوب YouTube؟ لعل هذا يحلّ المشكلة.</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="894"/>
+        <location filename="../ytdialog.cpp" line="905"/>
+        <source>Unfortunately due to changes in Youtube, the video &apos;%1&apos; can&apos;t be played or recorded.</source>
+        <translation>نأس�، نظرا لتغييرات �ي يوتيوب Youtube، لا يمكن تشغيل ال�يديو &apos;%1&apos; أو تسجيله.</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="906"/>
+        <source>Maybe updating this application could fix the problem.</source>
+        <translation>تحديث هذا التطبيق قد يحل المشكلة.</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="510"/>
+        <source>YouTube%2 results for &quot;%1&quot;</source>
+        <translation>نتائج يوتيوب YouTube%2 لـ &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="490"/>
+        <source>Music</source>
+        <translation>موسيقى</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="494"/>
+        <source>Sports</source>
+        <translation>رياضة</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="506"/>
+        <source>Most popular sport videos on YouTube%1</source>
+        <translation>أشهر �يديوات الرياضة من يوتيوب YouTube%1</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="507"/>
+        <source>Most popular music videos on YouTube%1</source>
+        <translation>أشهر �يديوات الموسيقى من يوتيوب YouTube%1</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="634"/>
+        <source>No videos found</source>
+        <translation>لم ي�عثر على �يديو</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="636"/>
+        <source>No videos found for &quot;%1&quot;</source>
+        <translation>لم ي�عثَر على �يديوات لـ &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="733"/>
+        <source>&amp;Play video</source>
+        <translation>تش&amp;غيل ال�يديو</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="734"/>
+        <source>&amp;Record video</source>
+        <translation>تس&amp;جيل ال�يديو</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="736"/>
+        <source>&amp;Watch on YouTube</source>
+        <translation>م&amp;شاهدة على YouTube</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="737"/>
+        <source>&amp;Copy link</source>
+        <translation>ن&amp;سخ الرابط</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="249"/>
+        <source>Next</source>
+        <translation>التالي</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="255"/>
+        <source>Previous</source>
+        <translation>السابق</translation>
+    </message>
+    <message>
+        <location filename="../ytdialog.cpp" line="882"/>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+</context>
+</TS>

=== modified file 'src/translations/smtube_bg.ts'
--- src/translations/smtube_bg.ts	2013-10-03 17:16:56 +0000
+++ src/translations/smtube_bg.ts	2014-07-30 15:30:47 +0000
@@ -1,12 +1,10 @@
-<?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>
         <location filename="../about.ui" line="14"/>
         <source>About...</source>
-        <translation>Отно�тно...</translation>
+        <translation>Отно�но...</translation>
     </message>
     <message>
         <location filename="../about.ui" line="33"/>
@@ -58,167 +56,250 @@
     <message>
         <location filename="../about.cpp" line="44"/>
         <source>Visit our web for updates:</source>
-        <translation>По�ети наши� уеб �айт за обновлени�:</translation>
-    </message>
-    <message>
-        <location filename="../about.cpp" line="92"/>
-        <source>The following people have contributed with translations:</source>
-        <translation>Следните хора �а придоне�ли � превод:</translation>
-    </message>
-    <message>
-        <location filename="../about.cpp" line="94"/>
+        <translation>По�ети наши�т уеб �айт за обновлени�:</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="98"/>
         <source>Spanish</source>
         <translation>И�пан�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="95"/>
+        <location filename="../about.cpp" line="115"/>
         <source>Russian</source>
         <translation>Ру�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="96"/>
+        <location filename="../about.cpp" line="108"/>
         <source>Lithuanian</source>
         <translation>Литов�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="97"/>
+        <location filename="../about.cpp" line="102"/>
         <source>Japanese</source>
         <translation>Япон�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="98"/>
-        <source>Simplified-Chinese</source>
-        <translation>Опро�тен китай�ки</translation>
-    </message>
-    <message>
         <location filename="../about.cpp" line="99"/>
         <source>Basque</source>
         <translation>Ба�ка</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="100"/>
+        <location filename="../about.cpp" line="104"/>
         <source>Portuguese</source>
         <translation>Португал�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="101"/>
+        <location filename="../about.cpp" line="119"/>
         <source>Hungarian</source>
         <translation>Унгар�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="102"/>
+        <location filename="../about.cpp" line="114"/>
         <source>Polish</source>
         <translation>Пол�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="104"/>
-        <source>Greek</source>
-        <translation>Гръцки</translation>
-    </message>
-    <message>
-        <location filename="../about.cpp" line="105"/>
+        <location filename="../about.cpp" line="111"/>
         <source>Hebrew</source>
         <translation>Иврит</translation>
     </message>
     <message>
         <location filename="../about.cpp" line="106"/>
-        <source>Portuguese (Brazil)</source>
-        <translation>Португал�ки (Бразил�ки)</translation>
-    </message>
-    <message>
-        <location filename="../about.cpp" line="107"/>
         <source>Ukrainian</source>
-        <translation>Украйн�ки</translation>
+        <translation>Украин�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="108"/>
+        <location filename="../about.cpp" line="125"/>
         <source>Norwegian Nynorsk</source>
         <translation>�орвежки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="109"/>
+        <location filename="../about.cpp" line="101"/>
         <source>Czech</source>
         <translation>Чешки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="110"/>
+        <location filename="../about.cpp" line="92"/>
+        <source>Many people contributed with translations.</source>
+        <translation>Много хора �а доприне�ли � преводи.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="93"/>
+        <source>You can also help to translate SMPlayer into your own language.</source>
+        <translation>Вие �ъщо можете да помогнете като преведете SMPlayer на майчини� �и език.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="94"/>
+        <source>Visit %1 and join a translation team.</source>
+        <translation>По�етете %1 и �е при�ъединете към екипа преводачи.</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="96"/>
+        <source>Current translators from the transifex teams:</source>
+        <translation>�а�то�щи преводачи от transifex-екипите:</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="103"/>
+        <source>Korean</source>
+        <translation>Корей�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="109"/>
         <source>Malay</source>
         <translation>Малай�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="111"/>
+        <location filename="../about.cpp" line="110"/>
+        <source>Portuguese - Brazil</source>
+        <translation>Португал�ки - бразил�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="112"/>
+        <source>Simplified Chinese</source>
+        <translation>Опро�тен китай�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="116"/>
+        <source>French</source>
+        <translation>Френ�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="118"/>
+        <source>Danish</source>
+        <translation>Дат�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="122"/>
+        <source>German</source>
+        <translation>�ем�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="123"/>
+        <source>Traditional Chinese</source>
+        <translation>Традиционен китай�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="126"/>
         <source>Swedish</source>
         <translation>Швед�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="112"/>
+        <location filename="../about.cpp" line="120"/>
         <source>Turkish</source>
         <translation>Тур�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="113"/>
+        <location filename="../about.cpp" line="121"/>
         <source>Finnish</source>
         <translation>Фин�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="114"/>
+        <location filename="../about.cpp" line="127"/>
+        <source>Arabic</source>
+        <translation>�раб�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="128"/>
         <source>Georgian</source>
         <translation>Грузин�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="115"/>
+        <location filename="../about.cpp" line="105"/>
         <source>Serbian</source>
-        <translation type="unfinished"></translation>
+        <translation>Сръб�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="116"/>
+        <location filename="../about.cpp" line="100"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation>Хърват�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="117"/>
+        <location filename="../about.cpp" line="124"/>
         <source>Bulgarian</source>
-        <translation type="unfinished"></translation>
+        <translation>Българ�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="118"/>
+        <location filename="../about.cpp" line="113"/>
         <source>Vietnamese</source>
-        <translation type="unfinished"></translation>
+        <translation>Виетнам�ки</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="119"/>
+        <location filename="../about.cpp" line="117"/>
         <source>Indonesian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../about.cpp" line="143"/>
+        <translation>Индонезий�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="129"/>
+        <source>Arabic - Saudi Arabia</source>
+        <translation>�раб�ки - Саудит�ка �раби�</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="130"/>
+        <source>Sinhala</source>
+        <translation>Синхала</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="131"/>
+        <source>Greek</source>
+        <translation>Гръцки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="132"/>
+        <source>Estonian</source>
+        <translation>Е�тон�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="133"/>
+        <source>N&apos;ko</source>
+        <translation>�&apos;ко</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="134"/>
+        <source>Italian</source>
+        <translation>Италиан�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="135"/>
+        <source>Uzbek</source>
+        <translation>Узбеки�тан�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="136"/>
+        <source>Catalan</source>
+        <translation>Каталон�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="137"/>
+        <source>Slovak</source>
+        <translation>Словашки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="138"/>
+        <source>British English</source>
+        <translation>Британ�ки англий�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="139"/>
+        <source>Albanian</source>
+        <translation>�лбан�ки</translation>
+    </message>
+    <message>
+        <location filename="../about.cpp" line="164"/>
         <source>&lt;b&gt;%1&lt;/b&gt; (%2)</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; (%2)</translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="103"/>
+        <location filename="../about.cpp" line="107"/>
         <source>Galician</source>
         <translation>Гали�ий�ки</translation>
     </message>
-    <message>
-        <source>&amp;Youtube</source>
-        <translation type="obsolete">&amp;Youtube</translation>
-    </message>
-    <message>
-        <source>Founded in February 2005, YouTube&amp;trade; is the world&apos;s most popular online video community, allowing millions of people to discover, watch and share originally-created videos. YouTube&amp;trade; provides a forum for people to connect, inform, and inspire others across the globe and acts as a distribution platform for original content creators and advertisers large and small.</source>
-        <translation type="obsolete">О�нована през Февруари 2005 г., YouTube ™ е най-попул�рниата онлайн видео общно�т, позвол�вайки на милиони хора да откриват, гледат и �подел�т оригинални видеоклипове. YouTube ™ предо�тав� форум за хората да �е �вързват, о�ведом�ват и вдъхнов�ват други хора по цели� �в�т и да дей�тва като платформа за разпро�транение за �ъздатели на оригинално �ъдържание и малки и големи рекламодатели.</translation>
-    </message>
-    <message>
-        <source>By using this application you hereby agree to be bound by Google Terms of Services located at %1.</source>
-        <translation type="obsolete">Използвайки това приложение Вие на�то�щему приемате обвръзването � Google Terms of Services намиращи �а на %1.</translation>
-    </message>
 </context>
 <context>
     <name>CodeDownloader</name>
     <message>
         <location filename="../codedownloader.cpp" line="37"/>
         <source>Downloading...</source>
-        <translation>Свал�не...</translation>
+        <translation>Изтегл�не...</translation>
     </message>
     <message>
         <location filename="../codedownloader.cpp" line="58"/>
@@ -226,35 +307,35 @@
         <translation>Свързване към %1</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="124"/>
+        <location filename="../codedownloader.cpp" line="126"/>
         <source>The Youtube code has been updated successfully.</source>
-        <translation>Youtube кодът беше обновен у�пешно.</translation>
+        <translation>Кодът на Youtube беше обновен у�пешно.</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="125"/>
+        <location filename="../codedownloader.cpp" line="127"/>
         <source>Installed version: %1</source>
         <translation>Ин�талирана вер�и�: %1</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="126"/>
+        <location filename="../codedownloader.cpp" line="128"/>
         <source>Success</source>
         <translation>У�пех</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="131"/>
-        <location filename="../codedownloader.cpp" line="136"/>
+        <location filename="../codedownloader.cpp" line="133"/>
+        <location filename="../codedownloader.cpp" line="138"/>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="131"/>
+        <location filename="../codedownloader.cpp" line="133"/>
         <source>An error happened writing %1</source>
         <translation>Възникна грешка при запи�а на %1</translation>
     </message>
     <message>
-        <location filename="../codedownloader.cpp" line="136"/>
+        <location filename="../codedownloader.cpp" line="138"/>
         <source>An error happened while downloading the file:&lt;br&gt;%1</source>
-        <translation>Възникна грешка при �вал�нето на: &lt;br&gt;%1</translation>
+        <translation>Възникна грешка при изтегл�нето на:&lt;br&gt;%1</translation>
     </message>
 </context>
 <context>
@@ -272,7 +353,7 @@
     <message>
         <location filename="../configdialog.ui" line="28"/>
         <source>&amp;Save to this folder</source>
-        <translation>&amp;Запиши в тази директорич</translation>
+        <translation>&amp;Запиши в тази директори�</translation>
     </message>
     <message>
         <location filename="../configdialog.ui" line="45"/>
@@ -280,598 +361,610 @@
         <translation>&amp;Каче�тво</translation>
     </message>
     <message>
-        <location filename="../configdialog.ui" line="149"/>
+        <location filename="../configdialog.ui" line="157"/>
         <source>Standard Feeds</source>
-        <translation>Стандартни �пон�ори</translation>
+        <translation>Стандартни абонаменти</translation>
     </message>
     <message>
-        <location filename="../configdialog.ui" line="155"/>
+        <location filename="../configdialog.ui" line="163"/>
         <source>&amp;Region:</source>
         <translation>&amp;Регион:</translation>
     </message>
     <message>
-        <location filename="../configdialog.ui" line="181"/>
+        <location filename="../configdialog.ui" line="189"/>
         <source>Period of &amp;time:</source>
         <translation>Период от &amp;време:</translation>
     </message>
     <message>
         <location filename="../configdialog.ui" line="80"/>
         <source>Playback</source>
-        <translation>Запу�ни</translation>
+        <translation>Изпълн�ване</translation>
     </message>
     <message>
         <location filename="../configdialog.ui" line="88"/>
         <source>Q&amp;uality:</source>
-        <translation>К&amp;аче�тво</translation>
+        <translation>К&amp;аче�тво:</translation>
     </message>
     <message>
-        <location filename="../configdialog.ui" line="118"/>
+        <location filename="../configdialog.ui" line="125"/>
         <source>&amp;Player:</source>
         <translation>%Плеър:</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="31"/>
+        <location filename="../configdialog.cpp" line="40"/>
+        <source>All time</source>
+        <translation>По в��ко време</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="41"/>
+        <source>This month</source>
+        <translation>Този ме�ец</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="42"/>
+        <source>This week</source>
+        <translation>Тази �едмица</translation>
+    </message>
+    <message>
+        <location filename="../configdialog.cpp" line="43"/>
+        <source>Today</source>
+        <translation>Дне�</translation>
+    </message>
+</context>
+<context>
+    <name>DownloadFile</name>
+    <message>
+        <location filename="../downloadfile.cpp" line="117"/>
+        <source>%1 hours</source>
+        <translation>%1 ча�а</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="123"/>
+        <source>%1 minutes</source>
+        <translation>%1 минути</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="110"/>
+        <source>unknown time remaining</source>
+        <translation>неизве�тно о�таващо време</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="126"/>
+        <source>%1 seconds</source>
+        <translation>%1 �екунди</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="127"/>
+        <source>%1 remaining</source>
+        <translation>%1 о�таващи</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="132"/>
+        <source>%1 of %2 MB</source>
+        <translation>%1 от %2 МБ</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="138"/>
+        <source>%1 of %2 KB</source>
+        <translation>%1 от %2 КБ</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="144"/>
+        <source>%1 of %2 bytes</source>
+        <translation>%1 от %2 байта</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="148"/>
+        <source>%1 of unknown size</source>
+        <translation>%1 � неизве�тен размер</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="153"/>
+        <source>%1 MB/sec</source>
+        <translation>%1 МБ/�ек</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="157"/>
+        <source>%1 KB/sec</source>
+        <translation>%1 КБ/�ек</translation>
+    </message>
+    <message>
+        <location filename="../downloadfile.cpp" line="161"/>
+        <source>%1 bytes/sec</source>
+        <translation>%1 байта/�ек</translation>
+    </message>
+</context>
+<context>
+    <name>FileChooser</name>
+    <message>
+        <location filename="../filechooser.cpp" line="54"/>
+        <source>Click to select a file or folder</source>
+        <translation>Кликнете, за да изберете файл или папка</translation>
+    </message>
+</context>
+<context>
+    <name>RecordingDelegate</name>
+    <message>
+        <location filename="../recordingdialog.cpp" line="124"/>
+        <source>Canceled</source>
+        <translation>Отказан</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="124"/>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="154"/>
+        <source>%1 MB</source>
+        <translation>%1 МБ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="158"/>
+        <source>%1 KB</source>
+        <translation>%1 КБ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="162"/>
+        <source>%1 bytes</source>
+        <translation>%1 байта</translation>
+    </message>
+</context>
+<context>
+    <name>RecordingDialog</name>
+    <message>
+        <location filename="../recordingdialog.cpp" line="207"/>
+        <location filename="../recordingdialog.cpp" line="477"/>
+        <source>Recordings</source>
+        <translation>Запи�и</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="208"/>
+        <source>&amp;Clear list</source>
+        <translation>&amp;Изчи�ти �пи�ъка</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="209"/>
+        <location filename="../recordingdialog.cpp" line="606"/>
+        <source>&amp;Open folder</source>
+        <translation>&amp;Отвори папка</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="301"/>
+        <location filename="../recordingdialog.cpp" line="313"/>
+        <location filename="../recordingdialog.cpp" line="722"/>
+        <source>There was an error in retrieving the download URL.</source>
+        <translation>Възникна грешка в отговора на адре�а за �вал�не.</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="301"/>
+        <location filename="../recordingdialog.cpp" line="313"/>
+        <location filename="../recordingdialog.cpp" line="722"/>
+        <source>Recording failed</source>
+        <translation>Запи�ването е неу�пешно</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="364"/>
+        <location filename="../recordingdialog.cpp" line="740"/>
+        <source>Starting</source>
+        <translation>�ачало</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="398"/>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="402"/>
+        <source>Completed</source>
+        <translation>Завършено</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../recordingdialog.cpp" line="481"/>
+        <source>%1% of %n video - Recordings</source>
+        <translation><numerusform>%1% от %n видеота - Запи�ан</numerusform><numerusform>%1% от %n видеа - Запи�ани</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="566"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Отказ</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="568"/>
+        <source>&amp;Remove from list</source>
+        <translation>&amp;Премахни от �пи�ък</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="587"/>
+        <location filename="../recordingdialog.cpp" line="609"/>
+        <source>Remove from &amp;list</source>
+        <translation>Премахване от &amp;�пи�ъка</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="585"/>
+        <source>&amp;Retry</source>
+        <translation>&amp;Опитай пак</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="605"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Възпроизвеждане</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="608"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Изтриване</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="687"/>
+        <source>Fetching URL...</source>
+        <translation>Извличане на Интернет адре�...</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="704"/>
+        <source>File error</source>
+        <translation>Грешка във файла</translation>
+    </message>
+    <message>
+        <location filename="../recordingdialog.cpp" line="705"/>
+        <source>The file does not exists, would you like to remove it from the list?</source>
+        <translation>Файлът не �ъще�твува, и�кате ли да го премахнете от �пи�ъка?</translation>
+    </message>
+</context>
+<context>
+    <name>Regions</name>
+    <message>
+        <location filename="../regions.cpp" line="26"/>
         <source>Argentina</source>
         <translation>�ржентина</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="32"/>
+        <location filename="../regions.cpp" line="27"/>
         <source>Australia</source>
         <translation>�в�трали�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="34"/>
+        <location filename="../regions.cpp" line="29"/>
         <source>Belgium</source>
         <translation>Белги�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="35"/>
+        <location filename="../regions.cpp" line="30"/>
         <source>Brazil</source>
         <translation>Бразили�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="36"/>
+        <location filename="../regions.cpp" line="31"/>
         <source>Canada</source>
         <translation>Канада</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="37"/>
+        <location filename="../regions.cpp" line="32"/>
         <source>Chile</source>
         <translation>Чили</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="38"/>
+        <location filename="../regions.cpp" line="33"/>
         <source>Colombia</source>
         <translation>Колумби�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="39"/>
+        <location filename="../regions.cpp" line="34"/>
         <source>Czech Republic</source>
-        <translation>Чешка Република</translation>
+        <translation>Чехи�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="40"/>
+        <location filename="../regions.cpp" line="35"/>
         <source>Egypt</source>
         <translation>Египет</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="41"/>
+        <location filename="../regions.cpp" line="36"/>
         <source>France</source>
         <translation>Франци�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="42"/>
+        <location filename="../regions.cpp" line="37"/>
         <source>Germany</source>
         <translation>Германи�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="43"/>
+        <location filename="../regions.cpp" line="38"/>
         <source>Great Britain</source>
-        <translation>Велико-британи�</translation>
+        <translation>Великобритани�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="44"/>
+        <location filename="../regions.cpp" line="39"/>
         <source>Hong Kong</source>
         <translation>Хонг Конг</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="45"/>
+        <location filename="../regions.cpp" line="40"/>
         <source>Hungary</source>
         <translation>Унгари�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="46"/>
+        <location filename="../regions.cpp" line="41"/>
         <source>India</source>
         <translation>Инди�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="47"/>
+        <location filename="../regions.cpp" line="42"/>
         <source>Ireland</source>
         <translation>Ирланди�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="48"/>
+        <location filename="../regions.cpp" line="43"/>
         <source>Israel</source>
         <translation>Израел</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="49"/>
+        <location filename="../regions.cpp" line="44"/>
         <source>Italy</source>
         <translation>Итали�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="50"/>
+        <location filename="../regions.cpp" line="45"/>
         <source>Japan</source>
         <translation>Япони�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="52"/>
+        <location filename="../regions.cpp" line="46"/>
         <source>Jordan</source>
         <translation>Йордани�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="53"/>
+        <location filename="../regions.cpp" line="47"/>
         <source>Malaysia</source>
-        <translation>Мала-ази�</translation>
+        <translation>Малайзи�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="54"/>
+        <location filename="../regions.cpp" line="48"/>
         <source>Mexico</source>
         <translation>Мек�ико</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="55"/>
+        <location filename="../regions.cpp" line="49"/>
         <source>Morocco</source>
         <translation>Мароко</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="56"/>
+        <location filename="../regions.cpp" line="50"/>
         <source>Netherlands</source>
-        <translation>�идерланди�</translation>
+        <translation>Холанди�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="57"/>
+        <location filename="../regions.cpp" line="51"/>
         <source>New Zealand</source>
         <translation>�ова Зеланди�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="58"/>
+        <location filename="../regions.cpp" line="52"/>
         <source>Peru</source>
         <translation>Перу</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="59"/>
+        <location filename="../regions.cpp" line="53"/>
         <source>Philippines</source>
-        <translation>Филипините</translation>
+        <translation>Филипини</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="60"/>
+        <location filename="../regions.cpp" line="54"/>
         <source>Poland</source>
         <translation>Полша</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="61"/>
+        <location filename="../regions.cpp" line="55"/>
         <source>Russia</source>
         <translation>Ру�и�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="62"/>
+        <location filename="../regions.cpp" line="56"/>
         <source>Saudi Arabia</source>
         <translation>Саудит�ка �раби�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="63"/>
+        <location filename="../regions.cpp" line="57"/>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="64"/>
+        <location filename="../regions.cpp" line="58"/>
         <source>South Africa</source>
         <translation>Южна �фрика</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="65"/>
+        <location filename="../regions.cpp" line="59"/>
         <source>South Korea</source>
         <translation>Южна Коре�</translation>
     </message>
     <message>
-        <location filename="../configdialog.cpp" line="66"/>