1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00

Final updates for 1.0.0 beta2 version.

This commit is contained in:
nowrep 2011-05-31 21:11:46 +02:00
parent 41b992370b
commit b09d7c39b8
16 changed files with 260 additions and 183 deletions

Binary file not shown.

19
src/3rdparty/squeezelabelv1.cpp vendored Normal file
View File

@ -0,0 +1,19 @@
#include "squeezelabelv1.h"
SqueezeLabelV1::SqueezeLabelV1(QWidget *parent)
: QLabel(parent)
{
}
void SqueezeLabelV1::paintEvent(QPaintEvent *event)
{
if (m_SqueezedTextCache != text()) {
m_SqueezedTextCache = text();
QFontMetrics fm = fontMetrics();
if (fm.width(m_SqueezedTextCache) > contentsRect().width()) {
QString elided = fm.elidedText(text(), Qt::ElideMiddle, width());
setText(elided);
}
}
QLabel::paintEvent(event);
}

52
src/3rdparty/squeezelabelv1.h vendored Normal file
View File

@ -0,0 +1,52 @@
#ifndef SQUEEZELABELV1_H
#define SQUEEZELABELV1_H
/**
* Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Benjamin Meyer nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <QLabel>
/*
A label that will squeeze the set text to fit within the size of the
widget. The text will be elided in the middle.
*/
class SqueezeLabelV1 : public QLabel
{
Q_OBJECT
public:
SqueezeLabelV1(QWidget *parent = 0);
protected:
void paintEvent(QPaintEvent *event);
private:
QString m_SqueezedTextCache;
};
#endif // SQUEEZELABELV1_H

View File

@ -1,11 +1,11 @@
#include "squeezelabel.h"
#include "squeezelabelv2.h"
SqueezeLabel::SqueezeLabel(QWidget *parent)
SqueezeLabelV2::SqueezeLabelV2(QWidget *parent)
: QLabel(parent)
{
}
void SqueezeLabel::setText(const QString &txt)
void SqueezeLabelV2::setText(const QString &txt)
{
m_originalText = txt;
QFontMetrics fm = fontMetrics();
@ -13,12 +13,12 @@ void SqueezeLabel::setText(const QString &txt)
QLabel::setText(elided);
}
QString SqueezeLabel::originalText()
QString SqueezeLabelV2::originalText()
{
return m_originalText;
}
void SqueezeLabel::resizeEvent(QResizeEvent *event)
void SqueezeLabelV2::resizeEvent(QResizeEvent *event)
{
QLabel::resizeEvent(event);
QFontMetrics fm = fontMetrics();

View File

@ -1,5 +1,5 @@
#ifndef SQUEEZELABEL_H
#define SQUEEZELABEL_H
#ifndef SQUEEZELABELV2_H
#define SQUEEZELABELV2_H
/**
* Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
@ -35,12 +35,12 @@
A label that will squeeze the set text to fit within the size of the
widget. The text will be elided in the middle.
*/
class SqueezeLabel : public QLabel
class SqueezeLabelV2 : public QLabel
{
Q_OBJECT
public:
SqueezeLabel(QWidget *parent = 0);
SqueezeLabelV2(QWidget *parent = 0);
QString originalText();
void setText(const QString &txt);
@ -52,4 +52,4 @@ private:
QString m_originalText;
};
#endif // SQUEEZELABEL_H
#endif // SQUEEZELABELV2_H

View File

@ -43,7 +43,6 @@ INCLUDEPATH += 3rdparty\
desktopnotifications\
SOURCES += main.cpp\
3rdparty/squeezelabel.cpp \
3rdparty/qtwin.cpp \
3rdparty/lineedit.cpp \
app/qupzilla.cpp \
@ -120,9 +119,11 @@ SOURCES += main.cpp\
tools/closedtabsmanager.cpp \
other/statusbarmessage.cpp \
tools/buttonbox.cpp \
tools/widget.cpp
tools/widget.cpp \
3rdparty/squeezelabelv2.cpp \
3rdparty/squeezelabelv1.cpp
HEADERS += 3rdparty/squeezelabel.h \
HEADERS += \
3rdparty/qtwin.h \
3rdparty/lineedit.h \
app/qupzilla.h \
@ -200,7 +201,9 @@ HEADERS += 3rdparty/squeezelabel.h \
tools/closedtabsmanager.h \
other/statusbarmessage.h \
tools/buttonbox.h \
tools/widget.h
tools/widget.h \
3rdparty/squeezelabelv2.h \
3rdparty/squeezelabelv1.h
FORMS += \
preferences/autofillmanager.ui \

View File

@ -639,8 +639,8 @@ bool MainApplication::checkSettingsDir()
versionFile.write(QupZilla::VERSION.toAscii());
versionFile.close();
// if (rData.contains("0.9.9") || rData.contains("0.9.7") || rData.contains("0.9.8")) // Data not changed from this version
// return true;
if (rData.contains("1.0.0-b1")) // Data not changed from this version
return true;
dir.mkdir("profiles");
dir.cd("profiles");

View File

@ -330,7 +330,6 @@ void QupZilla::setupMenu()
toolbarsMenu->addAction(m_actionShowMenubar);
toolbarsMenu->addAction(m_actionShowToolbar);
toolbarsMenu->addAction(m_actionShowBookmarksToolbar);
toolbarsMenu->addAction(m_actionShowStatusbar);
connect(toolbarsMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowToolbarsMenu()));
QMenu* sidebarsMenu = new QMenu(tr("Sidebars"));
sidebarsMenu->addAction(m_actionShowBookmarksSideBar);
@ -340,6 +339,7 @@ void QupZilla::setupMenu()
m_menuView->addMenu(toolbarsMenu);
m_menuView->addMenu(sidebarsMenu);
m_menuView->addAction(m_actionShowStatusbar);
m_menuView->addSeparator();
m_menuView->addAction(m_actionStop);
m_menuView->addAction(m_actionReload);

