Fixed shortcuts that need no translations.

Also added a missing tr() and restored system locale detection

diff --git a/locale/es_AR.ts b/locale/es_AR.ts
index b5645854c4b00b1101ebf378cee750f4a1bef4e6..3ec7c570c44dd59d624abfe4b6f008c636e58285 100644 (file)
--- a/locale/es_AR.ts
+++ b/locale/es_AR.ts
@@ -5,57 +5,62 @@
 <context>
     <name>AboutView</name>
     <message>
-        <location filename="src/AboutView.cpp" line="20"/>
+        <location filename="../src/AboutView.cpp" line="20"/>
         <source>There&apos;s life outside the browser!</source>
         <translation>Hay vida fuera del navegador!</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="21"/>
+        <location filename="../src/AboutView.cpp" line="21"/>
         <source>Version %1</source>
         <translation>Versión-%1</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="24"/>
+        <location filename="../src/AboutView.cpp" line="24"/>
         <source>This is a &quot;Technology Preview&quot; release, do not expect it to be perfect.</source>
         <translation>Esta es a edicion &quot;Technology Preview&quot;. no espere que sea perfecta.</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="25"/>
+        <location filename="../src/AboutView.cpp" line="25"/>
         <source>Report bugs and send in your ideas to %1</source>
         <translation>Reportar errores y envia tus idea a %1</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="28"/>
+        <location filename="../src/AboutView.cpp" line="28"/>
         <source>%1 is Free Software but its development takes precious time.</source>
         <translation>%1 es Software Libre pero su desarrollo lleva tiempo.</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="29"/>
+        <location filename="../src/AboutView.cpp" line="29"/>
         <source>Please &lt;a href=&apos;%1&apos;&gt;donate via PayPal&lt;/a&gt; to support the continued development of %2.</source>
         <translation>Por favor &lt;a href=&apos;%1&apos;&gt;donar a través de PayPal para colaborar con el desarrollo de %2.</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="32"/>
+        <location filename="../src/AboutView.cpp" line="32"/>
         <source>Icon designed by %1.</source>
         <translation>Iconos diseñados por %1.</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="34"/>
+        <location filename="../src/AboutView.cpp" line="34"/>
         <source>Translated by %1</source>
         <translation>Traducido por %1</translation>
     </message>
     <message>
-        <location filename="src/AboutView.cpp" line="36"/>
+        <location filename="../src/AboutView.cpp" line="39"/>
         <source>Released under the &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</source>
         <translation>Desarrollado bajo &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="src/AboutView.h" line="18"/>
+        <location filename="../src/AboutView.cpp" line="49"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AboutView.h" line="18"/>
         <source>About</source>
         <translation>Acerca</translation>
     </message>
     <message>
-        <location filename="src/AboutView.h" line="20"/>
+        <location filename="../src/AboutView.h" line="20"/>
         <source>What you always wanted to know about %1 and never dared to ask</source>
         <translation>Que es lo que siempre quisiste saber acerca de %1 y nunca lo preguntaste</translation>
     </message>
@@ -63,7 +68,7 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="src/searchlineedit.cpp" line="50"/>
+        <location filename="../src/searchlineedit.cpp" line="50"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
@@ -71,22 +76,22 @@
 <context>
     <name>ListModel</name>
     <message>
-        <location filename="src/ListModel.cpp" line="44"/>
+        <location filename="../src/ListModel.cpp" line="44"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="src/ListModel.cpp" line="45"/>
+        <location filename="../src/ListModel.cpp" line="45"/>
         <source>Show %1 More</source>
         <translation>Mostrar %1 más</translation>
     </message>
     <message>
-        <location filename="src/ListModel.cpp" line="46"/>
+        <location filename="../src/ListModel.cpp" line="46"/>
         <source>No videos</source>
         <translation>No videos</translation>
     </message>
     <message>
-        <location filename="src/ListModel.cpp" line="47"/>
+        <location filename="../src/ListModel.cpp" line="47"/>
         <source>No more videos</source>
         <translation>No más videos</translation>
     </message>
@@ -94,229 +99,223 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/MainWindow.cpp" line="89"/>
+        <location filename="../src/MainWindow.cpp" line="89"/>
         <source>&amp;Back</source>
         <translation>&amp;Atrás</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="91"/>
         <source>Alt+Left</source>
