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

Cleaned #ifdefs, Preferences in menu on all platforms. Closes #96

This commit is contained in:
nowrep 2011-12-28 13:16:04 +01:00
parent d9f2459ef8
commit 9564b0a5a9
17 changed files with 172 additions and 176 deletions

View File

@ -44,6 +44,14 @@
#include "speeddial.h"
#include "webpage.h"
#ifdef Q_WS_WIN
#define DEFAULT_CHECK_UPDATES true
#define DEFAULT_THEME_NAME "windows"
#else
#define DEFAULT_CHECK_UPDATES false
#define DEFAULT_THEME_NAME "linux"
#endif
MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cmdActions, int &argc, char** argv)
: QtSingleApplication("QupZillaWebBrowser", argc, argv)
, m_cookiemanager(0)
@ -179,13 +187,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
AutoSaver* saver = new AutoSaver();
connect(saver, SIGNAL(saveApp()), this, SLOT(saveStateSlot()));
if (settings2.value("Web-Browser-Settings/CheckUpdates",
#ifdef Q_WS_WIN
true
#else
false
#endif
).toBool()) {
if (settings2.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool()) {
m_updater = new Updater(qupzilla);
}
@ -206,13 +208,7 @@ void MainApplication::loadSettings()
{
QSettings settings(m_activeProfil + "settings.ini", QSettings::IniFormat);
settings.beginGroup("Themes");
QString activeTheme = settings.value("activeTheme",
#ifdef Q_WS_X11
"linux"
#else
"windows"
#endif
).toString();
QString activeTheme = settings.value("activeTheme", DEFAULT_THEME_NAME).toString();
settings.endGroup();
m_activeThemePath = THEMESDIR + activeTheme + "/";
QFile cssFile(m_activeThemePath + "main.css");

View File

@ -309,7 +309,7 @@ void QupZilla::setupMenu()
m_menuEdit->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAll()))->setShortcut(QKeySequence("Ctrl+A"));
m_menuEdit->addAction(QIcon::fromTheme("edit-find"), tr("&Find"), this, SLOT(searchOnPage()))->setShortcut(QKeySequence("Ctrl+F"));
m_menuEdit->addSeparator();
#ifdef Q_WS_X11
#ifndef Q_WS_WIN
m_menuEdit->addAction(QIcon(":/icons/faenza/settings.png"), tr("Pr&eferences"), this, SLOT(showPreferences()))->setShortcut(QKeySequence("Ctrl+P"));
#endif
menuBar()->addMenu(m_menuEdit);
@ -844,7 +844,7 @@ void QupZilla::aboutToHideEditMenu()
}
m_menuEdit->actions().at(9)->setEnabled(true);
#ifdef Q_WS_X11
#ifndef Q_WS_WIN
m_menuEdit->actions().at(11)->setEnabled(true);
#endif
}

View File

@ -28,6 +28,13 @@
#include "webpage.h"
#include "downloadfilehelper.h"
#ifdef Q_WS_WIN
#define DEFAULT_USE_NATIVE_DIALOG false
#else
#define DEFAULT_USE_NATIVE_DIALOG true
#endif
DownloadManager::DownloadManager(QWidget* parent)
: QWidget(parent)
, ui(new Ui::DownloadManager)
@ -63,13 +70,7 @@ void DownloadManager::loadSettings()
m_downloadPath = settings.value("defaultDownloadPath", "").toString();
m_lastDownloadPath = settings.value("lastDownloadPath", QDir::homePath() + "/").toString();
m_closeOnFinish = settings.value("CloseManagerOnFinish", false).toBool();
m_useNativeDialog = settings.value("useNativeDialog",
#ifdef Q_WS_WIN
false
#else
true
#endif
).toBool();
m_useNativeDialog = settings.value("useNativeDialog", DEFAULT_USE_NATIVE_DIALOG).toBool();
settings.endGroup();
}

View File

