From d22c38fe2703d94f53ffe7d4c2a449e98b2256e4 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 29 Oct 2011 13:36:04 +0200 Subject: [PATCH] Fixed loading of RSS Channels. See #26 It is now following redirections. Also it will no longer be shown Atom channels, as RSS parser currently doesn't support it. --- src/QupZilla.pro | 8 +- src/rss/rssmanager.cpp | 33 +++-- src/rss/rssmanager.h | 5 +- src/tools/followredirectreply.cpp | 34 +++++ src/tools/followredirectreply.h | 31 ++++ src/tools/iconfetcher.cpp | 34 +---- src/tools/iconfetcher.h | 24 +--- src/webview/webview.cpp | 5 +- translations/cs_CZ.ts | 232 +++++++++++++++--------------- translations/de_DE.ts | 232 +++++++++++++++--------------- translations/es.ts | 232 +++++++++++++++--------------- translations/nl_NL.ts | 232 +++++++++++++++--------------- translations/sk_SK.ts | 232 +++++++++++++++--------------- 13 files changed, 684 insertions(+), 650 deletions(-) create mode 100644 src/tools/followredirectreply.cpp create mode 100644 src/tools/followredirectreply.h diff --git a/src/QupZilla.pro b/src/QupZilla.pro index 663e7c7b9..1c3d55dac 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -165,7 +165,8 @@ SOURCES += main.cpp\ bookmarksimport/chromeimporter.cpp \ bookmarksimport/operaimporter.cpp \ bookmarksimport/bookmarksimportdialog.cpp \ - tools/iconfetcher.cpp + tools/iconfetcher.cpp \ + tools/followredirectreply.cpp HEADERS += \ 3rdparty/qtwin.h \ @@ -277,7 +278,8 @@ HEADERS += \ bookmarksimport/chromeimporter.h \ bookmarksimport/operaimporter.h \ bookmarksimport/bookmarksimportdialog.h \ - tools/iconfetcher.h + tools/iconfetcher.h \ + tools/followredirectreply.h FORMS += \ preferences/autofillmanager.ui \ @@ -408,6 +410,8 @@ message($$DEFINES) + + diff --git a/src/rss/rssmanager.cpp b/src/rss/rssmanager.cpp index 6ab08bb25..156ac9168 100644 --- a/src/rss/rssmanager.cpp +++ b/src/rss/rssmanager.cpp @@ -24,6 +24,7 @@ #include "iconprovider.h" #include "browsinglibrary.h" #include "globalfunctions.h" +#include "followredirectreply.h" RSSManager::RSSManager(QupZilla* mainClass, QWidget* parent) : QWidget(parent) @@ -231,25 +232,43 @@ void RSSManager::loadFeedInNewTab() void RSSManager::beginToLoadSlot(const QUrl &url) { - m_networkManager->get(QNetworkRequest(QUrl(url))); + FollowRedirectReply* reply = new FollowRedirectReply(url, m_networkManager); + connect(reply, SIGNAL(finished()), this, SLOT(finished())); - connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(finished(QNetworkReply*))); + QPair pair; + pair.first = reply; + pair.second = url; + m_replies.append(pair); } -void RSSManager::finished(QNetworkReply* reply) +void RSSManager::finished() { - if (m_networkReplies.contains(reply)) + FollowRedirectReply* reply = qobject_cast (sender()); + if (!reply) + return; + + QString replyUrl; + for (int i = 0; i < m_replies.count(); i++) { + QPair pair = m_replies.at(i); + if (pair.first == reply) { + replyUrl = pair.second.toString(); + break; + } + } + + if (replyUrl.isEmpty()) return; QString currentTag; QString linkString; QString titleString; + QXmlStreamReader xml; - xml.addData(reply->readAll()); + xml.addData(reply->reply()->readAll()); + delete reply; int tabIndex = -1; for (int i=0; itabWidget->count(); i++) { - QString replyUrl = reply->url().toString(); if (replyUrl == ui->tabWidget->tabToolTip(i)) { tabIndex = i; break; @@ -295,8 +314,6 @@ void RSSManager::finished(QNetworkReply* reply) item->setText(0, tr("Error in fetching feed")); treeWidget->addTopLevelItem(item); } - - m_networkReplies.append(reply); } bool RSSManager::addRssFeed(const QString &address, const QString &title, const QIcon &icon) diff --git a/src/rss/rssmanager.h b/src/rss/rssmanager.h index d986e6c6b..98fc3f343 100644 --- a/src/rss/rssmanager.h +++ b/src/rss/rssmanager.h @@ -30,6 +30,7 @@ namespace Ui { class RSSManager; } +class FollowRedirectReply; class QupZilla; class RSSManager : public QWidget { @@ -48,7 +49,7 @@ public slots: private slots: void optimizeDb(); void beginToLoadSlot(const QUrl &url); - void finished(QNetworkReply* reply); + void finished(); void loadFeed(QTreeWidgetItem* item); void controlLoadFeed(QTreeWidgetItem* item); void reloadFeed(); @@ -59,7 +60,7 @@ private slots: private: QupZilla* getQupZilla(); - QList m_networkReplies; + QList > m_replies; QNetworkAccessManager* m_networkManager; Ui::RSSManager* ui; QPointer p_QupZilla; diff --git a/src/tools/followredirectreply.cpp b/src/tools/followredirectreply.cpp new file mode 100644 index 000000000..b70cc53aa --- /dev/null +++ b/src/tools/followredirectreply.cpp @@ -0,0 +1,34 @@ +#include "followredirectreply.h" + +FollowRedirectReply::FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager) + : QObject() + , m_manager(manager) + , m_redirectCount(0) +{ + m_reply = m_manager->get(QNetworkRequest(url)); + connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); +} + +void FollowRedirectReply::replyFinished() +{ + int replyStatus = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + + if ( (replyStatus != 301 && replyStatus != 302) || m_redirectCount == 5) { + emit finished(); + return; + } + m_redirectCount++; + + QUrl redirectUrl = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); + m_reply->close(); + m_reply->deleteLater(); + + m_reply = m_manager->get(QNetworkRequest(redirectUrl)); + connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); +} + +FollowRedirectReply::~FollowRedirectReply() +{ + m_reply->close(); + m_reply->deleteLater(); +} diff --git a/src/tools/followredirectreply.h b/src/tools/followredirectreply.h new file mode 100644 index 000000000..c6f2e562c --- /dev/null +++ b/src/tools/followredirectreply.h @@ -0,0 +1,31 @@ +#ifndef FOLLOWREDIRECTREPLY_H +#define FOLLOWREDIRECTREPLY_H + +#include +#include +#include +#include + +class FollowRedirectReply : public QObject +{ + Q_OBJECT +public: + explicit FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager); + ~FollowRedirectReply(); + + QNetworkReply* reply() { return m_reply; } + +signals: + void finished(); + +private slots: + void replyFinished(); + +private: + QNetworkAccessManager* m_manager; + QNetworkReply* m_reply; + int m_redirectCount; + +}; + +#endif // FOLLOWREDIRECTREPLY_H diff --git a/src/tools/iconfetcher.cpp b/src/tools/iconfetcher.cpp index 639af6bbf..6348d7098 100644 --- a/src/tools/iconfetcher.cpp +++ b/src/tools/iconfetcher.cpp @@ -16,39 +16,7 @@ * along with this program. If not, see . * ============================================================ */ #include "iconfetcher.h" - -FollowRedirectReply::FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager) - : QObject() - , m_manager(manager) - , m_redirectCount(0) -{ - m_reply = m_manager->get(QNetworkRequest(url)); - connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); -} - -void FollowRedirectReply::replyFinished() -{ - int replyStatus = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - - if ( (replyStatus != 301 && replyStatus != 302) || m_redirectCount == 5) { - emit finished(); - return; - } - m_redirectCount++; - - QUrl redirectUrl = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - m_reply->close(); - m_reply->deleteLater(); - - m_reply = m_manager->get(QNetworkRequest(redirectUrl)); - connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); -} - -FollowRedirectReply::~FollowRedirectReply() -{ - m_reply->close(); - m_reply->deleteLater(); -} +#include "followredirectreply.h" IconFetcher::IconFetcher(QObject* parent) : QObject(parent) diff --git a/src/tools/iconfetcher.h b/src/tools/iconfetcher.h index 51c9abf99..e277229f7 100644 --- a/src/tools/iconfetcher.h +++ b/src/tools/iconfetcher.h @@ -22,30 +22,8 @@ #include #include #include -#include - -class FollowRedirectReply : public QObject -{ - Q_OBJECT -public: - explicit FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager); - ~FollowRedirectReply(); - - QNetworkReply* reply() { return m_reply; } - -signals: - void finished(); - -private slots: - void replyFinished(); - -private: - QNetworkAccessManager* m_manager; - QNetworkReply* m_reply; - int m_redirectCount; - -}; +class FollowRedirectReply; class IconFetcher : public QObject { Q_OBJECT diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp index 169a6b691..76635f22b 100644 --- a/src/webview/webview.cpp +++ b/src/webview/webview.cpp @@ -365,8 +365,9 @@ void WebView::checkRss() for (int i = 0; iZrušit - + <b>Importing from %1</b> <b>Importuji z %1</b> - + Finish Dokončit - - - + + + Error! Chyba! - + Choose directory... Zvolte složku... - + Choose file... Vyberte soubor... - + Mozilla Firefox stores its bookmarks in <b>places.sqlite</b> SQLite database. This file is usually located in Mozilla Firefox ukládá své záložky v SQLite databázi <b>places.sqlite</b>. Tento soubor se obvykle nachází v - + Google Chrome stores its bookmarks in <b>Bookmarks</b> text file. This file is usually located in Google Chrome ukládá své záložky v textovém souboru <b>Bookmarks</b>. Tento soubor se obvykle nachází v - + Opera stores its bookmarks in <b>bookmarks.adr</b> text file. This file is usually located in Opera ukládá své záložky v textovém souboru <b>bookmarks.adr</b>. Tento soubor se obvykle nachází v - + Internet Explorer stores its bookmarks in <b>Favorites</b> folder. This folder is usually located in Internet Explorer ukládá své záložky ve složce <b>Oblíbené</b>. Tato složka se obvykle nachází v @@ -448,9 +448,9 @@ p, li { white-space: pre-wrap; } Mozzila Firefox ukládá své záložky v SQLite databázi <b>places.sqlite</b>. Tento soubor se obvykle nachází v - - - + + + Please choose this file to begin importing bookmarks. Vyberte prosím tento soubor pro zahájení importu. @@ -463,7 +463,7 @@ p, li { white-space: pre-wrap; } Opera ukládá své záložky v textovém souboru <b>bookmarks.adr</b>. Tento soubor se obvykle nachází v - + Please choose this folder to begin importing bookmarks. Vyberte prosím tuto složku pro zahájení importu. @@ -902,17 +902,17 @@ p, li { white-space: pre-wrap; } ChromeImporter - + No Error Žádná chyba - + Unable to open file. Nepodařilo se otevřít soubor. - + Cannot evaluate JSON code. Nelze spustit JSON kód. @@ -1441,7 +1441,7 @@ nebyl nalezen! Přidat ze souboru... - + Choose icon... Vybrat ikonu... @@ -1449,17 +1449,17 @@ nebyl nalezen! FirefoxImporter - + No Error Žádná chyba - + File does not exists. Soubor neexistuje. - + Unable to open database. Is Firefox running? Nepodařilo se otevřít databázi. Je Firefox spuštěn? @@ -1828,12 +1828,12 @@ nebyl nalezen! OperaImporter - + No Error Žádná chyba - + Unable to open file. Nepodařilo se otevřít soubor. @@ -2630,7 +2630,7 @@ nebyl nalezen! QObject - + The file is not an OpenSearch 1.1 file. Tento soubor není OpenSearch 1.1 kompatibilní. @@ -2671,389 +2671,389 @@ nebyl nalezen! QupZilla - + File Soubor - + Edit Úpravy - + Tools Nástroje - + Help Nápověda - + View Zobrazení - - + + Bookmarks Záložky - - + + History Historie - + Quit Konec - + New Tab Nový panel - + Close Tab Zavřít panel - + IP Address of current page IP Adresa aktuální stránky - + &New Window &Nové okno - + Open &File Otevřít &soubor - + &Save Page As... &Uložit stránku jako... - + &Print &Tisk - + Import bookmarks... Importovat záložky... - + &Undo &Zpět - + &Redo &Vpřed - + &Cut V&yjmout - + C&opy &Kopírovat - + &Paste V&ložit - + &Delete &Odstranit - + Select &All Vyb&rat vše - + &Find &Najít - + &Navigation Toolbar &Navigační lišta - + &Bookmarks Toolbar Panel &záložek - + Sta&tus Bar Sta&tus bar - + Toolbars Nástrojové lišty - + Sidebars Postranní lišta - + &Page Source Zdrojový &kód stránky - + &Menu Bar &Menu - + &Fullscreen &Celá obrazovka - + &Stop Z&astavit - + &Reload O&bnovit - + Character &Encoding Kó&dování znaků - + Zoom &In Zoo&m + - + Zoom &Out Z&oom - - + Reset Původní - + Close Window Zavřít okno - + Open Location Otevřít adresu - + Send Link... Poslat odkaz... - + Other Ostatní - + Default Defaultní - + Current cookies cannot be accessed. Současné cookies nejsou dostupné. - + Your session is not stored. Vaše relace není uložena. - + Start Private Browsing Spustit anonymní prohlížení - + Private Browsing Enabled Soukromé prohlížení zapnuto - + Restore &Closed Tab Obnovit zavř&ený panel - + Bookmarks In ToolBar Bookmarks In Toolbar Panel záložek - - - + + + Empty Prázdný - + New tab Nový panel - + Bookmark &This Page Přidat &stránku do záložek - + Bookmark &All Tabs Přidat &všechny panely do záložek - + Organize &Bookmarks Organizovat &záložky - + &Back &Zpět - + &Forward &Vpřed - + &Home &Domů - + Show &All History Zobrazit celou &historii - + Closed Tabs Zavřené panely - + Save Page Screen Uložit snímek stránky - - + + (Private Browsing) (Soukromé prohlížení) - + Restore All Closed Tabs Obnovit všechny zavřené panely - + Clear list Vyčistit seznam - + About &Qt O &Qt - + &About QupZilla &O QupZille - + Informations about application Informace o aplikaci - + Report &Issue Nahlásit &problém - + &Web Search Hledání na &webu - + Page &Info Informace o &stránce - + &Download Manager Správce s&tahování - + &Cookies Manager Správce coo&kies - + &AdBlock &AdBlock - + RSS &Reader &RSS čtečka - + Clear Recent &History Vymazat nedá&vnou historii - + &Private Browsing Soukromé prohlíž&ení - + Pr&eferences Předvo&lby @@ -3062,32 +3062,32 @@ nebyl nalezen! Web Inspektor - + Open file... Otevřít soubor... - + Are you sure you want to turn on private browsing? Jste si jistý že chcete zapnout soukromé prohlížení? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Se zapnutým soukromým prohlížením jsou některé akce týkající se soukromí vypnuty: - + Webpages are not added to the history. Stránky nejsou přidávány do historie. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Než zavřete prohlížeč, stále můžete použít tlačítka Zpět a Vpřed k vrácení se na stránky které jste otevřeli. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? Ještě je otevřeno %1 panelů a Vaše relace nebude uložena. Opravdu chcete skončit? @@ -3557,12 +3557,12 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Zkratka - + Add Search Engine Přidat vyhledávač - + Edit Search Engine Upravit vyhledávač @@ -4155,8 +4155,8 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ WebInspectorDockWidget - - + + Web Inspector Web Inspektor diff --git a/translations/de_DE.ts b/translations/de_DE.ts index bc425285b..f2fde8b8f 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -401,61 +401,61 @@ p, li { white-space: pre-wrap; } Abbrechen - + <b>Importing from %1</b> <b>Importiere von %1</b> - + Finish Ende - - - + + + Error! Fehler! - + Choose directory... Verzeichnis wählen... - + Choose file... Datei wählen... - + Mozilla Firefox stores its bookmarks in <b>places.sqlite</b> SQLite database. This file is usually located in Mozilla Firefox speichert die Lesezeichen in der Datei <b>places.sqlite</b>. Diese ist gewöhnlich gespeichert unter - + Google Chrome stores its bookmarks in <b>Bookmarks</b> text file. This file is usually located in Google Chrome speichert die Lesezeichen in der Datei <b>Bookmarks</b>. Diese ist gewöhnlich gespeichert unter - + Opera stores its bookmarks in <b>bookmarks.adr</b> text file. This file is usually located in Opera speichert die Lesezeichen in der Datei <b>bookmarks.adr</b>. Diese ist gewöhnlich gespeichert unter - + Internet Explorer stores its bookmarks in <b>Favorites</b> folder. This folder is usually located in Internet Explorer speichert die Lesezeichen im <b>Favorites</b> Ordner. Dieser Ordner ist gewöhnlich zu finden unter - - - + + + Please choose this file to begin importing bookmarks. Bitte wählen Sie diese Datei, um mit dem Import zu beginnen. - + Please choose this folder to begin importing bookmarks. Bitte wählen Sie diesen Ordner, um mit dem Import zu beginnen. @@ -894,17 +894,17 @@ p, li { white-space: pre-wrap; } ChromeImporter - + No Error Kein Fehler - + Unable to open file. Datei kann nicht geöffnet werden. - + Cannot evaluate JSON code. JSON Format kann nicht ausgewertet werden. @@ -1432,7 +1432,7 @@ p, li { white-space: pre-wrap; } Von Datei hinzufügen ... - + Choose icon... Symbol auswählen... @@ -1440,17 +1440,17 @@ p, li { white-space: pre-wrap; } FirefoxImporter - + No Error Kein Fehler - + File does not exists. Datei existiert nicht. - + Unable to open database. Is Firefox running? Datenbank kann nicht geöffnet werden. Ist Firefox aktiv? @@ -1818,12 +1818,12 @@ p, li { white-space: pre-wrap; } OperaImporter - + No Error Kein Fehler - + Unable to open file. Datei kann nicht geöffnet werden. @@ -2620,7 +2620,7 @@ p, li { white-space: pre-wrap; } QObject - + The file is not an OpenSearch 1.1 file. Diese Datei besitzt kein gültiges OpenSearch 1.1 Format. @@ -2661,388 +2661,388 @@ p, li { white-space: pre-wrap; } QupZilla - + File Datei - + Edit Bearbeiten - + Tools Werkzeuge - + Help Hilfe - + View Ansicht - - + + Bookmarks Lesezeichen - - + + History Verlauf - + Quit Beenden - + New Tab Neuer Tab - + Close Tab Tab schließen - + IP Address of current page IP Adresse der aktuellen Seite - + &New Window Neues &Fenster - + Open &File Datei ö&ffnen - + &Save Page As... Seite speichern &unter... - + &Print &Drucken - + Import bookmarks... Lesezeichen importieren... - + &Undo &Rückgängig - + &Redo &Wiederherstellen - + &Cut &Ausschneiden - + C&opy &Kopieren - + &Paste E&infügen - + &Delete &Löschen - + Select &All Alles au&swählen - + &Find &Suchen - + &Navigation Toolbar &Navigations-Symbolleiste - + &Bookmarks Toolbar &Lesezeichen-Werkzeug-Leiste - + Sta&tus Bar Sta&tus-Leiste - + Toolbars Werkzeugleisten - + Sidebars Seiten-Leiste - + &Page Source Seiten-&Quelltext - + &Menu Bar &Menü-Leiste - + &Fullscreen &Vollbild - + &Stop &Stopp - + &Reload &Neu laden - + Character &Encoding &Zeichenkodierung - + Zoom &In Ver&größern - + Zoom &Out Ver&kleinern - + Reset Zurücksetzen - + Close Window Fenster schließen - + Open Location Adresse aufrufen - + Send Link... Link senden... - + Other Andere - + Default Standard - + Current cookies cannot be accessed. Auf aktuelle Cookies kann nicht zugegriffen werden. - + Your session is not stored. Ihre Sitzung wird nicht gespeichert. - + Start Private Browsing Privaten Modus starten - + Private Browsing Enabled Privater Modus aktiv - + Restore &Closed Tab Geschlossenen Tab &wiederherstellen - + Bookmarks In ToolBar Lesezeichen in Werkzeug-Leiste - - - + + + Empty Leer - + New tab Neuer Tab - + Bookmark &This Page &Lesezeichen für diese Seite hinzufügen - + Bookmark &All Tabs Lesezeichen für alle &geöffneten Tabs hinzufügen - + Organize &Bookmarks Bookmarks &bearbeiten - + &Back &Zurück - + &Forward &Vor - + &Home &Startseite - + Show &All History &Vollständigen Verlauf anzeigen - + Closed Tabs Geschlossene Tabs - + Save Page Screen Bildschirmseite speichern - - + + (Private Browsing) (Privater Modus) - + Restore All Closed Tabs Alle geschlossenen Tabs wiederherstellen - + Clear list Liste leeren - + About &Qt Üb&er Qt - + &About QupZilla Über Qup&Zilla - + Informations about application Informationen über QupZilla - + Report &Issue &Fehlerbericht senden - + &Web Search Web&suche - + Page &Info S&eiteninformationen anzeigen - + &Download Manager &Download Manager - + &Cookies Manager &Cookie Manager - + &AdBlock &AdBlock - + RSS &Reader RSS &Reader - + Clear Recent &History &Verlauf löschen - + &Private Browsing &Privater Modus - + Pr&eferences &Einstellungen @@ -3051,32 +3051,32 @@ p, li { white-space: pre-wrap; } Web Inspector - + Open file... Datei öffnen... - + Are you sure you want to turn on private browsing? Möchten Sie wirklich den privaten Modus starten? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Wenn der private Modus aktiv ist, stehen einige Aktionen nicht zur Verfügung: - + Webpages are not added to the history. Webseiten werden nicht zum Verlauf hinzugefügt. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Solange dieses Fenster geöffnet ist, können Sie über die Symbole "Zurück" und "Vor" zu den Webseiten zurückkehren, die Sie geöffnet haben. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? Es sind noch %1 Tabs geöffnet und Ihre Sitzung wird nicht gespeichert. Möchten Sie QupZilla wirklich beenden? @@ -3582,12 +3582,12 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Verknüpfung - + Add Search Engine Suchmaschine hinzufügen - + Edit Search Engine Suchmaschine bearbeiten @@ -4215,8 +4215,8 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest WebInspectorDockWidget - - + + Web Inspector Web Inspector diff --git a/translations/es.ts b/translations/es.ts index 799f0ca17..ec50de709 100644 --- a/translations/es.ts +++ b/translations/es.ts @@ -389,61 +389,61 @@ p, li { white-space: pre-wrap; } - + <b>Importing from %1</b> - + Finish - - - + + + Error! - + Choose directory... - + Choose file... - + Mozilla Firefox stores its bookmarks in <b>places.sqlite</b> SQLite database. This file is usually located in - + Google Chrome stores its bookmarks in <b>Bookmarks</b> text file. This file is usually located in - + Opera stores its bookmarks in <b>bookmarks.adr</b> text file. This file is usually located in - + Internet Explorer stores its bookmarks in <b>Favorites</b> folder. This folder is usually located in - - - + + + Please choose this file to begin importing bookmarks. - + Please choose this folder to begin importing bookmarks. @@ -866,17 +866,17 @@ p, li { white-space: pre-wrap; } ChromeImporter - + No Error - + Unable to open file. - + Cannot evaluate JSON code. @@ -1402,7 +1402,7 @@ p, li { white-space: pre-wrap; } - + Choose icon... @@ -1410,17 +1410,17 @@ p, li { white-space: pre-wrap; } FirefoxImporter - + No Error - + File does not exists. - + Unable to open database. Is Firefox running? @@ -1779,12 +1779,12 @@ p, li { white-space: pre-wrap; } OperaImporter - + No Error - + Unable to open file. @@ -2567,7 +2567,7 @@ p, li { white-space: pre-wrap; } QObject - + The file is not an OpenSearch 1.1 file. @@ -2608,417 +2608,417 @@ p, li { white-space: pre-wrap; } QupZilla - + Private Browsing Enabled - + IP Address of current page - + Tools - + Help - - + + Bookmarks - - + + History - + File - + &New Window - + New Tab - + Open Location - + Open &File - + Close Tab - + Close Window - + &Save Page As... - + Save Page Screen - + Send Link... - + &Print - + Import bookmarks... - + Quit - + Edit - + &Undo - + &Redo - + &Cut - + C&opy - + &Paste - + &Delete - + Select &All - + &Find - + View - + &Navigation Toolbar - + &Bookmarks Toolbar - + Sta&tus Bar - + &Menu Bar - + &Fullscreen - + &Stop - + &Reload - + Character &Encoding - + Toolbars - + Sidebars - + Zoom &In - + Zoom &Out - + Reset - + &Page Source - + Closed Tabs - + Restore &Closed Tab - - + + (Private Browsing) - + Bookmark &This Page - + Bookmark &All Tabs - + Organize &Bookmarks - + Bookmarks In ToolBar - - - + + + Empty - + &Back - + &Forward - + &Home - + Show &All History - + Restore All Closed Tabs - + Clear list - + About &Qt - + &About QupZilla - + Informations about application - + Report &Issue - + &Web Search - + Page &Info - + &Download Manager - + &Cookies Manager - + &AdBlock - + RSS &Reader - + Clear Recent &History - + &Private Browsing - + Pr&eferences - + Other - + Default - + Open file... - + Are you sure you want to turn on private browsing? - + When private browsing is turned on, some actions concerning your privacy will be disabled: - + Webpages are not added to the history. - + Current cookies cannot be accessed. - + Your session is not stored. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. - + Start Private Browsing - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? - + New tab @@ -3475,12 +3475,12 @@ After adding or removing certificate paths, it is neccessary to restart browser - + Add Search Engine - + Edit Search Engine @@ -4060,8 +4060,8 @@ After adding or removing certificate paths, it is neccessary to restart browser WebInspectorDockWidget - - + + Web Inspector diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 979ed1817..cade66e08 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -397,61 +397,61 @@ p, li { white-space: pre-wrap; } Annuleren - + <b>Importing from %1</b> <b>Bezig met importeren uit %1</b> - + Finish Afronden - - - + + + Error! Fout! - + Choose directory... Kies map... - + Choose file... Kies bestand... - + Mozilla Firefox stores its bookmarks in <b>places.sqlite</b> SQLite database. This file is usually located in Mozilla Firefox bewaart haar bladwijzers in <b>places.sqlite</b> SQLite-datebase. Dit bestand is normaal gezien te vinden in - + Google Chrome stores its bookmarks in <b>Bookmarks</b> text file. This file is usually located in Google Chrome bewaart haar bladwijzers in <b>Bookmarks</b>-tekstbestand. Dit bestand is normaal gezien te vinden in - + Opera stores its bookmarks in <b>bookmarks.adr</b> text file. This file is usually located in Opera bewaart haar bladwijzers in <b>bookmarks.adr</b>-tekstbestand. Dit bestand is normaal gezien te vinden in - + Internet Explorer stores its bookmarks in <b>Favorites</b> folder. This folder is usually located in Internet Explorer bewaart haar bladwijzers in <b>Favorieten</b>-map. Dit bestand is normaal gezien te vinden in - - - + + + Please choose this file to begin importing bookmarks. Kies alstublieft dit bestand om het importeren te starten. - + Please choose this folder to begin importing bookmarks. Kies alstublieft deze map om het importeren te starten. @@ -890,17 +890,17 @@ p, li { white-space: pre-wrap; } ChromeImporter - + No Error Geen fout - + Unable to open file. Niet in staat om bestand te openen. - + Cannot evaluate JSON code. Kan JSON-code niet evalueren. @@ -1429,7 +1429,7 @@ werd niet gevonden! Kies bestand... - + Choose icon... Kies pictogram... @@ -1437,17 +1437,17 @@ werd niet gevonden! FirefoxImporter - + No Error Geen fout - + File does not exists. Bestand bestaat niet. - + Unable to open database. Is Firefox running? Database kan niet worden geopend. Is Firefox actief? @@ -1816,12 +1816,12 @@ werd niet gevonden! OperaImporter - + No Error Geen fout - + Unable to open file. Kan bestand niet openen. @@ -2618,7 +2618,7 @@ werd niet gevonden! QObject - + The file is not an OpenSearch 1.1 file. Dit bestand is geen OpenSearch 1.1-bestand. @@ -2659,389 +2659,389 @@ werd niet gevonden! QupZilla - + File Bestand - + Edit Bewerken - + Tools Hulpmiddelen - + Help Help - + View Beeld - - + + Bookmarks Bladwijzers - - + + History Geschiedenis - + Quit Sluit af - + New Tab Nieuw tabblad - + Close Tab Sluit tabblad - + IP Address of current page IP-adres van huidige pagina - + &New Window &Nieuw venster - + Open &File Open &bestand - + &Save Page As... &Sla pagina op als... - + &Print &Afdrukken - + Import bookmarks... Importeer bladwijzers... - + &Undo &Ongedaan maken - + &Redo &Herhalen - + &Cut &Knippen - + C&opy K&opiëren - + &Paste &Plakken - + &Delete &Verwijderen - + Select &All Selecteer &Alles - + &Find &Zoeken - + &Navigation Toolbar &Navigatiewerkbalk - + &Bookmarks Toolbar &Bladwijzerwerkbalk - + Sta&tus Bar Sta&tusbalk - + Toolbars Werkbalken - + Sidebars Zijpanelen - + &Page Source &Pagina-broncode - + &Menu Bar &Menubalk - + &Fullscreen &Volledig scherm - + &Stop &Stoppen - + &Reload &Herladen - + Character &Encoding &Karakter-tekenset - + Zoom &In Zoo&m in - + Zoom &Out Z&oom uit - + Reset Herstart - + Close Window Sluit venster - + Open Location Open locatie - + Send Link... Verstuur link... - + Other Overig - + Default Standaard - + Current cookies cannot be accessed. Huidige cookies kunnen niet worden benaderd. - + Your session is not stored. Uw sessie is niet bewaard. - + Start Private Browsing Start incognito browsen - + Private Browsing Enabled Incognito browsen ingeschakeld - + Restore &Closed Tab Herstel &gesloten tabblad - + Bookmarks In ToolBar Bookmarks In Toolbar Bladwijzers op werkbalk - - - + + + Empty Leeg - + New tab Nieuw tabblad - + Bookmark &This Page Bladwijzer &deze pagina - + Bookmark &All Tabs Bladwijzer &alle tabbladen - + Organize &Bookmarks Organiseer &bladwijzers - + &Back &Terug - + &Forward &Vooruit - + &Home &Startpagina - + Show &All History Toon &alle geschiedenis - + Closed Tabs Gesloten tabbladen - + Save Page Screen Sla schermafbeelding op - - + + (Private Browsing) (Incognito browsen) - + Restore All Closed Tabs Herstel alle gesloten tabbladen - + Clear list Wis lijst - + About &Qt Over &Qt - + &About QupZilla &Over QupZilla - + Informations about application Informatie over programma - + Report &Issue Rapporteer &probleem - + &Web Search &Webzoeken - + Page &Info Pagina-&info - + &Download Manager &Downloadbeheerder - + &Cookies Manager &Cookies-beheerder - + &AdBlock &AdBlock - + RSS &Reader &RSS-lezer - + Clear Recent &History Wis recente &geschiedenis - + &Private Browsing &Incognito browsen - + Pr&eferences &Instellingen @@ -3050,32 +3050,32 @@ werd niet gevonden! Web-inspecteur - + Open file... Open bestand... - + Are you sure you want to turn on private browsing? Weet u zeker dat u incognito browsen wilt inschakelen? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Wanneer incognito browsen is ingeschakeld, zullen sommige acties aangaande uw privacy uitgeschakeld worden: - + Webpages are not added to the history. Webpagina's worden niet toegevoegd aan uw geschiedenis. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Totdat u dit venster afsluit, kunt nog steeds op de Terug en Vooruit-knoppen klikken om terug naar de webpagina's te gaan die u hebt geopend. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? U heeft nog steeds %1 geopende tabs en uw sessie zal niet worden opgeslagen. Weet u zeker dat u wilt afsluiten? @@ -3537,12 +3537,12 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Snelkoppeling - + Add Search Engine Voeg zoekmachine toe - + Edit Search Engine Bewerk zoekmachine @@ -4135,8 +4135,8 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te WebInspectorDockWidget - - + + Web Inspector Web-inspecteur diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index bea4a233c..930fcf6c3 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -401,61 +401,61 @@ p, li { white-space: pre-wrap; } Zrušiť - + <b>Importing from %1</b> <b>Importovať z %1</b> - + Finish Dokončené - - - + + + Error! Chyba! - + Choose directory... Zvoľte umiestnenie... - + Choose file... Zvoľte súbor... - + Mozilla Firefox stores its bookmarks in <b>places.sqlite</b> SQLite database. This file is usually located in Mozilla Firefox ukladá svoje záložky v SQLite databáze <b>places.sqlite</b>. Tento súbor sa obvykle nachádza v - + Google Chrome stores its bookmarks in <b>Bookmarks</b> text file. This file is usually located in Google Chrome ukladá svoje záložky v SQLite databáze <b>places.sqlite</b>. Tento súbor sa obvykle nachádza v - + Opera stores its bookmarks in <b>bookmarks.adr</b> text file. This file is usually located in Opera ukladá svoje záložky v SQLite databáze <b>places.sqlite</b>. Tento súbor sa obvykle nachádza v - + Internet Explorer stores its bookmarks in <b>Favorites</b> folder. This folder is usually located in Internet Explorer ukladá svoje záložky v SQLite databáze <b>places.sqlite</b>. Tento súbor sa obvykle nachádza v - - - + + + Please choose this file to begin importing bookmarks. Prosím zvoľte tento súbor pre zahájenie importu. - + Please choose this folder to begin importing bookmarks. Prosím zvoľte tento priečinok pre zahájenie importu. @@ -894,17 +894,17 @@ p, li { white-space: pre-wrap; } ChromeImporter - + No Error Žiadna chyba - + Unable to open file. Nepodarilo sa otvoriť súbor. - + Cannot evaluate JSON code. Nie je možné spustiť JSON kód. @@ -1440,7 +1440,7 @@ p, li { white-space: pre-wrap; } Pridať zo súboru... - + Choose icon... Zvoľte ikonu... @@ -1448,17 +1448,17 @@ p, li { white-space: pre-wrap; } FirefoxImporter - + No Error Žiadna chyba - + File does not exists. Súbor neexistuje. - + Unable to open database. Is Firefox running? Nepodarilo sa otvoriť databázu. Je Firefox zapnutý? @@ -1826,12 +1826,12 @@ p, li { white-space: pre-wrap; } OperaImporter - + No Error Žiadna chyba - + Unable to open file. Nepodarilo sa otvoriť súbor. @@ -2624,7 +2624,7 @@ p, li { white-space: pre-wrap; } QObject - + The file is not an OpenSearch 1.1 file. Tento súbor nie je kompatibilný s OpenSearh 1.1. @@ -2665,388 +2665,388 @@ p, li { white-space: pre-wrap; } QupZilla - + File Súbor - + Edit Úpravy - + Tools Nástroje - + Help Nápoveda - + View Zobraziť - - + + Bookmarks Záložky - - + + History História - + Quit Koniec - + New Tab Nová karta - + Close Tab Zatvoriť kartu - + IP Address of current page IP adresa aktuálnej stránky - + &New Window &Nové okno - + Open &File Otvoriť &súbor - + &Save Page As... &Uložiť stránku ako... - + &Print &Tlačiť - + Import bookmarks... Importovať záložky... - + &Undo &Späť - + &Redo &Dopredu - + &Cut &Vystrihnúť - + C&opy &Kopírovať - + &Paste &Prilepiť - + &Delete &Odstrániť - + Select &All Vybrať vš&etko - + &Find &Nájsť - + &Navigation Toolbar Panel &navigácie - + &Bookmarks Toolbar Panel &záložiek - + Sta&tus Bar Stavový &riadok - + Toolbars Panely nástrojov - + Sidebars Bočné panely - + &Page Source Zdrojový &kód stránky - + &Menu Bar &Menu panel - + &Fullscreen &Celá obrazovka - + &Stop Za&staviť - + &Reload &Obnoviť - + Character &Encoding Kódovani&e znakov - + Zoom &In Priblíž&iť - + Zoom &Out &Oddialiť - + Reset Resetovať - + Close Window Zatvoriť okno - + Open Location Otvoriť umiestnenie - + Send Link... Poslať odkaz... - + Other Ostatné - + Default Štandardné - + Current cookies cannot be accessed. Aktuálne cookies nie sú dostupné. - + Your session is not stored. Vaša relácia nie je uložená. - + Start Private Browsing Spustiť súkromné prehliadanie - + Private Browsing Enabled Súkromné prehliadanie je zapnuté - + Restore &Closed Tab Obnoviť zatvorenú &kartu - + Bookmarks In ToolBar Záložky v paneli nástrojov - - - + + + Empty Prázdne - + New tab Nová karta - + Bookmark &This Page Pridať túto &stránku do záložiek - + Bookmark &All Tabs Pridať &všetky karty do záložiek - + Organize &Bookmarks &Organizovať záložky - + &Back &Späť - + &Forward &Dopredu - + &Home Do&mov - + Show &All History Zobraziť celú &históriu - + Closed Tabs Zatvorené karty - + Save Page Screen Uložiť obrázok stránky - - + + (Private Browsing) (Súkromné prehliadanie) - + Restore All Closed Tabs Obnoviť všetky zatvorené karty - + Clear list Vyčistiť zoznam - + About &Qt O &Qt - + &About QupZilla &O QupZille - + Informations about application Informácie o programe - + Report &Issue Nahlásiť &problém - + &Web Search Hladať na &webe - + Page &Info &Informácie o stránke - + &Download Manager Správca &sťahovania - + &Cookies Manager Správca &cookies - + &AdBlock &AdBlock - + RSS &Reader &RSS čítačka - + Clear Recent &History Vymazať nedávnu &históriu - + &Private Browsing Súkromné prehlia&danie - + Pr&eferences Nastav&enia @@ -3055,32 +3055,32 @@ p, li { white-space: pre-wrap; } Web inšpektor - + Open file... Otvoriť súbor... - + Are you sure you want to turn on private browsing? Ste si istý, že chcete zapnúť súkromné prehliadanie? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Keď je zapnuté súkromné prehliadanie, niektoré akcie týkajúce sa vášho súkromia sú vypnuté: - + Webpages are not added to the history. Stránky nie sú pridávané do histórie. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Kým nezatvoríte okno, stále môžte používať tlačidlá Späť a Dopredu k vráteniu sa na stránky, ktoré ste mali otvorené. - + There are still %1 open tabs and your session won't be stored. Are you sure to quit? Stále sú otvorené %1 karty a vaša relácia nebude uložená. Ste si istý, že chcete skončiť? @@ -3550,12 +3550,12 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad Zástupca - + Add Search Engine Pridať vyhľadávač - + Edit Search Engine Upraviť vyhľadávač @@ -4147,8 +4147,8 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad WebInspectorDockWidget - - + + Web Inspector Web inšpektor