View File

@ -14,7 +14,7 @@
<string>Cookies</string>
</property>
<property name="windowIcon">
<iconset resource="../icons.qrc">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
@ -137,42 +137,42 @@
</widget>
</item>
<item row="0" column="1">
<widget class="SqueezeLabel" name="name">
<widget class="SqueezeLabelV2" name="name">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="SqueezeLabel" name="value">
<widget class="SqueezeLabelV2" name="value">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="SqueezeLabel" name="server">
<widget class="SqueezeLabelV2" name="server">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="SqueezeLabel" name="path">
<widget class="QLabel" name="path">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="SqueezeLabel" name="secure">
<widget class="SqueezeLabelV2" name="secure">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="SqueezeLabel" name="expiration">
<widget class="SqueezeLabelV2" name="expiration">
<property name="text">
<string>&lt;cookie not selected&gt;</string>
</property>
@ -238,13 +238,13 @@
<header>lineedit.h</header>
</customwidget>
<customwidget>
<class>SqueezeLabel</class>
<class>SqueezeLabelV2</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
<header>squeezelabelv2.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
<include location="../data/icons.qrc"/>
</resources>
<connections/>
</ui>

View File

@ -37,7 +37,7 @@
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="SqueezeLabel" name="fileName">
<widget class="SqueezeLabelV2" name="fileName">
<property name="styleSheet">
<string notr="true">font-size: 13pt;</string>
</property>
@ -47,7 +47,7 @@
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="SqueezeLabel" name="downloadInfo">
<widget class="SqueezeLabelV2" name="downloadInfo">
<property name="text">
<string>Remaining 26 minutes - 339MB of 693 MB (350kB/s)</string>
</property>
@ -94,16 +94,16 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>SqueezeLabelV2</class>
<extends>QLabel</extends>
<header>squeezelabelv2.h</header>
</customwidget>
<customwidget>
<class>ClickableLabel</class>
<extends>QLabel</extends>
<header>clickablelabel.h</header>
</customwidget>
<customwidget>
<class>SqueezeLabel</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

View File