@ -40,6 +40,14 @@
#include "globalfunctions.h"
#include "autofillmodel.h"
#ifdef Q_WS_WIN
#define DEFAULT_CHECK_UPDATES true
#define DEFAULT_USE_NATIVE_DIALOG false
#else
#define DEFAULT_CHECK_UPDATES false
#define DEFAULT_USE_NATIVE_DIALOG true
#endif
bool removeFile(const QString &fullFileName)
{
QFile f(fullFileName);
@ -116,13 +124,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
int afterLaunch = settings.value("afterLaunch", 1).toInt();
settings.endGroup();
ui->afterLaunch->setCurrentIndex(afterLaunch);
ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates",
#ifdef Q_WS_WIN
true
#else
false
#endif
).toBool());
ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool());
ui->newTabFrame->setVisible(false);
if (m_newTabUrl.isEmpty()) {
@ -268,13 +270,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
settings.beginGroup("DownloadManager");
ui->downLoc->setText(settings.value("defaultDownloadPath", "").toString());
ui->closeDownManOnFinish->setChecked(settings.value("CloseManagerOnFinish", false).toBool());
ui->downlaodNativeSystemDialog->setChecked(settings.value("useNativeDialog",
#ifdef Q_WS_WIN
false
#else
true
#endif
).toBool());
ui->downlaodNativeSystemDialog->setChecked(settings.value("useNativeDialog", DEFAULT_USE_NATIVE_DIALOG).toBool());
if (ui->downLoc->text().isEmpty()) {
ui->askEverytime->setChecked(true);
}

View File

@ -20,6 +20,12 @@
#include "mainapplication.h"
#include "globalfunctions.h"
#ifdef Q_WS_WIN
#define DEFAULT_THEME_NAME "windows"
#else
#define DEFAULT_THEME_NAME "linux"
#endif
ThemeManager::ThemeManager(QWidget* parent)
: QWidget()
, ui(new Ui::ThemeManager)
@ -28,13 +34,7 @@ ThemeManager::ThemeManager(QWidget* parent)
ui->license->hide();
QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat);
settings.beginGroup("Themes");
m_activeTheme = settings.value("activeTheme",
#ifdef Q_WS_X11
"linux"
#else
"windows"
#endif
).toString();
m_activeTheme = settings.value("activeTheme", DEFAULT_THEME_NAME).toString();
settings.endGroup();
QDir themeDir(mApp->THEMESDIR);

View File

@ -24,8 +24,11 @@
#define MAXIMUM_TAB_WIDTH 250
#define MINIMUM_TAB_WIDTH 50
#ifdef Q_WS_WIN
#define PINNED_TAB_WIDTH 38
#elif defined(KDE)
#define PINNED_TAB_WIDTH 24
#else
#define PINNED_TAB_WIDTH 31
#endif

View File

