Commits

Damián Nohales committed 547b70e Merge

Merge vkolev changes.

  • Participants
  • Parent commits 6d8686b, b2d358f

Comments (0)

Files changed (8)

 a5168705e6ea438ecfcdc093a65866ca629bee32 gsharkdown-0.3.7
 a5168705e6ea438ecfcdc093a65866ca629bee32 gsharkdown-0.3.7
 8a0f0d7230c719910b7d5dd773603907ae6ba044 gsharkdown-0.3.7
+775b5b5cca1d6dbbac942e9dad3bc4b931889698 gsharkdown-0.4
+775b5b5cca1d6dbbac942e9dad3bc4b931889698 gsharkdown-0.4
+cc9dac49a154228345b787455d97f0d78d3d6877 gsharkdown-0.4
+cc9dac49a154228345b787455d97f0d78d3d6877 gsharkdown-0.4
+4eb35af9d34a7cd9590c1b06909a4e5e8bc0f188 gsharkdown-0.4
 It is a easy to use GNOME Desktop application for playing and
 downloading audio files from the grooveshark audioservice. 
 
-.. image:: http://i.min.us/ij5Ok2.png
+.. image:: http://i.imgur.com/je5bz.png
 
 Features
 ========
     - ConfigObj (python-configobj)
     - python-gobject
     - python-gstreamer0.10
+    - pycurl (since gsd version 0.4)
     - pynotofy (python-notify)
     - pylast (for the Last.FM scrobbling)
 
 jacktheripper51 (George Stephanos) and can be found at github on the following
 webaddress: `groove-dl@github <https://github.com/jacktheripper51/groove-dl>`_
 
+Special thanks to Damián Nohales for his commits.
+
 Any comments and help are welcome
-0.3.7
+0.4

File data/about_dialog.ui

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAboutDialog" id="aboutdialog1">
-    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About GrooveDown</property>
     <property name="window_position">center-on-parent</property>
     <property name="icon">gsharkdown_64.png</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">gSharkDown</property>
-    <property name="version">0.3.7</property>
+    <property name="version">0.4</property>
     <property name="copyright" translatable="yes">(c) Vladimir Kolev 2011</property>
     <property name="comments" translatable="yes">Gnome-toolkit based desktop application for downloading music files from Grooveshark.com</property>
     <property name="website">https://bitbucket.org/vkolev/gsharkdown</property>
 The groove.py library is developed by George Stephanos (jacktheripper51 @ github)
 Link to the sources: https://github.com/jacktheripper51/groove-dl</property>
     <property name="authors">Vladimir Kolev &lt;vladi@vladimirkolev.com&gt;
-Damián Nohales &lt;damiannohales@gmail.com&gt;</property>
+Dami&#xE1;n Nohales &lt;damiannohales@gmail.com&gt;</property>
     <property name="translator_credits" translatable="yes">Bulgarian - Vladimir Kolev
 German - Vladimir Kolev
 Italian -  Andrea Sciucca
-Spanish - Damián Nohales</property>
+Spanish - Dami&#xE1;n Nohales</property>
     <property name="logo">gsharkdown_128.png</property>
     <property name="wrap_license">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="stock">gtk-dialog-warning</property>
                     <property name="icon-size">6</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Downloading mp3s is illegal in some countries! Please check the law in your country.&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="spacing">90</property>
                 <property name="layout_style">end</property>
                 <child>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image3</property>
                   </object>
                   <packing>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Flattr gSharkDow</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image2</property>
                     <property name="relief">none</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">flattr-badge-large.png</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">system-software-update</property>
   </object>
 </interface>

File locale/gl_ES/LC_MESSAGES/gsharkdown.mo

Binary file added.