-        <translation>Retroceder</translation>
+        <translation type="obsolete">Retroceder</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="92"/>
+        <location filename="../src/MainWindow.cpp" line="92"/>
         <source>Go to the previous view</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="96"/>
+        <location filename="../src/MainWindow.cpp" line="96"/>
         <source>&amp;Stop</source>
         <translation>&amp;Parar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="97"/>
+        <location filename="../src/MainWindow.cpp" line="97"/>
         <source>Stop playback and go back to the search view</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="98"/>
-        <location filename="src/MainWindow.cpp" line="462"/>
-        <location filename="src/MainWindow.cpp" line="466"/>
         <source>Esc</source>
-        <translation>Escape</translation>
+        <translation type="obsolete">Escape</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="102"/>
+        <location filename="../src/MainWindow.cpp" line="102"/>
         <source>S&amp;kip</source>
         <translation>&amp;Saltar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="103"/>
+        <location filename="../src/MainWindow.cpp" line="103"/>
         <source>Skip to the next video</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="104"/>
         <source>Ctrl+Right</source>
-        <translation>Avanzar</translation>
+        <translation type="obsolete">Avanzar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="109"/>
-        <location filename="src/MainWindow.cpp" line="423"/>
+        <location filename="../src/MainWindow.cpp" line="109"/>
+        <location filename="../src/MainWindow.cpp" line="416"/>
         <source>&amp;Pause</source>
         <translation>&amp;Pausar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="110"/>
-        <location filename="src/MainWindow.cpp" line="424"/>
+        <location filename="../src/MainWindow.cpp" line="110"/>
+        <location filename="../src/MainWindow.cpp" line="417"/>
         <source>Pause playback</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="111"/>
         <source>Space</source>
-        <translation>Espacio</translation>
+        <translation type="obsolete">Espacio</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="116"/>
-        <location filename="src/MainWindow.cpp" line="461"/>
+        <location filename="../src/MainWindow.cpp" line="116"/>
+        <location filename="../src/MainWindow.cpp" line="454"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="117"/>
+        <location filename="../src/MainWindow.cpp" line="117"/>
         <source>Go full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="118"/>
-        <location filename="src/MainWindow.cpp" line="460"/>
         <source>Alt+Return</source>
-        <translation>Pantalla completa</translation>
+        <translation type="obsolete">Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="132"/>
+        <location filename="../src/MainWindow.cpp" line="132"/>
         <source>&amp;YouTube</source>
         <translation>&amp;YouTube</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="133"/>
+        <location filename="../src/MainWindow.cpp" line="133"/>
         <source>Open the YouTube video page</source>
         <translation>Abrir YouTube</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="134"/>
+        <location filename="../src/MainWindow.cpp" line="134"/>
         <source>Ctrl+Y</source>
-        <translation>Ir a YouTube</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="139"/>
+        <location filename="../src/MainWindow.cpp" line="139"/>
         <source>&amp;Remove</source>
         <translation>&amp;Borrar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="140"/>
+        <location filename="../src/MainWindow.cpp" line="140"/>
         <source>Remove the selected videos from the playlist</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="148"/>
+        <location filename="../src/MainWindow.cpp" line="148"/>
         <source>Move &amp;Up</source>
         <translation>&amp;Arriba</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="149"/>
+        <location filename="../src/MainWindow.cpp" line="149"/>
         <source>Move up the selected videos in the playlist</source>
         <translation>Arriba</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="150"/>
         <source>Ctrl+Up</source>
-        <translation>Arriba</translation>
+        <translation type="obsolete">Arriba</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="155"/>
+        <location filename="../src/MainWindow.cpp" line="155"/>
         <source>Move &amp;Down</source>
         <translation>&amp;Abajo</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="156"/>
+        <location filename="../src/MainWindow.cpp" line="156"/>
         <source>Move down the selected videos in the playlist</source>
         <translation>Abajo</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="157"/>
         <source>Ctrl+Down</source>
-        <translation>Arriba</translation>
+        <translation type="obsolete">Arriba</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="162"/>
+        <location filename="../src/MainWindow.cpp" line="162"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="164"/>
+        <location filename="../src/MainWindow.cpp" line="164"/>
         <source>Ctrl+Q</source>
-        <translation>Salir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="165"/>
+        <location filename="../src/MainWindow.cpp" line="165"/>
         <source>Bye</source>
         <translation>Adiós</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="169"/>
