Updated Spanish + Portuguese translation.

- fix: don't show javascript url of bookmarklet in locationbar
  when loading it

AUTHORS

@@ -8,6 +8,7 @@ Mladen Pejaković      <pejakm@gmail.com>              (webview context menu imp
 Bryan M Dunsmore      <dunsmoreb@gmail.com>           (opening background tabs, closing window when closing last tab)
 Mariusz Fik           <fisiu@opensuse.org>            (fixed tab order in preferences dialog)
 Daniele Cocca         <jmc@chakra-project.org>        (close tabs with middle click, initial work on speed dial)
+Giuseppe Calà         <jiveaxe@gmail.com>             (fixed loading of bookmarklets)
 Jan Rajnoha           <honza.rajny@hotmail.com>       (QupZilla icon)
 
 Translators:

git_hooks/README

@@ -1,3 +1,3 @@
 Git hooks that writes current git revision into git_revision file that is afterwards used to show revision in program in About dialog.
 
-Move these scripts into .git/hooks/ directory.
+Install these hooks by running hooks-install.sh script (copy into .git/hooks/ directory)

git_hooks/hooks-install.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Install hooks into .git/hooks directory
+#
+
+cp post-commit ../.git/hooks/post-commit
+cp post-checkout ../.git/hooks/post-checkout
+cp post-merge ../.git/hooks/post-merge

src/app/commandlineoptions.cpp

@@ -53,7 +53,7 @@ void CommandLineOptions::showHelp()
                        " QupZilla is a new, fast and secure web browser\n"
                        " based on WebKit core (http://webkit.org) and\n"
                        " written in Qt Framework (http://qt.nokia.com) \n\n"
-                       " For more informations please visit wiki at \n"
+                       " For more information please visit wiki at \n"
                        " https://github.com/nowrep/QupZilla/wiki \n";
 
     cout << help << " > " << QupZilla::WWWADDRESS.toUtf8().data() << endl;

src/app/qupzilla.cpp

@@ -835,7 +835,7 @@ void QupZilla::aboutToShowHelpMenu()
     m_menuHelp->addAction(m_actionAbout);
     m_menuHelp->addSeparator();
 #endif
-    QAction* infoAction = new QAction(QIcon(":/icons/menu/informations.png"), tr("Information about application"), m_menuHelp);
+    QAction* infoAction = new QAction(tr("Information about application"), m_menuHelp);
     infoAction->setData(QUrl("qupzilla:about"));
     infoAction->setShortcut(QKeySequence(QKeySequence::HelpContents));
     connect(infoAction, SIGNAL(triggered()), this, SLOT(loadActionUrlInNewTab()));
@@ -1103,7 +1103,6 @@ void QupZilla::loadAddress(const QUrl &url)
 {
     weView()->setFocus();
     weView()->load(url);
-    locationBar()->setText(url.toEncoded());
 }
 
 void QupZilla::showCookieManager()
@@ -1561,11 +1560,13 @@ void QupZilla::keyPressEvent(QKeyEvent* event)
         if (event->modifiers() == Qt::ControlModifier) {
             m_tabWidget->createKeyPressEvent(event);
         }
+        QMainWindow::keyPressEvent(event);
         break;
     case Qt::Key_Backtab:
         if (event->modifiers() == (Qt::ControlModifier + Qt::ShiftModifier)) {
             m_tabWidget->createKeyPressEvent(event);
         }
+        QMainWindow::keyPressEvent(event);
         break;
 
     default:

src/src.pro

@@ -14,7 +14,7 @@ MOC_DIR = ../build
 RCC_DIR = ../build
 UI_DIR = ../build
 
-# Please read BUILD informations #
+# Please read BUILD information #
 #DEFINES += NO_SYSTEM_DATAPATH
 #DEFINES += USE_WEBGL
 #DEFINES += KDE

translations/es_ES.ts

@@ -1359,22 +1359,22 @@
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="103"/>
         <source>Executable: </source>
-        <translation type="unfinished"></translation>
+        <translation>Ejecutable:</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="103"/>
         <source>Arguments: </source>
-        <translation type="unfinished"></translation>
+        <translation>Argumentos:</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="104"/>
         <source>Cannot start external download manager</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede iniciar el gestor de descargas externo</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="104"/>
         <source>Cannot start external download manager! %1</source>
-        <translation type="unfinished"></translation>
+        <translation>¡No se puede iniciar el gestor de descargas externo! %1</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="156"/>
@@ -1823,7 +1823,7 @@
         <location filename="../src/network/networkmanager.cpp" line="159"/>
         <location filename="../src/network/networkmanager.cpp" line="188"/>
         <source>SSL Certificate Error!</source>
-        <translation>¡Error del certificad SSL!</translation>
+        <translation>¡Error del certificado SSL!</translation>
     </message>
     <message>
         <location filename="../src/network/networkmanager.cpp" line="174"/>
@@ -2399,12 +2399,12 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="1071"/>
         <source>Allow local storage of HTML5 web content</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir el almacenamiento local de contenido de red HTML5</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1078"/>
         <source>Delete locally stored HTML5 web content on close</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar el contenido de red HTML5 almacenado localmente al cerrar</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1833"/>
@@ -2549,7 +2549,7 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="1104"/>
         <source>Delete now</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar ahora</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1127"/>
@@ -2634,32 +2634,32 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="1554"/>
         <source>&lt;b&gt;External download manager&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Gestor de descargas externo&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1561"/>
         <source>Use external download manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizar un gestor de descargas externo</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1573"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ejecutable:</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1580"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation>Argumentos:</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1707"/>
         <source>Filter tracking cookies</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrar cookies de rastreo</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1751"/>
         <source>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first!</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Aviso:&lt;/b&gt; Las opciones Coincidir con el dominio exacto y Filtrar cookies de rastreo pueden ocasionar que se denieguen algunas cookies de los sitios. ¡Si tiene problemas con las cookies, intente deshabilitar estas opciones primero!</translation>
     </message>
     <message>
         <source>Default Font</source>
@@ -2784,7 +2784,7 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="1790"/>
         <source>&lt;b&gt;SSL Certificates&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Certificados SSL&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1803"/>
@@ -2794,22 +2794,22 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="1810"/>
         <source>Edit CA certificates in SSL Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar los certificados CA en el gestor de SSL</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1840"/>
         <source>&lt;b&gt;Other&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Otros&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1854"/>
         <source>Send Referer header to servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar el encabezado del referencial a los servidores</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1861"/>
         <source>Block popup windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloquear ventanas emergentes</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1874"/>
@@ -2909,12 +2909,12 @@
     <message>
         <location filename="../src/preferences/preferences.cpp" line="466"/>
         <source>Deleted</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminado</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.cpp" line="472"/>
         <source>Choose executable location...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione la ubicación del ejecutable...</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.cpp" line="600"/>
@@ -4591,7 +4591,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup
     <message>
         <location filename="../src/webview/tabwidget.cpp" line="258"/>
         <source>Currently you have %1 opened tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualmente tiene %1 pestañas abiertas</translation>
     </message>
     <message>
         <source>Actually you have %1 opened tabs</source>

translations/pt_PT.ts

@@ -1359,22 +1359,22 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="103"/>
         <source>Executable: </source>
-        <translation type="unfinished"></translation>
+        <translation>Executável: </translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="103"/>
         <source>Arguments: </source>
-        <translation type="unfinished"></translation>
+        <translation>Argumentos: </translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="104"/>
         <source>Cannot start external download manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Incapaz de iniciar o gestor de transferências externo</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="104"/>
         <source>Cannot start external download manager! %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Incapaz de iniciar o gestor de transferências externo! %1</translation>
     </message>
     <message>
         <location filename="../src/downloads/downloadmanager.cpp" line="156"/>
@@ -2395,12 +2395,12 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1071"/>
         <source>Allow local storage of HTML5 web content</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir armazenamento local de conteúdo HTML5</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1078"/>
         <source>Delete locally stored HTML5 web content on close</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar conteúdo HTML5 ao fechar o navegador</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1833"/>
@@ -2511,7 +2511,7 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1104"/>
         <source>Delete now</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar agora</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1127"/>
@@ -2596,22 +2596,22 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1554"/>
         <source>&lt;b&gt;External download manager&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Gestor de transferências externo&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1561"/>
         <source>Use external download manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizar gestor de transferências externo</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1573"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Executável:</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1580"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation>Argumentos:</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1707"/>
@@ -2761,17 +2761,17 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1840"/>
         <source>&lt;b&gt;Other&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Outros&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1854"/>
         <source>Send Referer header to servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar endereço para os servidores</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1861"/>
         <source>Block popup windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloquear janelas emergentes</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1874"/>
@@ -2921,12 +2921,12 @@ não foi encontrado!</translation>
     <message>
         <location filename="../src/preferences/preferences.cpp" line="466"/>
         <source>Deleted</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminado</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.cpp" line="472"/>
         <source>Choose executable location...</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha a localização do executável...</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.cpp" line="600"/>