File locale/gl_ES/LC_MESSAGES/gsharkdown.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# antiparvos  <marcoslansgarza@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: gsharkdown\n"
+"Report-Msgid-Bugs-To: http://bitbucket.org/vkolev/gsharkdown/issues\n"
+"POT-Creation-Date: 2011-09-06 17:26+0200\n"
+"PO-Revision-Date: 2011-09-12 08:40+0100\n"
+"Last-Translator: Vladimir Kolev <vladi@vladimirkolev.com>\n"
+"Language-Team: antiparvos <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: gsharkdown.py:226
+msgid "gSharkDown : Download from Grooveshark"
+msgstr "gSharkDown: descarga de Grooveshark"
+
+#: gsharkdown.py:306
+msgid "Error saving the playlist"
+msgstr "Produciuse un erro ao gardar a lista de reprodución"
+
+#: gsharkdown.py:315
+#: data/main_window.ui.h:16
+msgid "Save playlist to file"
+msgstr "Gardar a lista"
+
+#: gsharkdown.py:333
+msgid "Select Playlist to open"
+msgstr "Seleccione unha lista para abrir"
+
+#: gsharkdown.py:339
+msgid "Playlist files"
+msgstr "Ficheiros con listas de reprodución"
+
+#: gsharkdown.py:381
+#: data/about_dialog.ui.h:8
+msgid "Check for update"
+msgstr "Buscar actualizacións"
+
+#: gsharkdown.py:407
+msgid "To update to the latest version "
+msgstr "Actualizar á versión máis recente "
+
+#: gsharkdown.py:408
+msgid "you can visit the <a href=\"http://https://bitbucket.org/vkolev/gsharkdown/downloads\"> "
+msgstr "Pode visitar <a href=\"http://https://bitbucket.org/vkolev/gsharkdown/downloads\"> "
+
+#: gsharkdown.py:409
+msgid "download site</a>. If you are using the latest version and whant to be"
+msgstr "Sitio de descarga</a>. Se está usando a última versión e desexa recibir"
+
+#: gsharkdown.py:410
+msgid "informed about new versions, just enable the option in the <b>Preferences</b> dialog."
+msgstr "información sobre novas versións, pode activar a opción nas <b>Preferencias</b>."
+
+#: gsharkdown.py:411
+#, python-format
+msgid "<b>New version <span fgcolor=\"red\"><i>%s</i></span> is available</b>"
+msgstr "<b>Nova versión <span fgcolor=\"red\"><i>%s</i></span> dispoñíbel</b>"
+
+#: gsharkdown.py:412
+msgid "<b>You are using the latest version!</b>"
+msgstr "<b>Está a utilizar a última versión</b>"
+
+#: gsharkdown.py:436
+#: gsharkdown.py:462
+msgid "Title"
+msgstr "Título"
+
+#: gsharkdown.py:441
+#: gsharkdown.py:467
+msgid "Artist"
+msgstr "Artista"
+
+#: gsharkdown.py:446
+msgid "Album"
+msgstr "Álbum"
+
+#: gsharkdown.py:451
+#: gsharkdown.py:472
+#: gsharkdown.py:488
+msgid "SongID"
+msgstr "ID da canción"
+
+#: gsharkdown.py:483
+msgid "File name"
+msgstr "Nome do ficheiro"
+
+#: gsharkdown.py:493
+msgid "Download progress"
+msgstr "Progreso da descarga"
+
+#: gsharkdown.py:498
+msgid "Size"
+msgstr "Tamaño"
+
+#: gsharkdown.py:510
+msgid "Are you sure to quit?"
+msgstr "Está certo de saír?"
+
+#: gsharkdown.py:511
+msgid "Quit?"
+msgstr "Saír?"
+
+#: gsharkdown.py:684
+msgid "Song Information - {songid}"
+msgstr "Información da canción - {songid}"
+
+#: gsharkdown.py:685
+msgid "<b>Filename:</b> {artist} - {title}.mp3\n"
+msgstr "<b>Nome do ficheiro:</b> {artist} - {title}.mp3\n"
+
+#: gsharkdown.py:687
+msgid "<b>Artist:</b> {artist}\n"
+msgstr "<b>Artista:</b> {artist}\n"
+
+#: gsharkdown.py:688
+msgid "<b>Title:</b> {title}\n"
+msgstr "<b>Título:</b> {title}\n"
+
+#: gsharkdown.py:690
+msgid "<b>Duration:</b> {mins}:{secs} min\n"
+msgstr "<b>Duración:</b> {mins}:{secs} min\n"
+
+#: gsharkdown.py:692
+msgid "<b>Album:</b> {album}\n"
+msgstr "<b>Álbum:</b> {album}\n"
+
+#: gsharkdown.py:693
+msgid "<b>Year:</b> {year}\n"
+msgstr "<b>Ano:</b> {year}\n"
+
+#: gsharkdown.py:863
+msgid "Playing: {artist} - {title}"
+msgstr "Reproducindo: {artist} - {title}"
+
+#: gsharkdown.py:867
+msgid "<b>Playing:</b> {artist} - {title}"
+msgstr "<b>Reproducindo:</b> {artist} - {title}"
+
+#: gsharkdown.py:871
+msgid "Now playing"
+msgstr "Reproducindo"
+
+#: gsharkdown.py:879
+msgid "gSharkDown: GrooveShark Downloader"
+msgstr "gSharkDown: descargador para Grooveshark"
+
+#: gsharkdown.py:891
+msgid "Overwrite downloaded file?"
+msgstr "Desexa sobrescribir o ficheiro descargado?"
+
+#: gsharkdown.py:894
+msgid "Cancel download"
+msgstr "Cancelar a descarga"
+
+#: gsharkdown.py:895
+msgid "Download and overwrite"
+msgstr "Descargar e sobrescribir"
+
+#: gsharkdown.py:896
+msgid "Download renamed"
+msgstr "Descarga renomeada"
+
+#: gsharkdown.py:898
+#, python-format
+msgid ""
+"The file '%s' already exists, maybe you are downloading a file that you downloaded before.\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"O ficheiro '%s' xa existe, pode que estea descargando un ficheiro que xa baixou antes.\n"
+"\n"
+"Que desexa facer?"
+
+#: gsharkdown.py:951
+#, python-format
+msgid "Downloading %d file"
+msgid_plural "Downloading %d files"
+msgstr[0] "Descargando %d ficheiro"
+msgstr[1] "Descargando %d ficheiros"
+
+#: lib/tfuncs.py:67
+#, python-format
+msgid "Failed to create '%s' for writing."
+msgstr "Produciuse un fallo ao crear '%s' para escritura."
+
+#: lib/tfuncs.py:308
+msgid "Loading lyrics..."
+msgstr "Cargando letras..."
+
+#: lib/tfuncs.py:311
+#: data/main_window.ui.h:8
+msgid "Lyrics"
+msgstr "Letras"
+
+#: data/main_window.ui.h:1
+msgid "<b>Playlist</b>"
+msgstr "<b>Lista de reprodución</b>"
+
+#: data/main_window.ui.h:2
+msgid "<b>Search Results</b>"
+msgstr "<b>Resultados da busca</b>"
+
+#: data/main_window.ui.h:3
+msgid "Add >"
+msgstr "Engadir >"
+
+#: data/main_window.ui.h:4
+msgid "Add to playlist"
+msgstr "Engadir á lista de reprodución"
+
+#: data/main_window.ui.h:5
+msgid "Check for Updates"
+msgstr "Buscar actualizacións"
+
+#: data/main_window.ui.h:6
+msgid "Clear the playlist"
+msgstr "Borrar a lista de reprodución"
+
+#: data/main_window.ui.h:7
+msgid "Edit Preferences"
+msgstr "Editar Preferencias"
+
+#: data/main_window.ui.h:9
+msgid "Menu"
+msgstr "Menú"
+
+#: data/main_window.ui.h:10
+msgid "Next"
+msgstr "Seguinte"
+
+#: data/main_window.ui.h:11
+msgid "Open saved playlist"
+msgstr "Abrir unha lista gardada"
+
+#: data/main_window.ui.h:12
+msgid "Play/Stop"
+msgstr "Reproducir/Parar"
+
+#: data/main_window.ui.h:13
+msgid "Previous"
+msgstr "Anterior"
+
+#: data/main_window.ui.h:14
+msgid "Quit the application"
+msgstr "Saír do aplicativo"
+
+#: data/main_window.ui.h:15
+msgid "Remove item from playlist"
+msgstr "Eliminar elemento da lista"
+
+#: data/main_window.ui.h:17
+msgid "Search the grooveshark"
+msgstr "Buscar no Grooveshark"
+
+#: data/main_window.ui.h:18
+msgid "Settings"
+msgstr "Configuración"
+
+#: data/main_window.ui.h:19
+msgid "Show About dialog"
+msgstr "Mostrar o diálogo 'Sobre'"
+
+#: data/main_window.ui.h:20
+msgid "Toggle Repeat all"
+msgstr "Repetir todo"
+
+#: data/main_window.ui.h:21
+msgid "Toggle Shuffle"
+msgstr "Aleatorio"
+
+#: data/main_window.ui.h:22
+msgid "gSharkDown"
+msgstr "gSharkDown"
+
+#: data/preferenes_dialog.ui.h:1
+msgid "<b>Last.fm Scrobbling</b>"
+msgstr "<b>Scrobbling en Last.fm</b>"
+
+#: data/preferenes_dialog.ui.h:2
+msgid "Check for updates on startup"
+msgstr "Comprobar se hai actualizacións no inicio"
+
+#: data/preferenes_dialog.ui.h:3
+msgid "Download Directory:"
+msgstr "Cartafol de descarga:"
+
+#: data/preferenes_dialog.ui.h:4
+msgid "Enable Last.fm Scrobbling"
+msgstr "Activar o scrobbling en Last.fm "
+
+#: data/preferenes_dialog.ui.h:5
+msgid "Password:  "
+msgstr "Contrasinal:  "
+
+#: data/preferenes_dialog.ui.h:6
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: data/preferenes_dialog.ui.h:7
+msgid "Quit application without confirmation"
+msgstr "Saír do aplicativo sen confirmación"
+
+#: data/preferenes_dialog.ui.h:8
+msgid "Select the download directory"
+msgstr "Seleccione o cartafol de descargas"
+
+#: data/preferenes_dialog.ui.h:9
+msgid "Show notifications on track change"
+msgstr "Mostrar notificacións de cambio de tema"
+
+#: data/preferenes_dialog.ui.h:10
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: data/about_dialog.ui.h:1
+msgid "(c) Vladimir Kolev 2011"
+msgstr "(c) Vladimir Kolev 2011"
+
+#: data/about_dialog.ui.h:2
+msgid "<b>Downloading mp3s is illegal in some countries! Please check the law in your country.</b>"
+msgstr "<b>A descarga de mp3 é ilegal nalgúns países. Comprobe as leis do seu país.</b>"
+
+#: data/about_dialog.ui.h:3
+msgid "About GrooveDown"
+msgstr "Sobre GrooveDown"
+
+#: data/about_dialog.ui.h:4
+msgid ""
+"Bulgarian - Vladimir Kolev\n"
+"German - Vladimir Kolev\n"
+"Italian -  Andrea Sciucca\n"
+"Spanish - Damián Nohales"
+msgstr ""
+"Búlgar - Vladimir Kolev\n"
+"Alemán - Vladimir Kolev\n"
+"Italiano -  Andrea Sciucca\n"
+"Castelán - Damián Nohales"
+
+#: data/about_dialog.ui.h:9
+msgid "Flattr gSharkDow"
+msgstr "Flattr gSharkDow"
+
+#: data/about_dialog.ui.h:10
+msgid "Gnome-toolkit based desktop application for downloading music files from Grooveshark.com"
+msgstr "Aplicativo de escritorio baseado en Gnome-toolkit para descargar ficheiros de música de Grooveshark.com"
+
+#: data/about_dialog.ui.h:11
+msgid ""
+"gSharkDown is licensed under the GNU GPL v3 License\n"
+"\n"
+"The gSharkDown icon is made by wall-e-ps (http://wall-e-ps.deviantart.com/)\n"
+"\n"
+"The groove.py library is developed by George Stephanos (jacktheripper51 @ github)\n"
+"Link to the sources: https://github.com/jacktheripper51/groove-dl"
+msgstr ""
+"gSharkDown está licenciado baixo a GNU GPL v3 License\n"
+"\n"
+"A icona de gSharkDown foi feita por wall-e-ps (http://wall-e-ps.deviantart.com/)\n"
+"\n"
+"A biblioteca groove.py é desenvolvida por George Stephanos (jacktheripper51 @ github)\n"
+"LIgazón ás fontes: https://github.com/jacktheripper51/groove-dl"
+
+#: data/lyrics_dialog.ui.h:1
+msgid "<b>Lyrics for:</b>"
+msgstr "<b>Letras para:</b>"
+
+#: data/lyrics_dialog.ui.h:2
+msgid "Lyrics viewer"
+msgstr "Visualizador de letras"
+
+#: data/lyrics_dialog.ui.h:3
+msgid "label"
+msgstr "etiqueta"
+