+        <location filename="../src/MainWindow.cpp" line="169"/>
         <source>&amp;Website</source>
         <translation>&amp;Sitio web</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="171"/>
         <source>Minitube on the Web</source>
-        <translation>Minitube en internet</translation>
+        <translation type="obsolete">Minitube en internet</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="171"/>
+        <source>%1 on the Web</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="175"/>
+        <location filename="../src/MainWindow.cpp" line="175"/>
         <source>&amp;Donate via PayPal</source>
         <translation>&amp;Donar-a-través de PayPal</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="176"/>
+        <location filename="../src/MainWindow.cpp" line="176"/>
         <source>Please support the continued development of %1</source>
         <translation>Por favor apoyo el desarrollo continuo de-%1</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="180"/>
+        <location filename="../src/MainWindow.cpp" line="180"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="182"/>
+        <location filename="../src/MainWindow.cpp" line="182"/>
         <source>Info about %1</source>
         <translation>Acercá de-%1</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="186"/>
+        <location filename="../src/MainWindow.cpp" line="186"/>
         <source>&amp;Search</source>
         <translation>&amp;Buscar</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="212"/>
+        <location filename="../src/MainWindow.cpp" line="212"/>
         <source>&amp;Application</source>
         <translation>&amp;Aplicación</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="220"/>
+        <location filename="../src/MainWindow.cpp" line="220"/>
         <source>&amp;Playlist</source>
         <translation>&amp;Lista de reproducción</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="227"/>
+        <location filename="../src/MainWindow.cpp" line="227"/>
         <source>&amp;Video</source>
         <translation>&amp;Video</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="238"/>
+        <location filename="../src/MainWindow.cpp" line="238"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="365"/>
-        <location filename="src/MainWindow.cpp" line="371"/>
+        <location filename="../src/MainWindow.cpp" line="358"/>
+        <location filename="../src/MainWindow.cpp" line="364"/>
         <source>Opening %1</source>
         <translation>Abriendo-%1</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="437"/>
+        <location filename="../src/MainWindow.cpp" line="430"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproducir</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="438"/>
+        <location filename="../src/MainWindow.cpp" line="431"/>
         <source>Resume playback</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="467"/>
+        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Exit &amp;Full Screen</source>
         <translation>&amp;Salir de pantalla completa</translation>
     </message>
@@ -324,22 +323,22 @@
 <context>
     <name>MediaView</name>
     <message>
-        <location filename="src/MediaView.cpp" line="22"/>
+        <location filename="../src/MediaView.cpp" line="22"/>
         <source>Most relevant</source>
         <translation>Más relevantes</translation>
     </message>
     <message>
-        <location filename="src/MediaView.cpp" line="25"/>
+        <location filename="../src/MediaView.cpp" line="25"/>
         <source>Most recent</source>
         <translation>Más recientes</translation>
     </message>
     <message>
-        <location filename="src/MediaView.cpp" line="28"/>
+        <location filename="../src/MediaView.cpp" line="28"/>
         <source>Most viewed</source>
         <translation>Más visitadas</translation>
     </message>
     <message>
-        <location filename="src/MediaView.h" line="30"/>
+        <location filename="../src/MediaView.h" line="30"/>
         <source>You&apos;re watching &quot;%1&quot;</source>
         <translation>Estás viendo %1</translation>
     </message>
@@ -347,7 +346,7 @@
 <context>
     <name>PrettyItemDelegate</name>
     <message>
-        <location filename="src/playlist/PrettyItemDelegate.cpp" line="122"/>
+        <location filename="../src/playlist/PrettyItemDelegate.cpp" line="122"/>
         <source>%1 views</source>
         <translation>%1-visitas</translation>
     </message>
@@ -355,7 +354,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="src/searchlineedit.cpp" line="171"/>
+        <location filename="../src/searchlineedit.cpp" line="171"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
@@ -363,32 +362,32 @@
 <context>
     <name>SearchView</name>
     <message>
-        <location filename="src/SearchView.cpp" line="30"/>
+        <location filename="../src/SearchView.cpp" line="30"/>
         <source>Welcome to &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;,</source>
         <translation>Bienvenidos a &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="src/SearchView.cpp" line="37"/>
+        <location filename="../src/SearchView.cpp" line="37"/>
         <source>Enter a keyword to start watching videos.</source>
         <translation>Ingrese palabra a buscar.</translation>
     </message>
     <message>