@ -1713,12 +1713,12 @@ nebyl nalezen!</translation>
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Poslední relace spadla</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla spadla :-(&lt;/b&gt;&lt;br/&gt;Oops, poslední relace QupZilly skončila jejím pádem. Velice se omlouváme. Přejete si obnovit uložený stav?</translation>
</message>
@ -3319,32 +3319,32 @@ nebyl nalezen!</translation>
<translation>Překladatelé</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Rychlá volba</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Přidat novou stránku</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation>Uložit</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation>Načíst titulek ze stránky</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Upravit</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Odstranit</translation>
</message>
@ -3354,22 +3354,22 @@ nebyl nalezen!</translation>
<translation>E-mail je nepovinný&lt;br/&gt;&lt;b&gt;Poznámka: &lt;/b&gt;Používejte prosím pouze anglický jazyk.</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Načíst znovu</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>Adresa</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Titulek</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Nová stránka</translation>
</message>

View File

@ -1705,12 +1705,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Die letzte Sitzung wurde unerwartet beendet</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla ist abgestürzt :-(&lt;/b&gt;&lt;br/&gt;Hoppla,die letzte Sitzung wurde unerwartet beendet. Verzeihung. Möchten Sie den letzten Status wiederherstellen?</translation>
</message>
@ -3245,52 +3245,52 @@
<translation>Übersetzer</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Schnellwahl</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Neue Seite hinzufügen</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Bearbeiten</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>Url</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Titel</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Neue Seite</translation>
</message>

View File

@ -1649,12 +1649,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Η τελευταία συνεδρία κατέρρευσε</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>Το &lt;b&gt;QupZilla κατέρρευσε :-(&lt;/b&gt;&lt;br/&gt;Ούπς, η τελευταία συνεδρία του QupZilla διακόπηκε απροσδόκητα. Ζητάμε συγνώμη για αυτό. Θα θέλατε να δοκιμάσετε την επαναφορά στην ποιο πρόσφατα αποθηκευμένη κατάσταση;</translation>
</message>
@ -3229,32 +3229,32 @@
<translation>Μεταφραστές</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Γρήγορη κλήση</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Προσθήκη νέας σελίδας</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation>Εφαρμογή</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation>Φόρτωση τίτλου από σελίδα</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Επεξεργασία</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Αφαίρεση</translation>
</message>
@ -3264,22 +3264,22 @@
<translation>Το e-mail είναι προαιρετικό&lt;br/&gt;&lt;b&gt;Σημείωση: &lt;/b&gt;Παρακαλώ χρησιμοποιείστε μόνο Αγγλική γλώσσα.</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Ανανέωση</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>Url</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Τίτλος</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Νέα σελίδα</translation>
</message>

View File

@ -1646,12 +1646,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation type="unfinished"></translation>
</message>
@ -3221,32 +3221,32 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
@ -3256,22 +3256,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1704,12 +1704,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>La última sesión se cerró inesperadamente</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla se cerró inesperadamente :-(&lt;/b&gt;&lt;br/&gt;Lo sentimos, la última sesión de QupZilla terminó inesperadamente. ¿Le gustaría intentar restaurar la última sesión?</translation>
</message>
@ -3308,32 +3308,32 @@
<translation>Traductores</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Speed Dial</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Añadir página nueva</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation>Cargar título desde la página</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
@ -3343,22 +3343,22 @@
<translation>El correo electrónico es opcional&lt;br/&gt;&lt;b&gt;Nota: &lt;/b&gt;Por favor, usen únicamente el inglés.</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Recargar</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>Dirección</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Nombre</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Página nueva</translation>
</message>

View File

@ -1699,12 +1699,12 @@ n&apos;a pas été trouvé!</translation>
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>La dernière session a planté</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla a planté :-(&lt;/b&gt;&lt;br/&gt;Oops, la dernière session de QupZilla s&apos;est terminée par un incident. Nous sommes vraiment désolé. Voulez-vous essayer de restaurer la dernière session?</translation>
</message>
@ -3291,33 +3291,33 @@ n&apos;a pas été trouvé!</translation>
<translation>Traducteurs</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Speed Dial</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Ajouter une nouvelle page</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translatorcomment>???</translatorcomment>
<translation>Charger le titre de la page</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Modifier</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
@ -3327,22 +3327,22 @@ n&apos;a pas été trouvé!</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Actualiser</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>URL</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Titre</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Nouvelle Page</translation>
</message>

View File

@ -1696,12 +1696,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Ultima sessione chiusa</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation type="unfinished"></translation>
</message>
@ -3303,32 +3303,32 @@
<translation>Traduttori</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation type="unfinished">Modifica</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
@ -3338,22 +3338,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation type="unfinished">Ricarica</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation type="unfinished">Titolo</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1705,12 +1705,12 @@ werd niet gevonden!</translation>
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Laatste sessie gecrashed</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla crashte :-(&lt;/b&gt;&lt;br/&gt;Oeps, de laatste sessie van QupZilla eindigde met een crash. We verontschuldigen ons. Wilt u proberen om de opgeslagen status te herstellen?</translation>
</message>
@ -3311,32 +3311,32 @@ werd niet gevonden!</translation>
<translation>Vertalers</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Speed Dial</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Voeg nieuwe pagina toe</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Bewerk</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Verwijder</translation>
</message>
@ -3346,22 +3346,22 @@ werd niet gevonden!</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Herlaad</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>URL</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Titel</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Nieuwe pagina</translation>
</message>

View File

@ -1774,12 +1774,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Wystąpił błąd w ostatniej sesji</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation type="unfinished"></translation>
</message>
@ -3451,32 +3451,32 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation type="unfinished">Edytuj</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation type="unfinished">Usuń</translation>
</message>
@ -3486,22 +3486,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation type="unfinished">Odświerz</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation type="unfinished">Adres</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1653,12 +1653,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation>Последняя сессия завершилась неудачно</translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>&lt;b&gt;QupZilla упал :-(&lt;/b&gt;&lt;br/&gt;К сожалению, последняя сессия QupZilla была завершена неудачно. Вы хотите попробовать восстановить её?</translation>
</message>
@ -3236,32 +3236,32 @@
<translation>Переводчики</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation>Страница быстрого доступа</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation>Добавить новую страницу</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation>Загрузить назвние из страницы</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation>Изменить</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation>Удалить</translation>
</message>
@ -3271,22 +3271,22 @@
<translation>E-mail необязателен&lt;br/&gt;&lt;b&gt;Примечание:&lt;/b&gt; Пожалуйста, используйте только английский язык.</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation>Обновить</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation>Url</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation>Название</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation>Новая страница</translation>
</message>

View File

@ -1702,12 +1702,12 @@
<context>
<name>MainApplication</name>
<message>
<location filename="../src/app/mainapplication.cpp" line="682"/>
<location filename="../src/app/mainapplication.cpp" line="688"/>
<source>Last session crashed</source>
<translation></translation>
</message>
<message>
<location filename="../src/app/mainapplication.cpp" line="683"/>
<location filename="../src/app/mainapplication.cpp" line="689"/>
<source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
<translation>QupZilla上次结束时崩溃</translation>
</message>
@ -3306,32 +3306,32 @@
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="239"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<source>Speed Dial</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="240"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<source>Add New Page</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="241"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="245"/>
<source>Load title from page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<source>Edit</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="242"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<source>Remove</source>
<translation></translation>
</message>
@ -3341,22 +3341,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="243"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="244"/>
<source>Reload</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="248"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<source>Url</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="249"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="250"/>
<source>Title</source>
<translation></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="251"/>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>New Page</source>
<translation></translation>
</message>