File locale/it_IT/LC_MESSAGES/gsharkdown.mo

Binary file modified.

File locale/it_IT/LC_MESSAGES/gsharkdown.po

 msgstr ""
 "Project-Id-Version: gsharkdown\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-30 10:57+0200\n"
-"PO-Revision-Date: 2011-08-30 10:58+0100\n"
+"POT-Creation-Date: 2011-09-06 17:26+0200\n"
+"PO-Revision-Date: 2011-09-12 08:33+0100\n"
 "Last-Translator: Vladimir Kolev <vladi@vladimirkolev.com>\n"
 "Language-Team: Italiano\n"
 "MIME-Version: 1.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: gsharkdown.py:204
+#: gsharkdown.py:226
 msgid "gSharkDown : Download from Grooveshark"
 msgstr "gSharkDown : Scarica da Grooveshark"
 
-#: gsharkdown.py:275
+#: gsharkdown.py:306
 msgid "Error saving the playlist"
 msgstr "Errore nel salvataggio della playlist"
 
-#: gsharkdown.py:283
-#: data/main_window.ui.h:22
+#: gsharkdown.py:315
+#: data/main_window.ui.h:16
 msgid "Save playlist to file"
 msgstr "Salva la playlist in un file"
 
-#: gsharkdown.py:301
+#: gsharkdown.py:333
 msgid "Select Playlist to open"
 msgstr "Seleziona la Playlist da aprire"
 