-        <location filename="src/SearchView.cpp" line="54"/>
+        <location filename="../src/SearchView.cpp" line="54"/>
         <source>Watch</source>
         <translation>Viendo</translation>
     </message>
     <message>
-        <location filename="src/SearchView.cpp" line="69"/>
+        <location filename="../src/SearchView.cpp" line="69"/>
         <source>Recent keywords</source>
         <translation>Búsquedas recientes</translation>
     </message>
     <message>
-        <location filename="src/SearchView.cpp" line="180"/>
+        <location filename="../src/SearchView.cpp" line="180"/>
         <source>A new version of %1 is available. Please &lt;a href=&apos;%2&apos;&gt;update to version %3&lt;/a&gt;</source>
         <translation>Una nueva versión de %1 esta disponible. Por favor &lt;a href=&apos;%2&apos;&gt;actualice a la version %3&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="src/SearchView.h" line="27"/>
+        <location filename="../src/SearchView.h" line="27"/>
         <source>Make yourself comfortable</source>
         <translation>Personalizar</translation>
     </message>
@@ -396,7 +395,7 @@
 <context>
     <name>SettingsView</name>
     <message>
-        <location filename="src/SettingsView.h" line="17"/>
+        <location filename="../src/SettingsView.h" line="17"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>

diff --git a/locale/it_IT.ts b/locale/it_IT.ts
index cb04d02d11f6cb2a6b7eff277fce41a867fea874..8816ad57f6533b82942d55c9dbc06fffeabddc2c 100644 (file)
--- a/locale/it_IT.ts
+++ b/locale/it_IT.ts
@@ -45,10 +45,15 @@
         <translation>Tradotto da %1</translation>
     </message>
     <message>
-        <location filename="../src/AboutView.cpp" line="36"/>
+        <location filename="../src/AboutView.cpp" line="39"/>
         <source>Released under the &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</source>
         <translation>Rilasciato sotto licenza &lt;a href=&quot;%1&quot;&gt;GNU General Public License&lt;/a&gt;</translation>
     </message>
+    <message>
+        <location filename="../src/AboutView.cpp" line="49"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Chiudi</translation>
+    </message>
     <message>
         <location filename="../src/AboutView.h" line="18"/>
         <source>About</source>
@@ -98,11 +103,6 @@
         <source>&amp;Back</source>
         <translation>&amp;Indietro</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="91"/>
-        <source>Alt+Left</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="92"/>
         <source>Go to the previous view</source>
@@ -118,13 +118,6 @@
         <source>Stop playback and go back to the search view</source>
         <translation>Ferma il video e torna alla ricerca</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="98"/>
-        <location filename="../src/MainWindow.cpp" line="462"/>
-        <location filename="../src/MainWindow.cpp" line="466"/>
-        <source>Esc</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="102"/>
         <source>S&amp;kip</source>
@@ -135,31 +128,21 @@
         <source>Skip to the next video</source>
         <translation>Salta al prossimo video</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="104"/>
-        <source>Ctrl+Right</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="109"/>
-        <location filename="../src/MainWindow.cpp" line="423"/>
+        <location filename="../src/MainWindow.cpp" line="416"/>
         <source>&amp;Pause</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="110"/>
-        <location filename="../src/MainWindow.cpp" line="424"/>
+        <location filename="../src/MainWindow.cpp" line="417"/>
         <source>Pause playback</source>
         <translation>Metti in pausa</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="111"/>
-        <source>Space</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="116"/>
-        <location filename="../src/MainWindow.cpp" line="461"/>
+        <location filename="../src/MainWindow.cpp" line="454"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Schermo intero</translation>
     </message>
@@ -168,12 +151,6 @@
         <source>Go full screen</source>
         <translation>Vai in modalità schermo intero</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="118"/>
-        <location filename="../src/MainWindow.cpp" line="460"/>
-        <source>Alt+Return</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="132"/>
         <source>&amp;YouTube</source>
@@ -209,11 +186,6 @@
         <source>Move up the selected videos in the playlist</source>
         <translation>Sposta video selezionati verso l&apos;alto</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="150"/>
-        <source>Ctrl+Up</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="155"/>
         <source>Move &amp;Down</source>
@@ -224,11 +196,6 @@
         <source>Move down the selected videos in the playlist</source>
         <translation>Sposta i video selezionati verso il basso</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="157"/>
-        <source>Ctrl+Down</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="162"/>
         <source>&amp;Quit</source>
