From 7b7d0305407cd58f17db1fb5403d3fe9f7248d73 Mon Sep 17 00:00:00 2001 From: nowrep Date: Fri, 23 Dec 2011 13:47:38 +0100 Subject: [PATCH] Option to load title from page in Speed Dial. Closes #77 - also showing "Unable to load" title when page fails to load --- bin/locale/cs_CZ.qm | Bin 84497 -> 84707 bytes src/data/html/speeddial.html | 44 +++++++++++--- src/navigation/locationbar.cpp | 1 - src/network/qupzillaschemehandler.cpp | 1 + src/plugins/speeddial.cpp | 10 +++- src/plugins/speeddial.h | 2 +- src/tools/pagethumbnailer.cpp | 17 ++++++ src/tools/pagethumbnailer.h | 6 ++ src/webview/webpage.cpp | 1 - translations/cs_CZ.ts | 79 +++++++++++++++----------- translations/de_DE.ts | 79 +++++++++++++++----------- translations/empty.ts | 79 +++++++++++++++----------- translations/es_ES.ts | 79 +++++++++++++++----------- translations/it_IT.ts | 79 +++++++++++++++----------- translations/nl_NL.ts | 79 +++++++++++++++----------- translations/pl_PL.ts | 79 +++++++++++++++----------- translations/sk_SK.ts | 11 ++++ translations/zh_CN.ts | 79 +++++++++++++++----------- 18 files changed, 450 insertions(+), 275 deletions(-) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index d63994e7b8fe455843eaf0da6c90a5521501aa72..b3a4786df07666f00c89733f887dd875d3c33772 100644 GIT binary patch delta 3081 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 HoyY$GJ_n!p delta 2998 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 ' + '' + - '
' + URL + ': ' + '
' + TITLE + ': ' + - '
' + + '' + TITLE + ': ' + + '' + + '' + + '' + + '' + ''); $('#fadeOverlay').css({'filter' : 'alpha(opacity=95)'}).fadeIn(); @@ -94,21 +103,22 @@ function onReloadClick(box) { function boxEdited() { if (editingId == -1) return; - + var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId]; var a = box.getElementsByTagName('a')[0]; var originalUrl = a.getAttribute('href'); setBoxUrl(editingId, $('#formUrl').attr("value")); setBoxTitle(editingId, $('#formTitle').attr("value")); var changedUrl = a.getAttribute('href'); + var fetchTitleChecked = document.getElementById('fetchTitle').checked; - if (originalUrl != changedUrl && changedUrl !== '') { + if (fetchTitleChecked || (originalUrl != changedUrl && changedUrl !== '') ) { var img = box.getElementsByTagName('img')[0]; img.setAttribute('src', LOADING_IMAGE); $('#fadeOverlay').fadeOut("slow", function() { $("#fadeOverlay").remove(); - speeddial.loadThumbnail(a.getAttribute('href')); + speeddial.loadThumbnail(a.getAttribute('href'), fetchTitleChecked); speeddial.removeImageForUrl(a.getAttribute('href')); }); } else { @@ -173,6 +183,26 @@ function setBoxImage(id, img_source) { var img = box.getElementsByTagName('img')[0]; img.setAttribute('src', img_source + '?' + new Date()); } + +function setTitleToUrl(url, title) { + var boxes = document.getElementById('quickdial').getElementsByTagName('div'); + for (i = 0; i < boxes.length; ++i) { + var box = boxes[i]; + + if (box === undefined) + continue; + + var boxUrl = box.getElementsByTagName('a')[0].getAttribute('href'); + console.log(boxUrl + " > " + url); + if (url != boxUrl) + continue; + + var span = box.getElementsByTagName('span')[0]; + span.innerText = title; + } + + speeddial.changed(allPages()); +} function setImageToUrl(url, img_source) { var aElement = $('a[href="' + url + '"]'); diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index c5babe7a1..34c1576b2 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -75,7 +75,6 @@ LocationBar::LocationBar(QupZilla* mainClass) connect(this, SIGNAL(textEdited(QString)), this, SLOT(textEdit())); connect(this, SIGNAL(textEdited(QString)), m_locationCompleter, SLOT(refreshCompleter(QString))); -// connect(this, SIGNAL(returnPressed()), this, SLOT(urlEnter())); connect(m_locationCompleter->popup(), SIGNAL(clicked(QModelIndex)), p_QupZilla, SLOT(urlEnter())); connect(m_siteIcon, SIGNAL(clicked()), this, SLOT(showSiteInfo())); connect(m_goButton, SIGNAL(clicked(QPoint)), this, SLOT(urlEnter())); diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 38c3e225a..cc4492dac 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -218,6 +218,7 @@ QString QupZillaSchemeReply::speeddialPage() page.replace("%TITLE-EDIT%", tr("Apply")); page.replace("%TITLE-REMOVE%", tr("Remove")); page.replace("%TITLE-RELOAD%", tr("Reload")); + page.replace("%TITLE-FETCHTITLE%", tr("Load title from page")); page.replace("%JQUERY%", "qrc:html/jquery.js"); page.replace("%JQUERY-UI%", "qrc:html/jquery-ui.js"); page.replace("%LOADING-IMG%", mApp->plugins()->speedDial()->loadingImagePath()); diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index f2f4bb665..568f169a6 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -134,7 +134,7 @@ void SpeedDial::changed(const QString &allPages) m_regenerateScript = true; } -void SpeedDial::loadThumbnail(const QString &url) +void SpeedDial::loadThumbnail(const QString &url, bool loadTitle) { if (url.isEmpty()) { return; @@ -142,6 +142,7 @@ void SpeedDial::loadThumbnail(const QString &url) PageThumbnailer* thumbnailer = new PageThumbnailer(this); thumbnailer->setUrl(QUrl(url)); + thumbnailer->setLoadTitle(loadTitle); connect(thumbnailer, SIGNAL(thumbnailCreated(QPixmap)), this, SLOT(thumbnailCreated(QPixmap))); thumbnailer->start(); @@ -163,11 +164,15 @@ void SpeedDial::thumbnailCreated(const QPixmap &image) return; } + bool loadTitle = thumbnailer->loadTitle(); + QString title = thumbnailer->title(); QString url = thumbnailer->url().toString(); QString fileName = m_thumbnailsDir + QCryptographicHash::hash(url.toUtf8(), QCryptographicHash::Md4).toHex() + ".png"; if (image.isNull()) { fileName = "qrc:/html/broken-page.png"; + title = tr("Unable to load"); + loadTitle = true; } else { if (!image.save(fileName)) { @@ -188,6 +193,9 @@ void SpeedDial::thumbnailCreated(const QPixmap &image) } frame->evaluateJavaScript(QString("setImageToUrl('%1', '%2');").arg(url, fileName)); + if (loadTitle) { + frame->evaluateJavaScript(QString("setTitleToUrl('%1', '%2');").arg(url, title)); + } } thumbnailer->deleteLater(); diff --git a/src/plugins/speeddial.h b/src/plugins/speeddial.h index 8b13a11e5..745064539 100644 --- a/src/plugins/speeddial.h +++ b/src/plugins/speeddial.h @@ -45,7 +45,7 @@ signals: public slots: Q_INVOKABLE void changed(const QString &allPages); - Q_INVOKABLE void loadThumbnail(const QString &url); + Q_INVOKABLE void loadThumbnail(const QString &url, bool loadTitle = false); Q_INVOKABLE void removeImageForUrl(const QString &url); private slots: diff --git a/src/tools/pagethumbnailer.cpp b/src/tools/pagethumbnailer.cpp index 46adb4022..93e15df78 100644 --- a/src/tools/pagethumbnailer.cpp +++ b/src/tools/pagethumbnailer.cpp @@ -75,6 +75,21 @@ QUrl PageThumbnailer::url() return m_url; } +bool PageThumbnailer::loadTitle() +{ + return m_loadTitle; +} + +void PageThumbnailer::setLoadTitle(bool load) +{ + m_loadTitle = load; +} + +QString PageThumbnailer::title() +{ + return m_title; +} + void PageThumbnailer::setEnableFlash(bool enable) { if (!enable) { @@ -96,6 +111,8 @@ void PageThumbnailer::createThumbnail(bool status) return; } + m_title = m_page->mainFrame()->title(); + QImage image(m_page->viewportSize(), QImage::Format_ARGB32); QPainter painter(&image); m_page->mainFrame()->render(&painter); diff --git a/src/tools/pagethumbnailer.h b/src/tools/pagethumbnailer.h index 626d6a891..cfd2eac26 100644 --- a/src/tools/pagethumbnailer.h +++ b/src/tools/pagethumbnailer.h @@ -46,6 +46,10 @@ public: void setUrl(const QUrl &url); QUrl url(); + bool loadTitle(); + void setLoadTitle(bool load); + QString title(); + void setEnableFlash(bool enable); void start(); @@ -63,6 +67,8 @@ private: QSize m_size; QUrl m_url; + QString m_title; + bool m_loadTitle; }; #endif // PAGETHUMBNAILER_H diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp index 28e87c925..9dcf1a97a 100644 --- a/src/webview/webpage.cpp +++ b/src/webview/webpage.cpp @@ -121,7 +121,6 @@ void WebPage::finished() void WebPage::watchedFileChanged(const QString &file) { - qDebug() << file; if (mainFrame()->url().toLocalFile() == file) { triggerAction(QWebPage::Reload); } diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index ea200ac55..4577ee864 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -986,42 +986,42 @@ ClickToFlash - + Object blocked by ClickToFlash Objekt zablokován ClickToFlash pluginem - + Show more informations about object Zobrazit více informací o objektu - + Delete object Odstranit objekt - + Add %1 to whitelist Přidat %1 na bílou listinu - + Flash Object Flash objekt - + <b>Attribute Name</b> <b>Jméno atributu</b> - + <b>Value</b> <b>Hodnota</b> - + No more informations available. Žádné další informace. @@ -1699,12 +1699,12 @@ nebyl nalezen! Přidat RSS kanál ... - + Enter URL address or search on %1 Zadejte internetovou adresu nebo vyhledávejte na %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .cz @@ -3331,7 +3331,12 @@ nebyl nalezen! Uložit - + + Load title from page + Načíst titulek ze stránky + + + Edit Upravit @@ -3346,17 +3351,17 @@ nebyl nalezen! Načíst znovu - + Url Adresa - + Title Titulek - + New Page Nová stránka @@ -3674,7 +3679,7 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ SearchToolBar - + No results found. Nic nenalezeno. @@ -4064,6 +4069,14 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Hledat... + + SpeedDial + + + Unable to load + Nepodařilo se načíst + + TabBar @@ -4237,94 +4250,94 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) Pro zobrazení této stránky musí QupZilla znovu odeslat požadavek na server (jako např. hledaní při nakupování, které již bylo provedeno.) - + New tab Nový panel - + Server refused the connection Server odmítl spojení - + Server closed the connection Server ukončil spojení - + Server not found Server nenalezen - + Connection timed out Spojení vypršelo - + Untrusted connection Nedůvěryhodné spojení - + AdBlocked Content AdBlock obsah - + Blocked by rule <i>%1</i> Blokováno pravidlem <i>%1</i> - + Content Access Denied Odmítnut přístup k obsahu - + Error code %1 Chybový kód %1 - + Failed loading page Chyba při načítání stránky - + QupZilla can't load page from %1. QupZilla nemůže načíst stránku ze serveru %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Zkontrolujte, zda je adresa napsána správně a neobsahuje chyby jako <b>ww.</b>server.cz místo <b>www</b>.server.cz - + If you are unable to load any pages, check your computer's network connection. Pokud se vám nezobrazují ani ostatní stránky, zkontrolujte síťové připojení svého počítače. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Pokud je váš počítač chráněn firewallem a nebo proxy serverem, zkontrolujte, zda má QupZilla přístup na Internet. - + Try Again Zkusit znovu - + Choose file... Vyberte soubor... diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 6439558c1..810d429d4 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -982,42 +982,42 @@ ClickToFlash - + Object blocked by ClickToFlash Objekt blockiert von ClickToFlash - + Show more informations about object Mehr Informationen anzeigen - + Delete object Objekt löschen - + Add %1 to whitelist %1 zur Whitelist hinzufügen - + Flash Object Flash Objekt - + <b>Attribute Name</b> <b>Attribut Name</b> - + <b>Value</b> <b>Wert</b> - + No more informations available. Keine weiteren Informationen verfügbar. @@ -1691,12 +1691,12 @@ RSS Feed von dieser Seite hinzufügen... - + Enter URL address or search on %1 URL eingeben oder auf %1 suchen - + .co.uk Append domain name on ALT + Enter = Should be different for every country .de @@ -3257,7 +3257,12 @@ - + + Load title from page + + + + Edit Bearbeiten @@ -3272,17 +3277,17 @@ Neu laden - + Url Url - + Title Titel - + New Page Neue Seite @@ -3666,7 +3671,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest SearchToolBar - + No results found. Keine Suchergebnisse vorhanden. @@ -4055,6 +4060,14 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Suchen... + + SpeedDial + + + Unable to load + + + TabBar @@ -4229,94 +4242,94 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) Um diese Seite anzeigen zu können, muss QupZilla eine erneute Abfrage an den Server versenden - + New tab Neuer Tab - + Server refused the connection Der Server hat den Verbindungsversuch abgelehnt - + Server closed the connection Der Server hat die Verbindung beendet - + Server not found Server nicht gefunden - + Connection timed out Zeitüberschreitung der Anfrage - + Untrusted connection Keine vertrauenswürdige Verbindung - + AdBlocked Content Inhalt von AdBlock blockiert - + Blocked by rule <i>%1</i> Blockiert von Regel <i>%1</i> - + Content Access Denied Zugriff auf Inhalt verweigert - + Error code %1 Fehler Code %1 - + Failed loading page Seite konnte nicht geladen werden - + QupZilla can't load page from %1. QupZilla kann Seite von %1 nicht laden. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Bitte überprüfen Sie die Adresse auf Tippfehler wie <b>ww.</b>example.com anstatt <b>www.</b>example.com - + If you are unable to load any pages, check your computer's network connection. Falls Sie keine Webseiten laden können, überprüfen Sie bitte Ihre Netzwerkverbindung. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Falls Ihr Computer über eine Firewall oder Proxy mit dem Internet verbunden ist, vergewissern Sie sich, dass QupZilla der Zugriff zum Internet gestattet ist. - + Try Again Erneut versuchen - + Choose file... Datei wählen... diff --git a/translations/empty.ts b/translations/empty.ts index 2cb068fb4..c68040047 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -930,42 +930,42 @@ ClickToFlash - + Object blocked by ClickToFlash - + Show more informations about object - + Delete object - + Add %1 to whitelist - + Flash Object - + <b>Attribute Name</b> - + <b>Value</b> - + No more informations available. @@ -1632,12 +1632,12 @@ - + Enter URL address or search on %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country @@ -3237,7 +3237,12 @@ - + + Load title from page + + + + Edit @@ -3252,17 +3257,17 @@ - + Url - + Title - + New Page @@ -3578,7 +3583,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchToolBar - + No results found. @@ -3967,6 +3972,14 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla + + SpeedDial + + + Unable to load + + + TabBar @@ -4140,93 +4153,93 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) - + New tab - + Server refused the connection - + Server closed the connection - + Server not found - + Connection timed out - + Untrusted connection - + AdBlocked Content - + Blocked by rule <i>%1</i> - + Content Access Denied - + Error code %1 - + Failed loading page - + QupZilla can't load page from %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com - + If you are unable to load any pages, check your computer's network connection. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. - + Try Again - + Choose file... diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 1de923cb6..968c2cf08 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -982,42 +982,42 @@ ClickToFlash - + Object blocked by ClickToFlash Objetos bloqueados por ClickToFlash - + Show more informations about object Ver más información del objeto - + Delete object Eliminar objeto - + Add %1 to whitelist Añadir %1 a la lista blanca - + Flash Object Objeto Flash - + <b>Attribute Name</b> <b>Nombre del atributo</b> - + <b>Value</b> <b>Valor</b> - + No more informations available. No hay más información disponible. @@ -1690,12 +1690,12 @@ Añadir RSS desde esta página... - + Enter URL address or search on %1 Introducir la dirección URL o buscar en %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .co.uk @@ -3320,7 +3320,12 @@ - + + Load title from page + + + + Edit Editar @@ -3335,17 +3340,17 @@ Recargar - + Url Dirección - + Title Nombre - + New Page Página nueva @@ -3663,7 +3668,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup SearchToolBar - + No results found. Ningún resultado encontrado. @@ -4052,6 +4057,14 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup Buscar... + + SpeedDial + + + Unable to load + + + TabBar @@ -4225,94 +4238,94 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) Para mostrar esta página, QupZilla necesita enviar información que repetirá cualquier acción (como una búsqueda o una confirmación de compra) realizada anteriormente - + New tab Nueva pestaña - + Server refused the connection El servidor rechazó la conexión - + Server closed the connection El servidor cerró la conexión - + Server not found Servidor no encontrado - + Connection timed out La conexión expiró - + Untrusted connection Conexión no fiable - + AdBlocked Content Contenido AdBlocked - + Blocked by rule <i>%1</i> Bloqueado por regla <i>%1</i> - + Content Access Denied Denegado el acceso al contenido - + Error code %1 Código de error %1 - + Failed loading page Falló la carga de la página - + QupZilla can't load page from %1. QupZilla no puede cargar la página de %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Compruebe errores de escritura en la dirección como<b>ww.</b>ejemplo.com en lugar de <b>www.</b>ejemplo.com - + If you are unable to load any pages, check your computer's network connection. Si no puede cargar ninguna página, compruebe la conexión a la red de su ordenador. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Si su ordenador o red están protegidos por un cortafuegos o proxy, asegúrese de que QupZilla tiene permitido el acceso a la red. - + Try Again Volver a intentar - + Choose file... Elegir archivo... diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 20ba1f3b3..e7ca61b49 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -974,42 +974,42 @@ ClickToFlash - + Object blocked by ClickToFlash Oggetto bloccato da ClickToFlash - + Show more informations about object Mostra maggiori informazioni sul progetto - + Delete object Cancella oggetto - + Add %1 to whitelist Aggiungi %1 alla withelist - + Flash Object Oggetto Flash - + <b>Attribute Name</b> <b>Nome dell'Attributo</b> - + <b>Value</b> <b>Valore</b> - + No more informations available. Non sono disponibili ulteriori informazioni. @@ -1682,12 +1682,12 @@ Aggiungi RSS da questa pagina... - + Enter URL address or search on %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .it @@ -3315,7 +3315,12 @@ - + + Load title from page + + + + Edit Modifica @@ -3330,17 +3335,17 @@ Ricarica - + Url - + Title Titolo - + New Page @@ -3658,7 +3663,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari SearchToolBar - + No results found. Nessun risulatato trovato. @@ -4047,6 +4052,14 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari Ricerca... + + SpeedDial + + + Unable to load + + + TabBar @@ -4220,7 +4233,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) I don't know what you mean for "shoping" @@ -4228,87 +4241,87 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari (come fare una ricerca sul fare shopping, che è stata già fatta.) - + New tab - + Server refused the connection Il Server ha rifiutato la connessione - + Server closed the connection Il Server ha chiuso la connessione - + Server not found Server non trovato - + Connection timed out Connessione scaduta - + Untrusted connection Connessione non attendibile - + AdBlocked Content Contenuto bloccato (AdBlock) - + Blocked by rule <i>%1</i> Bloccato dalla regola <i>%1</i> - + Content Access Denied Accesso al Contenuto Negato - + Error code %1 Errore codice %1 - + Failed loading page Caricamento pagina fallito - + QupZilla can't load page from %1. QupZilla non può caricare la pagina da %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Controllare l'indirizzo per errori di battitura come <b>ww.</b>esempio.com invece di <b>www.</b>esempio.com - + If you are unable to load any pages, check your computer's network connection. Se non si riesce a caricare nessuna pagina, controllare la connessione di rete del compiuter. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Se il tuo computer o la rete sono protetti da un firewall o un proxy, assicurati che QupZilla sia autorizzato ad accedere al Web. - + Try Again Prova di nuovo - + Choose file... Scegli il file... diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index c4aa3d182..8166400fb 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -982,42 +982,42 @@ ClickToFlash - + Object blocked by ClickToFlash Object geblokkeerd door KlikVoorFlash - + Show more informations about object Toon meer informatie over object - + Delete object Verwijder object - + Add %1 to whitelist Voeg %1 toe aan witte lijst - + Flash Object Flash-object - + <b>Attribute Name</b> <b>Naam van attribuut</b> - + <b>Value</b> <b>Waarde</b> - + No more informations available. Geen verdere informatie beschikbaar. @@ -1691,12 +1691,12 @@ werd niet gevonden! Voeg RSS toe van deze pagina... - + Enter URL address or search on %1 Voer URL-adres in of zoek op %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .nl @@ -3323,7 +3323,12 @@ werd niet gevonden! - + + Load title from page + + + + Edit Bewerk @@ -3338,17 +3343,17 @@ werd niet gevonden! Herlaad - + Url URL - + Title Titel - + New Page Nieuwe pagina @@ -3666,7 +3671,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te SearchToolBar - + No results found. Geen resultaten gevonden. @@ -4056,6 +4061,14 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Zoeken... + + SpeedDial + + + Unable to load + + + TabBar @@ -4229,94 +4242,94 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) Om deze pagina te tonen, moet QupZulla het verzoek opnieuw versturen (zoals zoeken op het maken van een shoping, welke al gedaan is.) - + New tab Nieuw tabblad - + Server refused the connection Server weigerde de verbinding - + Server closed the connection Server sloot de verbinding - + Server not found Server niet gevonden - + Connection timed out Verbinding onderbroken - + Untrusted connection Onbeveiligde verbinding - + AdBlocked Content Door AdBlock geblokkeerde inhoud - + Blocked by rule <i>%1</i> Geblokkeerd door regel <i>%1</i> - + Content Access Denied Inhoudstoegang geweigerd - + Error code %1 Foutcode %1 - + Failed loading page Mislukt om pagina te laden - + QupZilla can't load page from %1. QupZilla kan de pagina niet laden van %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Controleer het adres op typfouten zoals <b>ww.</b>voorbeeld.nl in plaats van <b>www.</b>voorbeeld.nl - + If you are unable to load any pages, check your computer's network connection. Indien u niet in staat bent om eender welke pagina te laden, controleer dan uw netwerkverbinding. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Indien uw computer of netwerk beveiligd is door een firewall of proxy, zorg dan dat QupZilla toestemming heeft om het web te benaderen. - + Try Again Probeer nogmaals - + Choose file... Kies bestand... diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 12e93da6a..ab75af69e 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -1026,42 +1026,42 @@ p, li { white-space: pre-wrap; } ClickToFlash - + Object blocked by ClickToFlash Objekt zablokowany przez ClickToFlash plugin - + Show more informations about object Pokaż więcej informacji o objekcie - + Delete object Usuń obiekt - + Add %1 to whitelist Dodaj %1 do zaufanej listy - + Flash Object Objekt Flash - + <b>Attribute Name</b> <b>Nazwa atrybutu</b> - + <b>Value</b> <b>Wartość</b> - + No more informations available. Nie ma więcej dostępnych informacji. @@ -1742,12 +1742,12 @@ p, li { white-space: pre-wrap; } Dodaj kanał RSS... - + Enter URL address or search on %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .pl @@ -3463,7 +3463,12 @@ p, li { white-space: pre-wrap; } - + + Load title from page + + + + Edit Edytuj @@ -3478,17 +3483,17 @@ p, li { white-space: pre-wrap; } Odświerz - + Url Adres - + Title - + New Page @@ -3833,7 +3838,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchToolBar - + No results found. nic nie znaleziono. @@ -4234,6 +4239,14 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Szukaj... + + SpeedDial + + + Unable to load + + + TabBar @@ -4416,93 +4429,93 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Aby wyświetlić tę stronę, QupZilla musi wysłać ponownie żądanie do serwera - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) - + New tab Nowa karta - + Server refused the connection Serwer odrzucił połączenie - + Server closed the connection Serwer przerwał połączenie - + Server not found Serwer nie znaleziony - + Connection timed out Przekroczono limit czasu połączenia - + Untrusted connection Niezaufane połączenie - + AdBlocked Content AdBlock Zablokował - + Blocked by rule <i>%1</i> Zablokowano regułą <i>%1</i> - + Content Access Denied Dostęp zablokowany - + Error code %1 Kod błędu %1 - + Failed loading page Błąd ładowania strony - + QupZilla can't load page from %1. QupZilla nie może załadować strony z serwera %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com Sprawdź czy adres został wpisnay poprawnie, gdzie zamiast np. <b>ww.</b>serwer.pl powinno być <b>www.</b>serwer.pl - + If you are unable to load any pages, check your computer's network connection. Jeśli nie możesz otworzyć żadnej strony, sprawdź swoje połączenie z internetem. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. Jeśli twój komputer lub sieć jest zabezpieczona za pomocą firewalla lub proxy, upewnij się że QupZilla ma zezwolenie na dostęp do sieci. - + Try Again Spróbuj ponownie - + Choose file... Wybierz plik... diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index fc47a8e0c..6b0b19b94 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -2654,6 +2654,10 @@ Apply + + Load title from page + + RSSManager @@ -3220,6 +3224,13 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad Hľadať: + + SpeedDial + + Unable to load + + + TabBar diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index eeb096414..451828e4b 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -982,42 +982,42 @@ ClickToFlash - + Object blocked by ClickToFlash 点击Flash封锁的对象 - + Show more informations about object 显示有关对象的更多信息 - + Delete object 删除对象 - + Add %1 to whitelist - + Flash Object Flash对象 - + <b>Attribute Name</b> - + <b>Value</b> - + No more informations available. 没有提供更多信息。 @@ -1688,12 +1688,12 @@ 从网页添加RSS... - + Enter URL address or search on %1 输入URL地址或在%1上搜索 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .co.uk @@ -3318,7 +3318,12 @@ - + + Load title from page + + + + Edit 编辑 @@ -3333,17 +3338,17 @@ 刷新 - + Url 地址 - + Title 标题 - + New Page 新网页 @@ -3659,7 +3664,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchToolBar - + No results found. 没有找到结果。 @@ -4048,6 +4053,14 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla 搜索... + + SpeedDial + + + Unable to load + + + TabBar @@ -4221,93 +4234,93 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla WebPage - + To show this page, QupZilla must resend request which do it again (like searching on making an shoping, which has been already done.) 为显示此页QupZilla须重新发送请求 - + New tab 新标签 - + Server refused the connection 服务器拒绝了连接 - + Server closed the connection 服务器关闭了连接 - + Server not found 找不到服务器 - + Connection timed out 连接超时 - + Untrusted connection 不受信任的连接 - + AdBlocked Content AdBlocked内容 - + Blocked by rule <i>%1</i> 阻止规则 <i>%1</i> - + Content Access Denied 内容访问被拒绝 - + Error code %1 错误代码为%1 - + Failed loading page 载入页面失败 - + QupZilla can't load page from %1. QupZilla无法加载%1页。 - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com 检查输入错误的地址，如<b> WW</b> example.com，而不是<B> WWW。</b> example.com - + If you are unable to load any pages, check your computer's network connection. 如果您无法载入任何页面，请检查您的计算机的网络连接。 - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. 如果您的计算机或网络受到防火墙或代理的保护，确保QupZilla允许访问Web。 - + Try Again 再试一次 - + Choose file... 选择文件...