-#: gsharkdown.py:307
+#: gsharkdown.py:339
 msgid "Playlist files"
 msgstr "Files della Playlist"
 
-#: gsharkdown.py:349
-#: data/about_dialog.ui.h:7
+#: gsharkdown.py:381
+#: data/about_dialog.ui.h:8
 msgid "Check for update"
 msgstr "Controlla eventuali aggiornamenti"
 
-#: gsharkdown.py:386
-msgid "New update"
-msgstr "Nuovo aggiornamento"
-
-#: gsharkdown.py:387
-msgid "To update to the latest version click on the button "
-msgstr "Per aggiornare all'ultima versione fai click sul pulsante "
-
-#: gsharkdown.py:388
-msgid ""
-"'Update'\n"
-"and download it. After that you can "
-msgstr ""
-"'Aggiorna'\n"
-"e scarica. Appena possibile"
-
-#: gsharkdown.py:389
-msgid "remove the old one and install the new gSharkDown"
-msgstr "rimuovi il vecchio ed installa il nuovo gSharkDown"
-
-#: gsharkdown.py:390
-#, python-format
-msgid "<b>New version <i>%s</i> is available</b>"
-msgstr "<b>Una nuova versione <i>%s</i> è disponibile</b>"
-
-#: gsharkdown.py:406
-msgid "No updates"
-msgstr "Nessun aggiornamento"
-
 #: gsharkdown.py:407