@@ -250,9 +217,13 @@
         <translation>Sito &amp;web</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
         <source>Minitube on the Web</source>
-        <translation>Minitube sul Web</translation>
+        <translation type="obsolete">Minitube sul Web</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="171"/>
+        <source>%1 on the Web</source>
+        <translation>%1 sul Web</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="175"/>
@@ -300,23 +271,23 @@
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="365"/>
-        <location filename="../src/MainWindow.cpp" line="371"/>
+        <location filename="../src/MainWindow.cpp" line="358"/>
+        <location filename="../src/MainWindow.cpp" line="364"/>
         <source>Opening %1</source>
         <translation>Apertura di %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="437"/>
+        <location filename="../src/MainWindow.cpp" line="430"/>
         <source>&amp;Play</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="438"/>
+        <location filename="../src/MainWindow.cpp" line="431"/>
         <source>Resume playback</source>
         <translation>Continua</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="467"/>
+        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Exit &amp;Full Screen</source>
         <translation>&amp;Esci dallo schermo intero</translation>
     </message>

diff --git a/locale/locale.pri b/locale/locale.pri
index e428eeced20600248757a8b7c8e388e330cceb86..e480367c2888331c0e50c6302d5e2a3eba5617ad 100644 (file)
--- a/locale/locale.pri
+++ b/locale/locale.pri
@@ -6,7 +6,8 @@ DEPENDPATH += $$PWD
 TRANSLATIONS += \
     it_IT.ts \
     pt_BR.ts \