@ -1,9 +1,9 @@
#include "statusbarmessage.h"
#include "qupzilla.h"
#include "squeezelabel.h"
#include "squeezelabelv1.h"
class TipLabel : public SqueezeLabel {
class TipLabel : public SqueezeLabelV1 {
public:
TipLabel()
{
@ -24,7 +24,7 @@ public:
p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
p.end();
SqueezeLabel::paintEvent(ev);
SqueezeLabelV1::paintEvent(ev);
}
};

View File

@ -228,7 +228,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="stackedWidgetPage1">
<layout class="QGridLayout" name="gridLayout_6">
@ -623,7 +623,7 @@
</spacer>
</item>
<item>
<widget class="SqueezeLabel" name="textColor">
<widget class="SqueezeLabelV2" name="textColor">
<property name="text">
<string>This is text color used in Menu</string>
</property>
@ -1957,9 +1957,9 @@
</widget>
<customwidgets>
<customwidget>
<class>SqueezeLabel</class>
<class>SqueezeLabelV2</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
<header>squeezelabelv2.h</header>
</customwidget>
</customwidgets>
<resources>

View File

@ -87,6 +87,7 @@
<< "(<em|</em)" << "(<iframe|</iframe)" << "(<th|</th)"
<< "(<textarea|</textarea)" << "(<nav|</nav)" <<"(<section|</section)"
<< "(<fieldset|</fieldset)" << "(<footer|</footer)" << "(<address|</address)"
<< "(<video|</video)"
<< "(<ol|</ol)" << "(<small|</small)" << ">";
foreach (const QString &pattern, keywordPatterns) {
rule.pattern = QRegExp(pattern);
@ -115,7 +116,7 @@
<< "scrolling=\"" << "quality=\"" << "bgcolor=\""
<< "allowscriptaccess=\"" << "cols=\"" << "rows=\""
<< "profile=\"" << "colspan=\"" << "scope=\""
<< "data=\""
<< "data=\"" << "autoplay=\""
<< "href=\"" << "title=\"" << "xmlns=\"";
foreach (const QString &pattern, optionsPatterns) {
rule.pattern = QRegExp(pattern);

View File

@ -29,7 +29,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="SqueezeLabel" name="heading">
<widget class="SqueezeLabelV2" name="heading">
<property name="maximumSize">
<size>
<width>550</width>
@ -139,7 +139,7 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="1">
<widget class="SqueezeLabel" name="encodingLabel">
<widget class="SqueezeLabelV2" name="encodingLabel">
<property name="text">
<string/>
</property>
@ -153,14 +153,14 @@
</widget>
</item>
<item row="2" column="1">
<widget class="SqueezeLabel" name="sizeLabel">
<widget class="SqueezeLabelV2" name="sizeLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="SqueezeLabel" name="siteAddress">
<widget class="SqueezeLabelV2" name="siteAddress">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -319,7 +319,7 @@
</property>
</column>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_5">
@ -379,7 +379,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="SqueezeLabel" name="issuedToCN">
<widget class="SqueezeLabelV2" name="issuedToCN">
<property name="text">
<string/>
</property>
@ -393,7 +393,7 @@
</widget>
</item>
<item row="4" column="1">
<widget class="SqueezeLabel" name="issuedToO">
<widget class="SqueezeLabelV2" name="issuedToO">
<property name="text">
<string/>
</property>
@ -407,7 +407,7 @@
</widget>
</item>
<item row="5" column="1">
<widget class="SqueezeLabel" name="issuedToOU">
<widget class="SqueezeLabelV2" name="issuedToOU">
<property name="text">
<string/>
</property>
@ -421,7 +421,7 @@
</widget>
</item>
<item row="6" column="1">
<widget class="SqueezeLabel" name="issuedToSN">
<widget class="SqueezeLabelV2" name="issuedToSN">
<property name="text">
<string/>
</property>
@ -442,7 +442,7 @@
</widget>
</item>
<item row="8" column="1">
<widget class="SqueezeLabel" name="issuedByCN">
<widget class="SqueezeLabelV2" name="issuedByCN">
<property name="text">
<string/>
</property>
@ -456,7 +456,7 @@
</widget>
</item>
<item row="9" column="1">
<widget class="SqueezeLabel" name="issuedByO">
<widget class="SqueezeLabelV2" name="issuedByO">
<property name="text">
<string/>
</property>
@ -470,7 +470,7 @@
</widget>
</item>
<item row="10" column="1">
<widget class="SqueezeLabel" name="issuedByOU">
<widget class="SqueezeLabelV2" name="issuedByOU">
<property name="text">
<string/>
</property>
@ -491,7 +491,7 @@
</widget>
</item>
<item row="12" column="1">
<widget class="SqueezeLabel" name="validityIssuedOn">
<widget class="SqueezeLabelV2" name="validityIssuedOn">
<property name="text">
<string/>
</property>
@ -505,7 +505,7 @@
</widget>
</item>
<item row="13" column="1">
<widget class="SqueezeLabel" name="validityExpiresOn">
<widget class="SqueezeLabelV2" name="validityExpiresOn">
<property name="text">
<string/>
</property>
@ -535,9 +535,9 @@
</widget>
<customwidgets>
<customwidget>
<class>SqueezeLabel</class>
<class>SqueezeLabelV2</class>
<extends>QLabel</extends>
<header>squeezelabel.h</header>
<header>squeezelabelv2.h</header>
</customwidget>
</customwidgets>
<resources>

View File

@ -800,118 +800,118 @@ p, li { white-space: pre-wrap; }
<translation></translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="61"/>
<location filename="../src/downloads/downloaditem.cpp" line="63"/>
<source>Remaining time unavailable</source>
<translation>Neznámý zbývající čas</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="118"/>
<location filename="../src/downloads/downloaditem.cpp" line="128"/>
<source>Done - %1</source>
<translation>Hotovo - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="170"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<source>Cancelled</source>
<translation>Zrušeno</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="176"/>
<location filename="../src/downloads/downloaditem.cpp" line="186"/>
<source>few seconds</source>
<translation>několik sekund</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="178"/>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<source>seconds</source>
<translation>sekund</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="190"/>
<source>minutes</source>
<translation>minut</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="182"/>
<location filename="../src/downloads/downloaditem.cpp" line="192"/>
<source>hours</source>
<translation>hodin</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<location filename="../src/downloads/downloaditem.cpp" line="198"/>
<source>Unknown speed</source>
<translation>Neznámá rychlost</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="205"/>
<location filename="../src/downloads/downloaditem.cpp" line="215"/>
<source>Unknown size</source>
<translation>Neznámá velikost</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="241"/>
<location filename="../src/downloads/downloaditem.cpp" line="251"/>
<source>Remaining %1 - %2 of %3 (%4)</source>
<translation>Zbývá %1 - %2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<location filename="../src/downloads/downloaditem.cpp" line="264"/>
<source>Cancelled - %1</source>
<translation>Zrušeno - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<location filename="../src/downloads/downloaditem.cpp" line="278"/>
<source>Delete file</source>
<translation>Smazat soubor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<location filename="../src/downloads/downloaditem.cpp" line="278"/>
<source>Do you want to also delete dowloaded file?</source>
<translation>Chcete také smazat stahovaný soubor?</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="284"/>
<location filename="../src/downloads/downloaditem.cpp" line="294"/>
<source>Open File</source>
<translation>Otevřít soubor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="286"/>
<location filename="../src/downloads/downloaditem.cpp" line="296"/>
<source>Open Folder</source>
<translation>Otevřít složku</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="288"/>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<source>Go to Download Page</source>
<translation>Přejít na stránku stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="289"/>
<location filename="../src/downloads/downloaditem.cpp" line="299"/>
<source>Copy Download Link</source>
<translation>Kopírovat stahovaný odkaz</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<source>Cancel downloading</source>
<translation>Zrušit stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<location filename="../src/downloads/downloaditem.cpp" line="308"/>
<source>Clear</source>
<translation>Vyčistit</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<location filename="../src/downloads/downloaditem.cpp" line="317"/>
<source>New tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<location filename="../src/downloads/downloaditem.cpp" line="338"/>
<source>Not found</source>
<translation>Soubor neexistuje</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<location filename="../src/downloads/downloaditem.cpp" line="338"/>
<source>Sorry, the file
%1
was not found!</source>
@ -920,12 +920,12 @@ p, li { white-space: pre-wrap; }
nebyl nalezen!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="343"/>
<location filename="../src/downloads/downloaditem.cpp" line="353"/>
<source>Error: Cannot write to file!</source>
<translation>Chyba: Nelze zapisovat do souboru!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="355"/>
<location filename="../src/downloads/downloaditem.cpp" line="365"/>
<source>Error: </source>
<translation>Chyba:</translation>
</message>
@ -933,55 +933,55 @@ nebyl nalezen!</translation>
<context>
<name>DownloadManager</name>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="118"/>
<location filename="../src/downloads/downloadmanager.cpp" line="125"/>
<source>%1% of %2 files (%3) %4 remaining</source>
<translation>%1% z %2 souborů (%3) %4 zbyvá</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="121"/>
<location filename="../src/downloads/downloadmanager.cpp" line="128"/>
<source>% - Download Manager</source>
<translation>% - Správce stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="198"/>
<location filename="../src/downloads/downloadmanager.cpp" line="202"/>
<location filename="../src/downloads/downloadmanager.cpp" line="205"/>
<location filename="../src/downloads/downloadmanager.cpp" line="209"/>
<source>Save file as...</source>
<translation>Uložit soubor jako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="274"/>
<location filename="../src/downloads/downloadmanager.cpp" line="281"/>
<source>Download Finished</source>
<translation>Stahování dokončeno</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="274"/>
<location filename="../src/downloads/downloadmanager.cpp" line="281"/>
<source>All files have been successfuly downloaded.</source>
<translation>Všechna stahování byla úspěšně dokončena.</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="354"/>
<location filename="../src/downloads/downloadmanager.cpp" line="361"/>
<source>Warning</source>
<translation>Varování</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="355"/>
<location filename="../src/downloads/downloadmanager.cpp" line="362"/>
<source>Are you sure to quit? All uncompleted downloads will be cancelled!</source>
<translation>Jste si jistý že chcete skončit? Všechna nedokončená stahování budou zrušena!</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="316"/>
<location filename="../src/downloads/downloadmanager.cpp" line="323"/>
<source>NoNameDownload</source>
<translation>BezNazvu</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="14"/>
<location filename="../src/downloads/downloadmanager.cpp" line="89"/>
<location filename="../src/downloads/downloadmanager.cpp" line="279"/>
<location filename="../src/downloads/downloadmanager.ui" line="20"/>
<location filename="../src/downloads/downloadmanager.cpp" line="96"/>
<location filename="../src/downloads/downloadmanager.cpp" line="286"/>
<source>Download Manager</source>
<translation>Správce stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="80"/>
<location filename="../src/downloads/downloadmanager.ui" line="89"/>
<source>Clear</source>
<translation>Vyčistit</translation>
</message>
@ -2217,7 +2217,7 @@ nebyl nalezen!</translation>
<translation>Nástrojové lišty</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="335"/>
<location filename="../src/app/qupzilla.cpp" line="334"/>
<source>Sidebars</source>
<translation>Postranní lišta</translation>
</message>

View File

@ -803,118 +803,118 @@ p, li { white-space: pre-wrap; }
<translation></translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="61"/>
<location filename="../src/downloads/downloaditem.cpp" line="63"/>
<source>Remaining time unavailable</source>
<translation>Neznámy zostávajúci čas</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="118"/>
<location filename="../src/downloads/downloaditem.cpp" line="128"/>
<source>Done - %1</source>
<translation>Dokončené - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="170"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<source>Cancelled</source>
<translation>Zrušené</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="176"/>
<location filename="../src/downloads/downloaditem.cpp" line="186"/>
<source>few seconds</source>
<translation>pár sekúnd</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="178"/>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<source>seconds</source>
<translation>sekúnd</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="190"/>
<source>minutes</source>
<translation>minút</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="182"/>
<location filename="../src/downloads/downloaditem.cpp" line="192"/>
<source>hours</source>
<translation>hodín</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<location filename="../src/downloads/downloaditem.cpp" line="198"/>
<source>Unknown speed</source>
<translation>Neznáma rýchslosť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="205"/>
<location filename="../src/downloads/downloaditem.cpp" line="215"/>
<source>Unknown size</source>
<translation>Neznáma veľkosť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="241"/>
<location filename="../src/downloads/downloaditem.cpp" line="251"/>
<source>Remaining %1 - %2 of %3 (%4)</source>
<translation>Zostáva %1 - %2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<location filename="../src/downloads/downloaditem.cpp" line="264"/>
<source>Cancelled - %1</source>
<translation>Zrušene - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<location filename="../src/downloads/downloaditem.cpp" line="278"/>
<source>Delete file</source>
<translation>Vymazať súbor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<location filename="../src/downloads/downloaditem.cpp" line="278"/>
<source>Do you want to also delete dowloaded file?</source>
<translation>Chcete zmazať sťahovaný súbor?</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="284"/>
<location filename="../src/downloads/downloaditem.cpp" line="294"/>
<source>Open File</source>
<translation>Otvoriť súbor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="286"/>
<location filename="../src/downloads/downloaditem.cpp" line="296"/>
<source>Open Folder</source>
<translation>Otvoriť priečinok</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="288"/>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<source>Go to Download Page</source>
<translation>Prejsť k sťahovanie stránke</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="289"/>
<location filename="../src/downloads/downloaditem.cpp" line="299"/>
<source>Copy Download Link</source>
<translation>Kopírovať sťahovaný odkaz</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<source>Cancel downloading</source>
<translation>Zrušiť sťahovanie</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<location filename="../src/downloads/downloaditem.cpp" line="308"/>
<source>Clear</source>
<translation>Vyčistiť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<location filename="../src/downloads/downloaditem.cpp" line="317"/>
<source>New tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<location filename="../src/downloads/downloaditem.cpp" line="338"/>
<source>Not found</source>
<translation>Súbor neexistuje</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<location filename="../src/downloads/downloaditem.cpp" line="338"/>
<source>Sorry, the file
%1
was not found!</source>
@ -923,12 +923,12 @@ p, li { white-space: pre-wrap; }
nebol nájdený!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="343"/>
<location filename="../src/downloads/downloaditem.cpp" line="353"/>
<source>Error: Cannot write to file!</source>
<translation>Chyba: Nejde zapisovať do súboru!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="355"/>
<location filename="../src/downloads/downloaditem.cpp" line="365"/>
<source>Error: </source>
<translation>Chyba: </translation>
</message>
@ -936,55 +936,55 @@ p, li { white-space: pre-wrap; }
<context>
<name>DownloadManager</name>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="118"/>
<location filename="../src/downloads/downloadmanager.cpp" line="125"/>
<source>%1% of %2 files (%3) %4 remaining</source>
<translation>%1% z %2 súborov (%3) %4 zostávajú</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="121"/>
<location filename="../src/downloads/downloadmanager.cpp" line="128"/>
<source>% - Download Manager</source>
<translation>% - Správca sťahovania</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="198"/>
<location filename="../src/downloads/downloadmanager.cpp" line="202"/>
<location filename="../src/downloads/downloadmanager.cpp" line="205"/>
<location filename="../src/downloads/downloadmanager.cpp" line="209"/>
<source>Save file as...</source>
<translation>Uložiť súbor ako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="274"/>
<location filename="../src/downloads/downloadmanager.cpp" line="281"/>
<source>Download Finished</source>
<translation>Sťahovanie dokončené</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="274"/>
<location filename="../src/downloads/downloadmanager.cpp" line="281"/>
<source>All files have been successfuly downloaded.</source>
<translation type="unfinished"></translation>
<translation>Všetky súbory boli úspešne stiahnuté.</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="354"/>
<location filename="../src/downloads/downloadmanager.cpp" line="361"/>
<source>Warning</source>
<translation>Upozornenie</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="355"/>
<location filename="../src/downloads/downloadmanager.cpp" line="362"/>
<source>Are you sure to quit? All uncompleted downloads will be cancelled!</source>
<translation>Ste si istý, že chcete skončiť? Všetky nedokončené sťahovania budú zrušene!</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="316"/>
<location filename="../src/downloads/downloadmanager.cpp" line="323"/>
<source>NoNameDownload</source>
<translation>BezNázvu</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="14"/>
<location filename="../src/downloads/downloadmanager.cpp" line="89"/>
<location filename="../src/downloads/downloadmanager.cpp" line="279"/>
<location filename="../src/downloads/downloadmanager.ui" line="20"/>
<location filename="../src/downloads/downloadmanager.cpp" line="96"/>
<location filename="../src/downloads/downloadmanager.cpp" line="286"/>
<source>Download Manager</source>
<translation>Správca sťahovania</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="80"/>
<location filename="../src/downloads/downloadmanager.ui" line="89"/>
<source>Clear</source>
<translation>Vyčistiť</translation>
</message>
@ -1270,12 +1270,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/network/networkmanager.cpp" line="188"/>
<source>Proxy authorization required</source>
<translation type="unfinished"></translation>
<translation>Proxy autorizácia</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="208"/>
<source>A username and password are being requested by proxy %1. </source>
<translation type="unfinished"></translation>
<translation>Proxy %1 požaduje uživateľské meno a heslo. </translation>
</message>
</context>
<context>
@ -1568,7 +1568,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.ui" line="794"/>
<source>Web Configuration</source>
<translation type="unfinished"></translation>
<translation>Nastavenie Webu</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1027"/>
@ -1719,22 +1719,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.ui" line="906"/>
<source>Mouse wheel scrolls</source>
<translation type="unfinished"></translation>
<translation>Koliečko myši posunie</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="926"/>
<source>lines on page</source>
<translation type="unfinished"></translation>
<translation>riadky na stránke</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="949"/>
<source>Local Storage</source>
<translation type="unfinished"></translation>
<translation>Lokálne úložisko</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1124"/>
<source>Proxy Configuration</source>
<translation type="unfinished"></translation>
<translation>Nastavenie proxy</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1273"/>
@ -1789,18 +1789,19 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.ui" line="1427"/>
<source>&lt;b&gt;Download Location&lt;/b&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Cieľ sťahovania&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1504"/>
<source>&lt;b&gt;Download Options&lt;/b&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Možnosti sťahovania&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1511"/>
<source>Use native system file dialog
(may or may not cause problems with downloading SSL secured content)</source>
<translation type="unfinished"></translation>
<translation>Použiť natívny systémový dialóg pre výber súboru
(môže ale aj nemusí robiť problémy pri sťahovaní SSL zabezpečeného obsahu)</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1607"/>
@ -1835,92 +1836,92 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.ui" line="1719"/>
<source>&lt;b&gt;Notifications&lt;/b&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Oznámenia&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1726"/>
<source>Use OSD Notifications</source>
<translation type="unfinished"></translation>
<translation>Použiť OSD oznámenia</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1736"/>
<source>Use Native System Notifications (Linux only)</source>
<translation type="unfinished"></translation>
<translation>Používať natívne systémové oznámenie (len pre Linux)</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1743"/>
<source>Do not use Notifications</source>
<translation type="unfinished"></translation>
<translation>Nepoužívať oznámenia</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1794"/>
<source>Expiration timeout:</source>
<translation type="unfinished"></translation>
<translation>Doba:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1807"/>
<source> seconds</source>
<translation type="unfinished"></translation>
<translation>sekúnd</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1816"/>
<source>&lt;b&gt;Note: &lt;/b&gt;You can change position of OSD Notification by dragging it on the screen.</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Poznámka: &lt;/b&gt;Pretiahnutím oznámenia na obrazovke môžete zmeniť pozíciu jeho OSD.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1931"/>
<source>&lt;b&gt;User CSS StyleSheet&lt;/b&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Užívateľský CSS štýl&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1938"/>
<source>StyleSheet automatically loaded with all websites: </source>
<translation type="unfinished"></translation>
<translation>Štýl automaticky načítať na všetky stránky: </translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1220"/>
<source>System proxy configuration</source>
<translation type="unfinished"></translation>
<translation>Systémové nastavenia proxy</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1227"/>
<source>Do not use proxy</source>
<translation type="unfinished"></translation>
<translation>Nepoužívať prosy</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1213"/>
<source>Manual configuration</source>
<translation type="unfinished"></translation>
<translation>Ručné nastavenia</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1133"/>
<source>HTTP</source>
<translation type="unfinished"></translation>
<translation>HTTP</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1138"/>
<source>SOCKS5</source>
<translation type="unfinished"></translation>
<translation>SOCKS5</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1151"/>
<source>Port:</source>
<translation type="unfinished"></translation>
<translation>Port:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1170"/>
<source>Username:</source>
<translation type="unfinished"></translation>
<translation>Meno:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1180"/>
<source>Password:</source>
<translation type="unfinished"></translation>
<translation>Heslo:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1206"/>
<source>Don&apos;t use on:</source>
<translation type="unfinished"></translation>
<translation>Nepoužívať na:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1061"/>
@ -1976,12 +1977,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.cpp" line="343"/>
<source>OSD Notification</source>
<translation type="unfinished"></translation>
<translation>OSD Oznámenie</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="344"/>
<source>Drag it on the screen to place it where You want.</source>
<translation type="unfinished"></translation>
<translation>Pretiahnete ho na obrazovke na miesto, na ktorom ho chcete mať.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="393"/>
@ -1996,7 +1997,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/preferences/preferences.cpp" line="412"/>
<source>Choose stylesheet location...</source>
<translation type="unfinished"></translation>
<translation>Vyberte umiestnenie štýlu...</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="524"/>
@ -2040,32 +2041,32 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="336"/>
<source>Open new tab</source>
<translation type="unfinished"></translation>
<translation>Otvoriť nový panel</translation>
</message>
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="336"/>
<source>Opens a new tab if browser is running</source>
<translation type="unfinished"></translation>
<translation>Otvoriť nový panel ak je prehliadač spustený</translation>
</message>
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="340"/>
<source>Open new window</source>
<translation type="unfinished"></translation>
<translation>Otvoriť nové okno</translation>
</message>
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="340"/>
<source>Opens a new window if browser is running</source>
<translation type="unfinished"></translation>
<translation>Otvoriť nové okno ak je prehliadač spustený</translation>
</message>
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="344"/>
<source>Open download manager</source>
<translation type="unfinished"></translation>
<translation>Otvoriť správcu sťahovania</translation>
</message>
<message>
<location filename="../src/3rdparty/qtwin.cpp" line="344"/>
<source>Opens a download manager if browser is running</source>
<translation type="unfinished"></translation>
<translation>Otvoriť správcu sťahovania pokiaľ je prehliadač spustený</translation>
</message>
</context>
<context>
@ -2218,7 +2219,7 @@ p, li { white-space: pre-wrap; }
<translation>Nástrojové lišty</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="335"/>
<location filename="../src/app/qupzilla.cpp" line="334"/>
<source>Sidebars</source>
<translation>Bočné lišty</translation>
</message>
@ -2335,7 +2336,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/app/qupzilla.cpp" line="376"/>
<source>Restore &amp;Closed Tab</source>
<translation type="unfinished">Obnoviť zavretý pan&amp;el</translation>
<translation>Obnoviť zavretý pan&amp;el</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="606"/>
@ -2392,12 +2393,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/app/qupzilla.cpp" line="693"/>
<source>Closed Tabs</source>
<translation type="unfinished"></translation>
<translation>Zatvorené panely</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="708"/>
<source>Restore All Closed Tabs</source>
<translation type="unfinished"></translation>
<translation>Obnoviť všetky zatvorené panely</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="716"/>
@ -2877,7 +2878,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<message>
<location filename="../src/webview/siteinfo.cpp" line="28"/>
<source>&lt;not set in certificate&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;nie je súčasťou certifikátu&gt;</translation>
</message>
<message>
<location filename="../src/webview/siteinfo.cpp" line="100"/>
@ -3278,7 +3279,8 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<location filename="../src/webview/webpage.cpp" line="101"/>
<source>To show this page, QupZilla must resend request which do it again
(like searching on making an shoping, witch has been already done.)</source>
<translation type="unfinished"></translation>
<translation>Pre zobrazenie tejto stránky musí QupZilla znova odoslať požiadavku na server
(ako napr. hľadanie pri nakupovaní, ktoré bolo urobené.)</translation>
</message>
<message>
<location filename="../src/webview/webpage.cpp" line="167"/>
@ -3363,7 +3365,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<message>
<location filename="../src/webview/webpage.cpp" line="397"/>
<source>Choose file...</source>
<translation type="unfinished"></translation>
<translation>Zvoľte súbor...</translation>
</message>
</context>
<context>
@ -3511,7 +3513,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<message>
<location filename="../src/webview/jsalert.ui" line="132"/>
<source>Prevent this page from creating additional dialogs</source>
<translation type="unfinished"></translation>
<translation>Zabrániť stránke vo vytváraní ďaľších dialógov</translation>
</message>
</context>
</TS>