-msgid "Congratulations!\n"
-msgstr "Congratulazioni!\n"
+msgid "To update to the latest version "
+msgstr "Per aggiornare all'ultima versione "
 
 #: gsharkdown.py:408
+msgid "you can visit the <a href=\"http://https://bitbucket.org/vkolev/gsharkdown/downloads\"> "
+msgstr "puoi visitare <a href=\"http://https://bitbucket.org/vkolev/gsharkdown/downloads\"> "
+
+#: gsharkdown.py:409
+msgid "download site</a>. If you are using the latest version and whant to be"
+msgstr "download site</a>. Se stai usando l'ultima versione e vuoi essere"
+
+#: gsharkdown.py:410
+msgid "informed about new versions, just enable the option in the <b>Preferences</b> dialog."
+msgstr "informato sulle nuove versioni, abilita la relativa opzione nel riquadro delle <b>Preferenze</b>."
+
+#: gsharkdown.py:411
+#, python-format
+msgid "<b>New version <span fgcolor=\"red\"><i>%s</i></span> is available</b>"
+msgstr "Una nuova versione <span fgcolor=\"red\"><i>%s</i></span> è disponibile</b>"
+
+#: gsharkdown.py:412
 msgid "<b>You are using the latest version!</b>"
-msgstr "<b>Stai usando l'ultima versione disponibile!</b>"
+msgstr "<b>Stai usando l'ultima versione!</b>"
 
 #: gsharkdown.py:436
 #: gsharkdown.py:462
 
 #: gsharkdown.py:483
 msgid "File name"