-    ru_RU.ts
+    ru_RU.ts \
+    es_AR.ts
 
 isEmpty(QMAKE_LRELEASE) {
     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe -silent

diff --git a/locale/pt_BR.ts b/locale/pt_BR.ts
index c281b3891cf278b1ab6a7e4dcb8c8a4972b7bab4..16f10460715a363c29f815ef07bc4bd1177882c3 100644 (file)
--- a/locale/pt_BR.ts
+++ b/locale/pt_BR.ts
@@ -45,10 +45,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AboutView.cpp" line="36"/>
+        <location filename="../src/AboutView.cpp" line="39"/>
         <source>Released under the &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</source>
         <translation>Lançado sob a &lt;a href=&apos;%1&apos;&gt;Licença Pública Geral GNU&lt;/a&gt;</translation>
     </message>
+    <message>
+        <location filename="../src/AboutView.cpp" line="49"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/AboutView.h" line="18"/>
         <source>About</source>
@@ -99,9 +104,8 @@
         <translation>&amp;Voltar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="91"/>
         <source>Alt+Left</source>
-        <translation>Alt+Left</translation>
+        <translation type="obsolete">Alt+Left</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="92"/>
@@ -119,11 +123,8 @@
         <translation>Parar a reprodução e voltar à visualização da pesquisa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="98"/>
-        <location filename="../src/MainWindow.cpp" line="462"/>
-        <location filename="../src/MainWindow.cpp" line="466"/>
         <source>Esc</source>
-        <translation>Esc</translation>
+        <translation type="obsolete">Esc</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="102"/>
@@ -136,30 +137,28 @@
         <translation>Pular para o próximo vídeo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="104"/>
         <source>Ctrl+Right</source>
-        <translation>Ctrl+Right</translation>
+        <translation type="obsolete">Ctrl+Right</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="109"/>
-        <location filename="../src/MainWindow.cpp" line="423"/>
+        <location filename="../src/MainWindow.cpp" line="416"/>
         <source>&amp;Pause</source>
         <translation>&amp;Pausar</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="110"/>
-        <location filename="../src/MainWindow.cpp" line="424"/>
+        <location filename="../src/MainWindow.cpp" line="417"/>
         <source>Pause playback</source>
         <translation>Pausar a reprodução</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="111"/>
         <source>Space</source>
-        <translation>Barra de espaço</translation>
+        <translation type="obsolete">Barra de espaço</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="116"/>
-        <location filename="../src/MainWindow.cpp" line="461"/>
+        <location filename="../src/MainWindow.cpp" line="454"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Tela Cheia</translation>
     </message>
@@ -169,10 +168,8 @@
         <translation>Ir para a tela cheia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="118"/>
-        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Alt+Return</source>
-        <translation>Alt+Enter</translation>
+        <translation type="obsolete">Alt+Enter</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="132"/>
@@ -210,9 +207,8 @@
         <translation>Mover para cima os vídeos selecionados na playlist</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="150"/>
         <source>Ctrl+Up</source>
-        <translation>Ctrl+Up</translation>
+        <translation type="obsolete">Ctrl+Up</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="155"/>
@@ -225,9 +221,8 @@
         <translation>Mover para baixo os vídeos selecionados na playlist</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="157"/>
         <source>Ctrl+Down</source>
-        <translation>Ctrl+Down</translation>
+        <translation type="obsolete">Ctrl+Down</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="162"/>
@@ -250,9 +245,13 @@
         <translation>&amp;Website</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
         <source>Minitube on the Web</source>
-        <translation>Minitube na Web</translation>
+        <translation type="obsolete">Minitube na Web</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="171"/>
+        <source>%1 on the Web</source>
+        <translation>%1 na Web</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="175"/>
@@ -300,23 +299,23 @@
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="365"/>
-        <location filename="../src/MainWindow.cpp" line="371"/>
+        <location filename="../src/MainWindow.cpp" line="358"/>
+        <location filename="../src/MainWindow.cpp" line="364"/>
         <source>Opening %1</source>
         <translation>Abrindo %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="437"/>
+        <location filename="../src/MainWindow.cpp" line="430"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproduzir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="438"/>
+        <location filename="../src/MainWindow.cpp" line="431"/>
         <source>Resume playback</source>
         <translation>Continuar reprodução</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="467"/>
+        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Exit &amp;Full Screen</source>
         <translation>Sair de &amp;Tela Cheia</translation>
     </message>

diff --git a/locale/ru_RU.ts b/locale/ru_RU.ts
index bef123fbc498e30a74ef0762143b32de287aab2e..5618fd2c588606ba01b705a24f13727d68b6bbb7 100644 (file)
--- a/locale/ru_RU.ts
+++ b/locale/ru_RU.ts
@@ -45,10 +45,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AboutView.cpp" line="36"/>
+        <location filename="../src/AboutView.cpp" line="39"/>
         <source>Released under the &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</source>
         <translation>Выпущено на условиях &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</translation>
     </message>
+    <message>
+        <location filename="../src/AboutView.cpp" line="49"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/AboutView.h" line="18"/>
         <source>About</source>
@@ -99,9 +104,8 @@
         <translation>&amp;Назад</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="91"/>
         <source>Alt+Left</source>
-        <translation>Alt+стрелка назад</translation>
+        <translation type="obsolete">Alt+стрелка назад</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="92"/>
@@ -119,11 +123,8 @@
         <translation>Остановить воспроизведение и вернуться к поиску</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="98"/>
-        <location filename="../src/MainWindow.cpp" line="462"/>
-        <location filename="../src/MainWindow.cpp" line="466"/>
         <source>Esc</source>
-        <translation>Esc</translation>
+        <translation type="obsolete">Esc</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="102"/>
@@ -136,30 +137,28 @@
         <translation>Перейти к следующему видео</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="104"/>
         <source>Ctrl+Right</source>
-        <translation>Ctrl+стрелка вправо</translation>
+        <translation type="obsolete">Ctrl+стрелка вправо</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="109"/>
-        <location filename="../src/MainWindow.cpp" line="423"/>
+        <location filename="../src/MainWindow.cpp" line="416"/>
         <source>&amp;Pause</source>
         <translation>&amp;Приостановить</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="110"/>
-        <location filename="../src/MainWindow.cpp" line="424"/>
+        <location filename="../src/MainWindow.cpp" line="417"/>
         <source>Pause playback</source>
         <translation>Приостановить воспроизведение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="111"/>
         <source>Space</source>
-        <translation>Пробел</translation>
+        <translation type="obsolete">Пробел</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="116"/>
-        <location filename="../src/MainWindow.cpp" line="461"/>
+        <location filename="../src/MainWindow.cpp" line="454"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;На весь экран</translation>
     </message>
@@ -169,10 +168,8 @@
         <translation>Полноэкранное воспроизведение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="118"/>
-        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Alt+Return</source>
-        <translation>Alt+Enter</translation>
+        <translation type="obsolete">Alt+Enter</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="132"/>
@@ -210,9 +207,8 @@
         <translation>Сдвинуть выбранные видеоклипы вверх в списке воспроизведения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="150"/>
         <source>Ctrl+Up</source>
-        <translation>Ctrl+стрелка вверх</translation>
+        <translation type="obsolete">Ctrl+стрелка вверх</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="155"/>
@@ -225,9 +221,8 @@
         <translation>Сдвинуть выбранные видеоклипы вниз в списке воспроизведения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="157"/>
         <source>Ctrl+Down</source>
-        <translation>Ctrl+стрелка вниз</translation>
+        <translation type="obsolete">Ctrl+стрелка вниз</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="162"/>
@@ -250,9 +245,13 @@
         <translation>&amp;Домашняя страница</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
         <source>Minitube on the Web</source>
-        <translation>Minitube в интернете</translation>
+        <translation type="obsolete">Minitube в интернете</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="171"/>
+        <source>%1 on the Web</source>
+        <translation>%1 в интернете</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="175"/>
@@ -300,23 +299,23 @@
         <translation>Спр&amp;авка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="365"/>
-        <location filename="../src/MainWindow.cpp" line="371"/>
+        <location filename="../src/MainWindow.cpp" line="358"/>
+        <location filename="../src/MainWindow.cpp" line="364"/>
         <source>Opening %1</source>
         <translation>Открытие %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="437"/>
+        <location filename="../src/MainWindow.cpp" line="430"/>
         <source>&amp;Play</source>
         <translation>Пр&amp;оиграть</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="438"/>
+        <location filename="../src/MainWindow.cpp" line="431"/>
         <source>Resume playback</source>
         <translation>Продолжить воспроизведение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="467"/>
+        <location filename="../src/MainWindow.cpp" line="460"/>
         <source>Exit &amp;Full Screen</source>
         <translation>В&amp;ыйти из полноэкранного воспроизведения</translation>
     </message>

diff --git a/src/AboutView.cpp b/src/AboutView.cpp
index a94ecbf34e793096eb48c79cba4f9ece57cce40e..1ef93b7fbb2eadd1d4d5b89104aa07e3a16a519a 100644 (file)
--- a/src/AboutView.cpp
+++ b/src/AboutView.cpp
@@ -31,7 +31,10 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) {
 
                    "<p>" + tr("Icon designed by %1.").arg("Sebastian Kraft") + "</p>"
 
-                   "<p>" + tr("Translated by %1").arg("Nikita Lyalin (ru_RU), Márcio Moraes (pt_BR)") + "</p>"
+                   "<p>" + tr("Translated by %1").arg("Nikita Lyalin (ru_RU), "
+                                                      "Márcio Moraes (pt_BR), "
+                                                      "Sergio Tocalini Joerg (es_AR)"
+                                                      ) + "</p>"
 
                    "<p>" + tr("Released under the <a href='%1'>GNU General Public License</a>")
                    .arg("http://www.gnu.org/licenses/gpl.html") + "</p>"
@@ -43,7 +46,7 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) {
 
     QLayout *buttonLayout = new QHBoxLayout();
     buttonLayout->setAlignment(Qt::AlignLeft);
-    QPushButton *closeButton = new QPushButton("&Close", this);
+    QPushButton *closeButton = new QPushButton(tr("&Close"), this);
     closeButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
     closeButton->setDefault(true);

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 1f9ed557833bb501210b2e18e15dbf26dfe0e2bf..00ce011497f91d16686b13f9b8e337cfc16c8baf 100755 (executable)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -88,34 +88,34 @@ void MainWindow::createActions() {
     
     backAct = new QAction(QIcon(":/images/go-previous.png"), tr("&Back"), this);
     backAct->setEnabled(false);
-    backAct->setShortcut(tr("Alt+Left"));
+    backAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Left));
     backAct->setStatusTip(tr("Go to the previous view"));
     actions->insert("back", backAct);
     connect(backAct, SIGNAL(triggered()), this, SLOT(goBack()));
 
     stopAct = new QAction(QtIconLoader::icon("media-stop", QIcon(":/images/stop.png")), tr("&Stop"), this);
     stopAct->setStatusTip(tr("Stop playback and go back to the search view"));
