diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index 34fedd71b..67c6f8a02 100644 Binary files a/bin/locale/cs_CZ.qm and b/bin/locale/cs_CZ.qm differ diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index e56c0d87c..c8323ef51 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -146,7 +146,7 @@ MainApplication::MainApplication(const QList &cm m_postLaunchActions.append(PrivateBrowsing); break; case Qz::CL_OpenUrl: - startUrl = pair.text; + startUrl = QUrl::fromEncoded(pair.text.toUtf8()); messages.append("URL:" + startUrl.toString()); break; default: diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index 91885cfdf..0e57d9d5a 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -331,7 +331,7 @@ void QupZilla::setupMenu() m_menuFile->addAction(QIcon::fromTheme("document-save"), tr("&Save Page As..."), this, SLOT(savePage()))->setShortcut(QKeySequence("Ctrl+S")); m_menuFile->addAction(tr("Save Page Screen"), this, SLOT(savePageScreen())); m_menuFile->addAction(QIcon::fromTheme("mail-message-new"), tr("Send Link..."), this, SLOT(sendLink())); - m_menuFile->addAction(QIcon::fromTheme("document-print"), tr("&Print"), this, SLOT(printPage())); + m_menuFile->addAction(QIcon::fromTheme("document-print"), tr("&Print..."), this, SLOT(printPage())); m_menuFile->addSeparator(); m_menuFile->addSeparator(); m_menuFile->addAction(tr("Import bookmarks..."), this, SLOT(showBookmarkImport())); @@ -1444,7 +1444,6 @@ void QupZilla::sendLink() void QupZilla::printPage(QWebFrame* frame) { QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this); - dialog->setWindowTitle(tr("Print...")); dialog->resize(800, 750); if (!frame) { diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp index 2937df182..0bfe7eaf1 100644 --- a/src/autofill/autofillmodel.cpp +++ b/src/autofill/autofillmodel.cpp @@ -198,12 +198,19 @@ void AutoFillModel::completePage(WebPage* page) return; } - QList > arguments = QUrl::fromEncoded(QByteArray("http://bla.com/?" + data)).queryItems(); + // Why not to use encodedQueryItems = QByteArrays ? + // Because we need to filter "+" characters that must be spaces + // (not real "+" characters "%2B") + + QueryItems arguments = QUrl::fromEncoded("http://bla.com/?" + data).queryItems(); for (int i = 0; i < arguments.count(); i++) { - QString key = QUrl::fromEncoded(arguments.at(i).first.toUtf8()).toString(); - QString value = QUrl::fromEncoded(arguments.at(i).second.toUtf8()).toString(); - //key.replace("+"," "); - //value.replace("+"," "); + QString key = arguments.at(i).first; + QString value = arguments.at(i).second; + key.replace("+", " "); + value.replace("+", " "); + + key = QUrl::fromEncoded(key.toUtf8()).toString(); + value = QUrl::fromEncoded(value.toUtf8()).toString(); for (int i = 0; i < inputs.count(); i++) { QWebElement element = inputs.at(i); diff --git a/src/autofill/autofillmodel.h b/src/autofill/autofillmodel.h index 51124c705..1bcd5f0b9 100644 --- a/src/autofill/autofillmodel.h +++ b/src/autofill/autofillmodel.h @@ -28,8 +28,8 @@ class WebPage; class AutoFillModel : public QObject { public: - typedef QList > QueryItems; typedef QPair QueryItem; + typedef QList > QueryItems; explicit AutoFillModel(QupZilla* mainClass, QObject* parent = 0); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index e7c408f38..b15df37b1 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -215,7 +215,7 @@ void BookmarksToolbar::editBookmark() return; } - QString url = editUrl->text(); + QUrl url = QUrl::fromEncoded(editUrl->text().toUtf8()); QString title = editTitle->text(); if (url.isEmpty() || title.isEmpty()) { diff --git a/src/bookmarksimport/chromeimporter.cpp b/src/bookmarksimport/chromeimporter.cpp index 671f8a94d..0a9e1135c 100644 --- a/src/bookmarksimport/chromeimporter.cpp +++ b/src/bookmarksimport/chromeimporter.cpp @@ -67,7 +67,7 @@ QList ChromeImporter::exportBookmarks() if (scriptEngine->canEvaluate(parsedString)) { QScriptValue object = scriptEngine->evaluate(parsedString); QString name = object.property("name").toString(); - QString url = object.property("url").toString(); + QUrl url = QUrl::fromEncoded(object.property("url").toString().toUtf8()); if (name.isEmpty() || url.isEmpty()) { continue; diff --git a/src/bookmarksimport/firefoximporter.cpp b/src/bookmarksimport/firefoximporter.cpp index 3c6879cf0..c83256e32 100644 --- a/src/bookmarksimport/firefoximporter.cpp +++ b/src/bookmarksimport/firefoximporter.cpp @@ -68,9 +68,9 @@ QList FirefoxImporter::exportBookmarks() continue; } - QString url = query2.value(0).toString(); + QUrl url = query2.value(0).toUrl(); - if (title.isEmpty() || url.isEmpty() || url.startsWith("place:")) { + if (title.isEmpty() || url.isEmpty() || url.scheme() == "place" || url.scheme() == "about") { continue; } diff --git a/src/bookmarksimport/htmlimporter.cpp b/src/bookmarksimport/htmlimporter.cpp index 633dc8af9..d74a8d5fa 100644 --- a/src/bookmarksimport/htmlimporter.cpp +++ b/src/bookmarksimport/htmlimporter.cpp @@ -48,9 +48,9 @@ QList HtmlImporter::exportBookmarks() rx2.setPattern("href=\"(.*)\""); rx2.indexIn(string); - QString url = rx2.cap(1); + QUrl url = QUrl::fromEncoded(rx2.cap(1).toUtf8()); - if (name.isEmpty() || url.isEmpty() || url.startsWith("place:") || url.startsWith("about:")) { + if (name.isEmpty() || url.isEmpty() || url.scheme() == "place" || url.scheme() == "about") { continue; } diff --git a/src/bookmarksimport/operaimporter.cpp b/src/bookmarksimport/operaimporter.cpp index b41a9d0de..c85e77768 100644 --- a/src/bookmarksimport/operaimporter.cpp +++ b/src/bookmarksimport/operaimporter.cpp @@ -65,7 +65,7 @@ QList OperaImporter::exportBookmarks() rx2.setPattern("URL=(.*)\\n"); rx2.indexIn(string); - QString url = rx2.cap(1); + QUrl url = QUrl::fromEncoded(rx2.cap(1).toUtf8()); if (name.isEmpty() || url.isEmpty()) { continue; diff --git a/src/data/qupzilla.png b/src/data/qupzilla.png index cb3f441b5..c338881ba 100644 Binary files a/src/data/qupzilla.png and b/src/data/qupzilla.png differ diff --git a/src/main.cpp b/src/main.cpp index 64e2a0c5e..af1e97779 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,6 +40,7 @@ void sigpipe_handler(int s) int main(int argc, char* argv[]) { + Q_INIT_RESOURCE(data); Q_INIT_RESOURCE(icons); Q_INIT_RESOURCE(html); @@ -50,6 +51,8 @@ int main(int argc, char* argv[]) signal(SIGPIPE, sigpipe_handler); #endif +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + QList cmdActions; if (argc > 1) { diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index 0d59c72da..0db6eb3b2 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -104,7 +104,7 @@ QUrl LocationBar::createUrl() SearchEngine en = mApp->searchEnginesManager()->engineForShortcut(shortcut); if (!en.name.isEmpty()) { - urlToLoad = en.url.replace("%s", searchedString); + urlToLoad = QUrl::fromEncoded(en.url.replace("%s", searchedString).toUtf8()); } } @@ -114,7 +114,7 @@ QUrl LocationBar::createUrl() urlToLoad = guessedUrl; } else { - urlToLoad = text(); + urlToLoad = QUrl::fromEncoded(text().toUtf8()); } } diff --git a/src/navigation/websearchbar.cpp b/src/navigation/websearchbar.cpp index c90257032..c77db3f28 100644 --- a/src/navigation/websearchbar.cpp +++ b/src/navigation/websearchbar.cpp @@ -163,7 +163,7 @@ void WebSearchBar::completeMenuWithAvailableEngines(QMenu* menu) if (element.attribute("type") != "application/opensearchdescription+xml") { continue; } - QString url = view->url().resolved(element.attribute("href")).toString(); + QUrl url = view->url().resolved(QUrl::fromEncoded(element.attribute("href").toUtf8())); QString title = element.attribute("title"); if (url.isEmpty()) { @@ -311,6 +311,6 @@ void WebSearchBar::keyPressEvent(QKeyEvent* event) default: break; } - + LineEdit::keyPressEvent(event); } diff --git a/src/network/cabundleupdater.cpp b/src/network/cabundleupdater.cpp index b24f93dc3..36ae6e919 100644 --- a/src/network/cabundleupdater.cpp +++ b/src/network/cabundleupdater.cpp @@ -38,7 +38,8 @@ void CaBundleUpdater::start() if (updateNow) { m_progress = CheckLastUpdate; - m_reply = m_manager->get(QNetworkRequest(QupZilla::WWWADDRESS + "/certs/bundle_version")); + QUrl url = QUrl::fromEncoded(QString(QupZilla::WWWADDRESS + "/certs/bundle_version").toUtf8()); + m_reply = m_manager->get(QNetworkRequest(url)); connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); } } @@ -63,7 +64,9 @@ void CaBundleUpdater::replyFinished() if (m_latestBundleVersion > currentBundleVersion) { m_progress = LoadBundle; - m_reply = m_manager->get(QNetworkRequest(QupZilla::WWWADDRESS + "/certs/ca-bundle.crt")); + + QUrl url = QUrl::fromEncoded(QString(QupZilla::WWWADDRESS + "/certs/ca-bundle.crt").toUtf8()); + m_reply = m_manager->get(QNetworkRequest(url)); connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); } diff --git a/src/opensearch/searchenginesdialog.cpp b/src/opensearch/searchenginesdialog.cpp index 371559c5a..50e9e4793 100644 --- a/src/opensearch/searchenginesdialog.cpp +++ b/src/opensearch/searchenginesdialog.cpp @@ -55,7 +55,7 @@ void SearchEnginesDialog::addEngine() engine.name = dialog.name(); engine.url = dialog.url(); engine.shortcut = dialog.shortcut(); - engine.icon = SearchEnginesManager::iconForSearchEngine(dialog.url()); + engine.icon = SearchEnginesManager::iconForSearchEngine(QUrl::fromEncoded(dialog.url().toUtf8())); if (engine.name.isEmpty() || engine.url.isEmpty()) { return; diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index 9f690faea..946b9ef49 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -204,7 +204,7 @@ void SpeedDial::loadThumbnail(const QString &url, bool loadTitle) } PageThumbnailer* thumbnailer = new PageThumbnailer(this); - thumbnailer->setUrl(url); + thumbnailer->setUrl(QUrl::fromEncoded(url.toUtf8())); thumbnailer->setLoadTitle(loadTitle); connect(thumbnailer, SIGNAL(thumbnailCreated(QPixmap)), this, SLOT(thumbnailCreated(QPixmap))); diff --git a/src/sidebar/historysidebar.cpp b/src/sidebar/historysidebar.cpp index c9e22e80c..edec4467f 100644 --- a/src/sidebar/historysidebar.cpp +++ b/src/sidebar/historysidebar.cpp @@ -189,7 +189,7 @@ void HistorySideBar::search() item->setText(0, fitem->text(0)); item->setText(1, fitem->text(1)); item->setWhatsThis(1, fitem->whatsThis(1)); - item->setIcon(0, _iconForUrl(fitem->text(1))); + item->setIcon(0, _iconForUrl(QUrl::fromEncoded(fitem->text(1).toUtf8()))); foundItems.append(item); } ui->historyTree->clear(); diff --git a/src/src.pro b/src/src.pro index 77ffdcdfd..778ef3df2 100644 --- a/src/src.pro +++ b/src/src.pro @@ -21,6 +21,8 @@ UI_DIR = ../build #DEFINES += PORTABLE_BUILD win32:DEFINES += W7API +DEFINES += QT_NO_URL_CAST_FROM_STRING + ##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template !win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/src/webview/siteinfo.cpp b/src/webview/siteinfo.cpp index f81e30767..6a500d863 100644 --- a/src/webview/siteinfo.cpp +++ b/src/webview/siteinfo.cpp @@ -190,7 +190,7 @@ void SiteInfo::showImagePreview(QTreeWidgetItem* item) if (!item) { return; } - QUrl imageUrl = item->text(1); + QUrl imageUrl = QUrl::fromEncoded(item->text(1).toUtf8()); if (imageUrl.isRelative()) { imageUrl = m_baseUrl.resolved(imageUrl); } diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp index ed258b669..85b25e0b1 100644 --- a/src/webview/webpage.cpp +++ b/src/webview/webpage.cpp @@ -431,7 +431,7 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte errString.replace("%RULE%", tr("Blocked by rule %1").arg(rule)); - exReturn->baseUrl = exOption->url.toString(); + exReturn->baseUrl = exOption->url; exReturn->content = errString.toUtf8(); return true; } @@ -450,7 +450,7 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte return false; // Downloads } - QString loadedUrl = exOption->url.toString(); + QUrl loadedUrl = exOption->url; exReturn->baseUrl = loadedUrl; QFile file(":/html/errorPage.html"); @@ -463,7 +463,7 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte errString.replace("%BOX-BORDER%", "qrc:html/box-border.png"); errString.replace("%HEADING%", errorString); - errString.replace("%HEADING2%", tr("QupZilla can't load page from %1.").arg(QUrl(loadedUrl).host())); + errString.replace("%HEADING2%", tr("QupZilla can't load page from %1.").arg(loadedUrl.host())); errString.replace("%LI-1%", tr("Check the address for typing errors such as ww.example.com instead of www.example.com")); errString.replace("%LI-2%", tr("If you are unable to load any pages, check your computer's network connection.")); errString.replace("%LI-3%", tr("If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web.")); diff --git a/tests/forms/form.html b/tests/forms/form.html index f60bc12da..c6013b162 100644 --- a/tests/forms/form.html +++ b/tests/forms/form.html @@ -1,5 +1,6 @@ + Form completion test diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index 58bfa2027..19597b3a0 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -3096,9 +3096,8 @@ nebyl nalezen! &Uložit stránku jako... - &Print - &Tisk + &Tisk @@ -3205,7 +3204,7 @@ nebyl nalezen! - QupZilla - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Ještě je otevřeno %1 panelů a Vaše relace nebude uložena. Opravdu chcete skončit? @@ -3264,6 +3263,11 @@ nebyl nalezen! Send Link... Poslat odkaz... + + + &Print... + &Tisk... + Other @@ -3275,22 +3279,22 @@ nebyl nalezen! Defaultní - + %1 - QupZilla %1 - QupZilla - + 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 soukromé prohlížení @@ -3442,27 +3446,27 @@ nebyl nalezen! Předvo&lby - + 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. diff --git a/translations/de_DE.ts b/translations/de_DE.ts index db35b24e4..25d48f2a2 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -3099,9 +3099,8 @@ Seite speichern &unter... - &Print - &Drucken + &Drucken @@ -3208,7 +3207,7 @@ - QupZilla - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Es sind noch %1 Tabs geöffnet und Ihre Sitzung wird nicht gespeichert. Möchten Sie QupZilla wirklich beenden? @@ -3267,6 +3266,11 @@ Send Link... Link senden... + + + &Print... + + Other @@ -3278,22 +3282,22 @@ Standard - + %1 - QupZilla %1 - QupZilla - + 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 @@ -3445,27 +3449,27 @@ &Einstellungen - + 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. diff --git a/translations/el_GR.ts b/translations/el_GR.ts index feebf22bc..ccce211b9 100644 --- a/translations/el_GR.ts +++ b/translations/el_GR.ts @@ -3076,9 +3076,8 @@ Αποστολή συνδέσμου... - &Print - Ε&κτύπωση + Ε&κτύπωση @@ -3145,6 +3144,11 @@ QupZilla QupZilla + + + &Print... + + &View @@ -3320,7 +3324,7 @@ Πληροφορίες για την εφαρμογή - + %1 - QupZilla %1 QupZilla @@ -3389,47 +3393,47 @@ Προεπιλεγμένο - + 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. Δεν υπάρχει πρόσβαση στα τρέχοντα cookies. - + 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 QupZilla? Υπάρχουν ακόμα %1 ανοιχτές καρτέλες και η συνεδρία σας δεν θα αποθηκευτεί. Είστε σίγουρος ότι θέλετε να κλείσετε το QupZilla; diff --git a/translations/empty.ts b/translations/empty.ts index a08c4ea18..6f5415cc5 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -2801,11 +2801,6 @@ Send Link... - - - &Print - - Import bookmarks... @@ -2871,6 +2866,11 @@ QupZilla + + + &Print... + + &View @@ -3046,7 +3046,7 @@ - + %1 - QupZilla @@ -3111,47 +3111,47 @@ - + 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 QupZilla? diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 612785f81..c5a880fa4 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -3087,9 +3087,8 @@ Enviar enlace... - &Print - &Imprimir + &Imprimir @@ -3106,6 +3105,11 @@ QupZilla QupZilla + + + &Print... + + &Edit @@ -3321,7 +3325,7 @@ Acerca de &Qt - + %1 - QupZilla %1 - QupZilla @@ -3380,7 +3384,7 @@ &Navegación privada - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Está a punto de cerrar %1 pestañas. ¿Está seguro de continuar? @@ -3409,42 +3413,42 @@ Nueva pestaña - + Open file... Abrir archivo... - + Are you sure you want to turn on private browsing? ¿Está seguro que desea habilitar la navegación privada? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Cuando la navegación privada está habilitada, algunas opciones relacionadas con su privacidad estarán deshabilitadas: - + Webpages are not added to the history. Las páginas web no se añaden al historial. - + Current cookies cannot be accessed. Las cookies actuales no pueden ser accedidas. - + Your session is not stored. La sesión no será guardada. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Hasta que cierre la ventana, puede hacer click en los botones Anterior y Siguiente para regresar a las páginas web que haya abierto. - + Start Private Browsing Comenzar la navegación privada diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index f5113b529..cae15c7f1 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -3066,9 +3066,8 @@ n'a pas été trouvé! Envoyer un lien... - &Print - &Imprimer + &Imprimer @@ -3135,6 +3134,11 @@ n'a pas été trouvé! QupZilla QupZilla + + + &Print... + + &View @@ -3266,7 +3270,7 @@ n'a pas été trouvé! - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Il y a toujours %1 onglets d'ouverts et votre session ne sera pas sauvegardée. Etes-vous sûr de vouloir quitter QupZilla? @@ -3379,47 +3383,47 @@ n'a pas été trouvé! Défaut - + %1 - QupZilla - + Open file... Ouvrir un fichier... - + Are you sure you want to turn on private browsing? Voulez-vous démarrer une session en navigation privée? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Quand vous lancez la navigation privée, certains paramètres concernant votre vie privée seront désactivés: - + Webpages are not added to the history. Les pages visitées ne sont pas ajoutées à l'historique. - + Current cookies cannot be accessed. Impossible d'accéder aux cookies en cours d'utilisation. - + Your session is not stored. Votre session n'est pas enregistrée. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Jusqu'à ce que vous fermiez la fenêtre, vous pourrez toujours cliquer sur les boutons Précédent et Suivant pour retourner sur la page que vous avez ouvert. - + Start Private Browsing Commencer la navigation privée diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 1f739cc3f..ab88fa79b 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -3050,9 +3050,8 @@ Invia link... - &Print - S&tampa + S&tampa @@ -3135,6 +3134,11 @@ &File &File + + + &Print... + + &Edit @@ -3261,7 +3265,7 @@ - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Ci sono ancora %1 delle schede aperte e la sessione non sarà salvata. Sei sicuro di voler uscire da QupZilla? @@ -3379,47 +3383,47 @@ Predefinito - + %1 - QupZilla - + Open file... Apri file... - + Are you sure you want to turn on private browsing? Sei sicuro di voler avviare la navigazione anonima? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Quando la navigazione anonima è attiva, alcune azioni riguardanti la tua privacy potrebbero essere disabilitate: - + Webpages are not added to the history. Le pagine web non vengono aggiunte alla cronologia. - + Current cookies cannot be accessed. Non si può accedere ai cookie correnti. - + Your session is not stored. La Sessione non è memorizzata. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Fino alla chiusura della finestra è sempre possibile fare clic sui pulsanti Avanti e Indietro per tornare alla pagine web che hai aperto. - + Start Private Browsing Avvia navigazione anonima diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index f3150619e..8a3d4af5b 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -3088,9 +3088,8 @@ werd niet gevonden! &Sla pagina op als... - &Print - &Afdrukken + &Afdrukken @@ -3197,7 +3196,7 @@ werd niet gevonden! - QupZilla - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? U heeft nog steeds %1 geopende tabs en uw sessie zal niet worden opgeslagen. Weet u zeker dat u wilt afsluiten? @@ -3256,6 +3255,11 @@ werd niet gevonden! Send Link... Verstuur link... + + + &Print... + + Other @@ -3267,22 +3271,22 @@ werd niet gevonden! Standaard - + %1 - QupZilla %1 - QupZilla - + 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 @@ -3434,27 +3438,27 @@ werd niet gevonden! &Instellingen - + 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. diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index ba3e555e2..e62cf2f33 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -3090,9 +3090,8 @@ &Zapisz stronę jako... - &Print - &Drukuj + &Drukuj @@ -3204,7 +3203,7 @@ - QupZilla - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Nadal jest otwarte %1 kart a twoja sesja nie zostanie zapisana. Czy napewno chcesz wyłączyć QupZillę? @@ -3263,6 +3262,11 @@ Send Link... Wyslij odnośnik... + + + &Print... + + Other @@ -3274,22 +3278,22 @@ Domyślne - + %1 - QupZilla - + Current cookies cannot be accessed. Aktualne ciasteczka nie są dostępne. - + Your session is not stored. Twoja sesja nie jest przechowywana. - + Start Private Browsing Uruchom tryb prywatny @@ -3436,27 +3440,27 @@ Us&tawienia - + Open file... Otwórz plik... - + Are you sure you want to turn on private browsing? Czy na pewno chcesz włączyć tryb prywatny? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Kiedy tryb prywatny jest włączony, niektóre działania naruszające twoją prywatność będą wyłączone: - + Webpages are not added to the history. Strony internetowe nie są dodawane do historii. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Do zamknięcia okna, możesz używać Wstecz i Dalej aby powrócić do stron jakie miałeś otwarte. diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index 661a1dea1..4a3bff3d4 100644 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -3103,9 +3103,8 @@ não foi encontrado! Enviar ligação... - &Print - Im&primir + Im&primir @@ -3172,6 +3171,11 @@ não foi encontrado! QupZilla QupZilla + + + &Print... + + &View @@ -3347,7 +3351,7 @@ não foi encontrado! Informações da aplicação - + %1 - QupZilla %1 - QupZilla @@ -3420,47 +3424,47 @@ não foi encontrado! - QupZilla - + Open file... Abrir ficheiro... - + Are you sure you want to turn on private browsing? Tem a certeza que pretende ativar a navegação privada? - + When private browsing is turned on, some actions concerning your privacy will be disabled: Se a navegação privada estiver ativa, alguns elementos de privacidade estarão inativos: - + Webpages are not added to the history. As páginas web não são adicionadas ao histórico. - + Current cookies cannot be accessed. Os cookies atuais não estarão acessíveis. - + Your session is not stored. A sua sessão não pode ser gravada. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. No entanto, enquanto não fechar a janela pode utilizar os botões Recuar e Avançar para voltar às páginas abertas anteriormente. - + Start Private Browsing Iniciar navegação privada - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Ainda existe(m) %1 separador(es) aberto(s) e a sessão não será gravada. Tem a certeza que pretende sair? diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 7e1cb8e2b..0de60f418 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -3053,9 +3053,8 @@ Послать адрес... - &Print - &Печать + &Печать @@ -3122,6 +3121,11 @@ QupZilla QupZilla + + + &Print... + + &View @@ -3297,7 +3301,7 @@ - + %1 - QupZilla @@ -3366,47 +3370,47 @@ По умолчанию - + 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. Текущие cookies станут недоступны. - + 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 QupZilla? У вас открыто %1 вкладок и ваша сессия не сохранится. Вы точно хотите выйти из QupZilla? diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index e0de979ee..6f43c0240 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -2506,7 +2506,7 @@ &Print - &Tlačiť + &Tlačiť &Tools @@ -2776,6 +2776,10 @@ Most Visited Najnavštevovanejšie + + &Print... + + QupZillaSchemeReply diff --git a/translations/sr_BA.ts b/translations/sr_BA.ts index 39b446597..72ab31e23 100644 --- a/translations/sr_BA.ts +++ b/translations/sr_BA.ts @@ -2845,9 +2845,8 @@ Пошаљи везу... - &Print - &Штампај + &Штампај @@ -2914,6 +2913,11 @@ QupZilla Капзила + + + &Print... + + &View @@ -3089,7 +3093,7 @@ Подаци о програму - + %1 - QupZilla %1 - Капзила @@ -3154,47 +3158,47 @@ Подразумијевано - + 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 QupZilla? Још увијек имате %1 отворених језичака а ваша сесија неће бити сачувана. Желите ли заиста да напустите Капзилу? diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index 4dc230b43..8a134e388 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -2845,9 +2845,8 @@ Пошаљи везу... - &Print - &Штампај + &Штампај @@ -2914,6 +2913,11 @@ QupZilla Капзила + + + &Print... + + &View @@ -3089,7 +3093,7 @@ Подаци о програму - + %1 - QupZilla %1 - QupZilla @@ -3154,47 +3158,47 @@ Подразумевано - + 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 QupZilla? Још увек имате %1 отворених језичака а ваша сесија неће бити сачувана. Желите ли заиста да напустите Капзилу? diff --git a/translations/sv_SE.ts b/translations/sv_SE.ts index 953f610ad..9aed2d613 100644 --- a/translations/sv_SE.ts +++ b/translations/sv_SE.ts @@ -3077,9 +3077,8 @@ Skicka länk... - &Print - &Skriv ut + &Skriv ut @@ -3146,6 +3145,11 @@ QupZilla QupZilla + + + &Print... + + &View @@ -3385,52 +3389,52 @@ Standard - + %1 - QupZilla %1 - QupZilla - + Open file... Öppna fil... - + Are you sure you want to turn on private browsing? Är du säker på att du vill aktivera privat surfning? - + When private browsing is turned on, some actions concerning your privacy will be disabled: När privat surfning aktiveras stängs vissa integritetsrelaterade funktioner av: - + Webpages are not added to the history. Hemsidor sparas inte i historiken. - + Current cookies cannot be accessed. Nuvarande kakor kan inte kommas åt. - + Your session is not stored. Din session sparas inte. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. Fram till att du stänger fönstret kan du använda Bakåt/Framåt-knapparna för att återvända till sidor du besökt. - + Start Private Browsing Aktivera privat surfning - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? Det finns fortfarande %1 öppna flikar och din session kommer inte att sparas. Är du säker på att du vill avsluta QupZilla? diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index d742188e4..c73ac3d85 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -3042,9 +3042,8 @@ 发送链接... - &Print - 打印&P + 打印&P @@ -3126,6 +3125,11 @@ &File 文件&F + + + &Print... + + &Edit @@ -3345,7 +3349,7 @@ 隐私浏览&P - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? 还有%1打开的标签和您的会话将不会被储存。你一定要退出吗? @@ -3370,47 +3374,47 @@ 默认 - + %1 - QupZilla - + 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. 当前的cookies无法被访问。 - + 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 开始隐私浏览