-msgstr ""
+msgstr "Nome file"
 
 #: gsharkdown.py:493
 msgid "Download progress"
-msgstr ""
+msgstr "Avanzamento download"
 
 #: gsharkdown.py:498
 msgid "Size"
-msgstr ""
+msgstr "Dimensione"
 
 #: gsharkdown.py:510
 msgid "Are you sure to quit?"
 msgid "Quit?"
 msgstr "Chiudo?"
 
-#: gsharkdown.py:683
+#: gsharkdown.py:684
 msgid "Song Information - {songid}"
 msgstr "Informazioni Brano - {songid}"
 
-#: gsharkdown.py:684
+#: gsharkdown.py:685
 msgid "<b>Filename:</b> {artist} - {title}.mp3\n"
 msgstr "<b>Nome file:</b> {artist} - {title}.mp3\n"
 
-#: gsharkdown.py:686
+#: gsharkdown.py:687
 msgid "<b>Artist:</b> {artist}\n"
 msgstr "<b>Artista:</b> {artist}\n"
 
-#: gsharkdown.py:687
+#: gsharkdown.py:688
 msgid "<b>Title:</b> {title}\n"
 msgstr "<b>Titolo:</b> {title}\n"
 
-#: gsharkdown.py:689
+#: gsharkdown.py:690
 msgid "<b>Duration:</b> {mins}:{secs} min\n"
 msgstr "<b>Durata:</b> {mins}:{secs} min\n"
 
-#: gsharkdown.py:691
+#: gsharkdown.py:692
 msgid "<b>Album:</b> {album}\n"
 msgstr "<b>Album:</b> {album}\n"
 
-#: gsharkdown.py:692
+#: gsharkdown.py:693
 msgid "<b>Year:</b> {year}\n"
 msgstr "<b>Anno</b> {year}\n"
 
-#: gsharkdown.py:796
-msgid "Select destination directory"
-msgstr "Seleziona la directory di destinazione"
-
-#: gsharkdown.py:885
+#: gsharkdown.py:863
 msgid "Playing: {artist} - {title}"
 msgstr "Riproduci: {artist} - {title}"
 
-#: gsharkdown.py:889
+#: gsharkdown.py:867
 msgid "<b>Playing:</b> {artist} - {title}"
 msgstr "<b>Riproduci:</b> {artist} - {title}"
 
-#: gsharkdown.py:893
+#: gsharkdown.py:871
 msgid "Now playing"
 msgstr "In riproduzione"
 
-#: gsharkdown.py:900
+#: gsharkdown.py:879
 msgid "gSharkDown: GrooveShark Downloader"
 msgstr "gSharkDown: GrooveShark Downloader"
 
-#: gsharkdown.py:925
+#: gsharkdown.py:891
+msgid "Overwrite downloaded file?"
+msgstr "Sovrascrivo il file scaricato?"
+
+#: gsharkdown.py:894
+msgid "Cancel download"
+msgstr "Annulla download"
+
+#: gsharkdown.py:895
+msgid "Download and overwrite"
+msgstr "Scarica e Sovrascrivi"
+
+#: gsharkdown.py:896
+msgid "Download renamed"
+msgstr "Download rinominato"
+
+#: gsharkdown.py:898
+#, python-format
+msgid ""
+"The file '%s' already exists, maybe you are downloading a file that you downloaded before.\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"Il file '%s' esiste, forse stai tentando di scaricare un file che hai già scaricato prima.\n"
+"\n"
+"Che vuoi fare?"
+
+#: gsharkdown.py:951
 #, python-format
 msgid "Downloading %d file"
 msgid_plural "Downloading %d files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Scaricamento %d file"
+msgstr[1] "Scaricamento %d files"
 
-#: lib/tfuncs.py:149
-msgid "gSharkDown : Grooveshark Downloader"
-msgstr "gSharkDown : Grooveshark Downloader"
+#: lib/tfuncs.py:67
+#, python-format
+msgid "Failed to create '%s' for writing."
+msgstr "Fallimento nel creare '%s' in scrittura."
+
+#: lib/tfuncs.py:308
+msgid "Loading lyrics..."
+msgstr "Carico i testi..."
+
+#: lib/tfuncs.py:311
+#: data/main_window.ui.h:8
+msgid "Lyrics"
+msgstr "Testi"
 
 #: data/main_window.ui.h:1
 msgid "<b>Playlist</b>"
 msgstr "<b>Playlist</b>"
 
 #: data/main_window.ui.h:2