-    stopAct->setShortcut(tr("Esc"));
+    stopAct->setShortcut(QKeySequence(Qt::Key_Escape));
     actions->insert("stop", stopAct);
     connect(stopAct, SIGNAL(triggered()), this, SLOT(stop()));
 
     skipAct = new QAction(QtIconLoader::icon("media-skip-forward", QIcon(":/images/skip.png")), tr("S&kip"), this);
     skipAct->setStatusTip(tr("Skip to the next video"));
-    skipAct->setShortcut(tr("Ctrl+Right"));
+    skipAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
     skipAct->setEnabled(false);
     actions->insert("skip", skipAct);
     connect(skipAct, SIGNAL(triggered()), mediaView, SLOT(skip()));
 
     pauseAct = new QAction(QtIconLoader::icon("media-pause", QIcon(":/images/pause.png")), tr("&Pause"), this);
     pauseAct->setStatusTip(tr("Pause playback"));
-    pauseAct->setShortcut(tr("Space"));
+    pauseAct->setShortcut(QKeySequence(Qt::Key_Space));
     pauseAct->setEnabled(false);
     actions->insert("pause", pauseAct);
     connect(pauseAct, SIGNAL(triggered()), mediaView, SLOT(pause()));
 
     fullscreenAct = new QAction(QtIconLoader::icon("view-fullscreen", QIcon(":/images/view-fullscreen.png")), tr("&Full Screen"), this);
     fullscreenAct->setStatusTip(tr("Go full screen"));