-msgid "<b>Search Results</b>"
-msgstr "<b>Cerca Risultati</b>"
-
 #: data/main_window.ui.h:3
-msgid "About"
-msgstr "Informazioni"
+msgid "Add >"
+msgstr "Aggiungi >"
 
 #: data/main_window.ui.h:4
-msgid "Add item from search results"
-msgstr "Aggiungi voce dai risultati della ricerca"
+msgid "Add to playlist"
+msgstr "Aggingi alla playlist"
 
 #: data/main_window.ui.h:5
+msgid "Check for Updates"
+msgstr "Controlla eventuali aggiornamenti"
+
+#: data/main_window.ui.h:6
 msgid "Clear the playlist"
 msgstr "Cancella la playlist"
 
-#: data/main_window.ui.h:6
-msgid "Copy song name to clipboard"
-msgstr "Copia il nome della canzone negli appunti"
-
 #: data/main_window.ui.h:7
-msgid "Copyto Clipboard"
-msgstr "Copia negli Appunti"
-
-#: data/main_window.ui.h:8
-msgid "Download"
-msgstr "Download"
+msgid "Edit Preferences"
+msgstr "Modifica Preferenze"
 
 #: data/main_window.ui.h:9
-msgid "Download selected"
-msgstr "Download selezionati"
+msgid "Menu"
+msgstr "Menu"
 
 #: data/main_window.ui.h:10
-msgid "Exit gSharkDown"
-msgstr "Esci da gSharkDown"
-
-#: data/main_window.ui.h:11
-msgid "Get Lyrics"
-msgstr "Scarica Testi brani"
-
-#: data/main_window.ui.h:12
-msgid "Info"
-msgstr "Info"
-
-#: data/main_window.ui.h:13
-msgid "Information about the application"
-msgstr "Informazioni sull'applicazione"
-
-#: data/main_window.ui.h:14
 msgid "Next"
 msgstr "Prossimo"
 
-#: data/main_window.ui.h:15
-msgid "Open Prefrences"
-msgstr "Apri Preferenze"
-
-#: data/main_window.ui.h:16
+#: data/main_window.ui.h:11
 msgid "Open saved playlist"
 msgstr "Apri playlist salvata"
 
-#: data/main_window.ui.h:17
+#: data/main_window.ui.h:12
 msgid "Play/Stop"
 msgstr "Play/Stop"
 
-#: data/main_window.ui.h:18
-#: data/preferenes_dialog.ui.h:5
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: data/main_window.ui.h:19
+#: data/main_window.ui.h:13
 msgid "Previous"
 msgstr "Precedente"
 
-#: data/main_window.ui.h:20
-msgid "Quit"
-msgstr "Esci"
+#: data/main_window.ui.h:14
+msgid "Quit the application"
+msgstr "Chiudi applicazione"
 
-#: data/main_window.ui.h:21
+#: data/main_window.ui.h:15
 msgid "Remove item from playlist"
 msgstr "Rimuovi voce dalla playlist"
 
-#: data/main_window.ui.h:23
-msgid "Search a lyrics for selected song from the playlist"
-msgstr "Cerca il testo del brano selezionato nella playlist"
-
-#: data/main_window.ui.h:24
+#: data/main_window.ui.h:17
 msgid "Search the grooveshark"
 msgstr "Esplora grooveshark"
 
-#: data/main_window.ui.h:25
-msgid "Show selection info"
-msgstr "Mostra informazioni selezione"
+#: data/main_window.ui.h:18
+msgid "Settings"
+msgstr "Opzioni"
 
-#: data/main_window.ui.h:26
+#: data/main_window.ui.h:19
+msgid "Show About dialog"
+msgstr "Mostra riquadro informazioni"
+
+#: data/main_window.ui.h:20
 msgid "Toggle Repeat all"
-msgstr "Alterna Ripeti tutto"
+msgstr "Riproduzione continua"
 
-#: data/main_window.ui.h:27
+#: data/main_window.ui.h:21
 msgid "Toggle Shuffle"
-msgstr "Alterna Casuale"
+msgstr "Riproduzione Casuale"
 
-#: data/main_window.ui.h:28
+#: data/main_window.ui.h:22
 msgid "gSharkDown"
 msgstr "gSharkDown"
 
-#: data/main_window.ui.h:29
-msgid "label"
-msgstr "label"
-
 #: data/preferenes_dialog.ui.h:1
 msgid "<b>Last.fm Scrobbling</b>"
 msgstr "<b>Last.fm Scrobbling</b>"
 
 #: data/preferenes_dialog.ui.h:2
+msgid "Check for updates on startup"
+msgstr "Controlla eventuali aggiornamenti all'avvio"
+
+#: data/preferenes_dialog.ui.h:3
 msgid "Download Directory:"
 msgstr "Download Directory:"
 
-#: data/preferenes_dialog.ui.h:3
+#: data/preferenes_dialog.ui.h:4
 msgid "Enable Last.fm Scrobbling"
 msgstr "Abilita Last.fm Scrobbling"
 
-#: data/preferenes_dialog.ui.h:4
+#: data/preferenes_dialog.ui.h:5
 msgid "Password:  "
-msgstr "Password:     "
+msgstr "Password:  "
 
 #: data/preferenes_dialog.ui.h:6
-msgid "Quit application on close without confirmation"
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: data/preferenes_dialog.ui.h:7
+msgid "Quit application without confirmation"
 msgstr "Chiudi applicazione in uscita senza confermare"
 
-#: data/preferenes_dialog.ui.h:7
+#: data/preferenes_dialog.ui.h:8
+msgid "Select the download directory"
+msgstr "Seleziona la directory di download"
+
+#: data/preferenes_dialog.ui.h:9
 msgid "Show notifications on track change"
-msgstr "Mostra notificazioni al cambio di brano"
+msgstr "Mostra notifiche al cambio di brano"
 
-#: data/preferenes_dialog.ui.h:8
+#: data/preferenes_dialog.ui.h:10
 msgid "Username:"
 msgstr "Nome Utente:"
 
 msgid ""
 "Bulgarian - Vladimir Kolev\n"
 "German - Vladimir Kolev\n"
-"Italian -  Andrea Sciucca"
+"Italian -  Andrea Sciucca\n"
+"Spanish - Damián Nohales"
 msgstr ""
 "Bulgarian - Vladimir Kolev\n"
 "German - Vladimir Kolev\n"
-"Italian -  Andrea Sciucca"
+"Italian -  Andrea Sciucca\n"
+"Spanish - Damián Nohales"
 
-#: data/about_dialog.ui.h:8
+#: data/about_dialog.ui.h:9
 msgid "Flattr gSharkDow"
 msgstr "Flattr gSharkDow"
 
-#: data/about_dialog.ui.h:9
+#: data/about_dialog.ui.h:10
 msgid "Gnome-toolkit based desktop application for downloading music files from Grooveshark.com"
 msgstr "Applicazione basata sulle librerie Gnome per il download dei brani da Grooveshark.com"
 
-#: data/about_dialog.ui.h:10
+#: data/about_dialog.ui.h:11
 msgid ""
 "gSharkDown is licensed under the GNU GPL v3 License\n"
 "\n"
 "La libreria groove.py è sviluppatada George Stephanos (jacktheripper51 @ github)\n"
 "Indirizzo dei sorgenti: https://github.com/jacktheripper51/groove-dl"
 
-#~ msgid "Ready"
-#~ msgstr "Pronto"
-#~ msgid "<b>Lyrics for:</b>"
-#~ msgstr "<b>Testi за:</b>"
-#~ msgid "Lyrics viewer"
-#~ msgstr "Visualizzatore testi"
-#~ msgid "ERROR: Cant't find lyrics for {artist} - {track}"
-#~ msgstr "ERRORE! Impossibile trovare i testi per {artist} - {track}"
-#~ msgid "Downloaded!"
-#~ msgstr "Scaricato"
+#: data/lyrics_dialog.ui.h:1
+msgid "<b>Lyrics for:</b>"
+msgstr "<b>Testi per:</b>"
 
+#: data/lyrics_dialog.ui.h:2
+msgid "Lyrics viewer"
+msgstr "Visualizzatore testi"
+
+#: data/lyrics_dialog.ui.h:3
+msgid "label"
+msgstr "etichetta"
+