-    fullscreenAct->setShortcut(tr("Alt+Return"));
+    fullscreenAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Enter));
     fullscreenAct->setShortcutContext(Qt::ApplicationShortcut);
     actions->insert("fullscreen", fullscreenAct);
     connect(fullscreenAct, SIGNAL(triggered()), this, SLOT(fullscreen()));
@@ -147,14 +147,14 @@ void MainWindow::createActions() {
 
     moveUpAct = new QAction(QtIconLoader::icon("go-up", QIcon(":/images/go-up.png")), tr("Move &Up"), this);
     moveUpAct->setStatusTip(tr("Move up the selected videos in the playlist"));
-    moveUpAct->setShortcut(tr("Ctrl+Up"));
+    moveUpAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
     moveUpAct->setEnabled(false);
     actions->insert("moveUp", moveUpAct);
     connect(moveUpAct, SIGNAL(triggered()), mediaView, SLOT(moveUpSelected()));
 
     moveDownAct = new QAction(QtIconLoader::icon("go-down", QIcon(":/images/go-down.png")), tr("Move &Down"), this);
     moveDownAct->setStatusTip(tr("Move down the selected videos in the playlist"));
-    moveDownAct->setShortcut(tr("Ctrl+Down"));
+    moveDownAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
     moveDownAct->setEnabled(false);
     actions->insert("moveDown", moveDownAct);
     connect(moveDownAct, SIGNAL(triggered()), mediaView, SLOT(moveDownSelected()));
@@ -168,7 +168,7 @@ void MainWindow::createActions() {
 
     siteAct = new QAction(tr("&Website"), this);
     siteAct->setShortcut(QKeySequence::HelpContents);
-    siteAct->setStatusTip(tr("Minitube on the Web"));
+    siteAct->setStatusTip(tr("%1 on the Web").arg(Constants::APP_NAME));
     actions->insert("site", siteAct);
     connect(siteAct, SIGNAL(triggered()), this, SLOT(visitSite()));
 
@@ -450,13 +450,13 @@ void MainWindow::stop() {
 void MainWindow::fullscreen() {
     if (m_fullscreen) {
         mediaView->exitFullscreen();
-        fullscreenAct->setShortcut(tr("Alt+Return"));
+        fullscreenAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Enter));
         fullscreenAct->setText(tr("&Full Screen"));
-        stopAct->setShortcut(tr("Esc"));
+        stopAct->setShortcut(QKeySequence(Qt::Key_Escape));
     } else {
         mediaView->fullscreen();
-        stopAct->setShortcut(tr(""));
-        fullscreenAct->setShortcut(tr("Esc"));
+        stopAct->setShortcut(QString(""));
+        fullscreenAct->setShortcut(QKeySequence(Qt::Key_Escape));
         fullscreenAct->setText(tr("Exit &Full Screen"));
     }
     m_fullscreen = !m_fullscreen;

diff --git a/src/main.cpp b/src/main.cpp
index 98d8ae64d961de502a693957ed905d63794bfbde..6f4166f1964b205f7b3b054e34e9a58c230aa6b8 100755 (executable)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char **argv) {
     app.setOrganizationName(Constants::ORG_NAME);
     app.setOrganizationDomain(Constants::ORG_DOMAIN);
 
-    QString locale = ""; //QLocale::system().name();
+    QString locale = QLocale::system().name();
 
     // qt translations
     QTranslator qtTranslator;