From 61b410ece393bb500691c9305bd8aaa3bb5c94b6 Mon Sep 17 00:00:00 2001 From: nowrep Date: Mon, 9 Jan 2012 16:23:03 +0100 Subject: [PATCH] =?UTF-8?q?Code=20edits=20+=20added=20Mladen=20Pejakovi?= =?UTF-8?q?=C4=87=20into=20contributors.=20-=20moved=20speed=20dial=20back?= =?UTF-8?q?ground=20settings=20from=20qupzillaschemehandler=20=20=20to=20s?= =?UTF-8?q?peed=20dial's=20class=20speeddial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS | 1 + bin/locale/cs_CZ.qm | Bin 86056 -> 86603 bytes src/network/qupzillaschemehandler.cpp | 28 ++------- src/network/qupzillaschemehandler.h | 7 --- src/other/aboutdialog.cpp | 4 +- src/plugins/speeddial.cpp | 22 +++++++ src/plugins/speeddial.h | 5 +- translations/cs_CZ.ts | 83 ++++++++------------------ translations/de_DE.ts | 65 ++++++-------------- translations/el_GR.ts | 65 ++++++-------------- translations/empty.ts | 61 ++++--------------- translations/es_ES.ts | 65 ++++++-------------- translations/fr_FR.ts | 65 ++++++-------------- translations/it_IT.ts | 65 ++++++-------------- translations/nl_NL.ts | 65 ++++++-------------- translations/pl_PL.ts | 65 ++++++-------------- translations/pt_PT.ts | 65 ++++++-------------- translations/ru_RU.ts | 65 ++++++-------------- translations/sk_SK.ts | 33 ++-------- translations/sr_BA.ts | 50 +++++++--------- translations/sr_RS.ts | 50 +++++++--------- translations/zh_CN.ts | 63 +++++-------------- 22 files changed, 292 insertions(+), 700 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1c568c2c5..b49a3ddb0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,6 +4,7 @@ David Rosca Contributors: +Mladen Pejaković (webview context menu improvements, speed dial background) Bryan M Dunsmore (opening background tabs, closing window when closing last tab) Daniele Cocca (close tabs with middle click, initial work on speed dial) Jan Rajnoha (QupZilla icon) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index daf8c44b484d2c1791a0f4e0f67cbb483bd0cc39..161bd075e2feb6c036dd2fb90291e998769a176e 100644 GIT binary patch delta 7287 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 VYD`d6L}*Zgq2ZL7-osec{{c;ym@EJQ delta 6956 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 + "settings.ini", QSettings::IniFormat); - settings.beginGroup("SpeedDial"); - m_backImg = settings.value("background", "").toString(); - m_backImgSize = settings.value("backsize", "").toString(); - m_backImgSize = (m_backImgSize == "" ? "auto" : m_backImgSize); - settings.endGroup(); -} - QString QupZillaSchemeReply::reportbugPage() { static QString bPage; @@ -213,9 +200,10 @@ QString QupZillaSchemeReply::aboutPage() aPage.replace("%MAIN-DEVELOPER%", tr("Main developer")); aPage.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com")); aPage.replace("%CONTRIBUTORS%", tr("Contributors")); - aPage.replace("%CONTRIBUTORS-TEXT%", authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "
" + - authorString("Daniele Cocca", "jmc@chakra-project.org") + "
" + - authorString("Jan Rajnoha", "honza.rajny@hotmail.com") + aPage.replace("%CONTRIBUTORS-TEXT%", authorString("Mladen Pejaković", "pejakm@gmail.com") + "
" + + authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "
" + + authorString("Jan Rajnoha", "honza.rajny@hotmail.com") + "
" + + authorString("Daniele Cocca", "jmc@chakra-project.org") ); aPage.replace("%TRANSLATORS%", tr("Translators")); aPage.replace("%TRANSLATORS-TEXT%", authorString("Heimen Stoffels", "vistausss@gmail.com") + " (Dutch)
" + @@ -243,10 +231,6 @@ QString QupZillaSchemeReply::speeddialPage() { static QString dPage; - if (!m_loaded) { - loadSpeedDialBack(); - } - if (dPage.isEmpty()) { dPage.append(qz_readAllFileContents(":html/speeddial.html")); dPage.replace("%FAVICON%", "qrc:icons/qupzilla.png"); @@ -269,12 +253,12 @@ QString QupZillaSchemeReply::speeddialPage() dPage.replace("%TITLE%", tr("Title")); dPage.replace("%EDIT%", tr("Apply")); dPage.replace("%NEW-PAGE%", tr("New Page")); - dPage.replace("%IMG_BACKGROUND%", m_backImg); - dPage.replace("%B_SIZE%", m_backImgSize); } QString page = dPage; page.replace("%INITIAL-SCRIPT%", mApp->plugins()->speedDial()->initialScript()); + page.replace("%IMG_BACKGROUND%", mApp->plugins()->speedDial()->backgroundImage()); + page.replace("%B_SIZE%", mApp->plugins()->speedDial()->backgroundImageSize()); return page; } diff --git a/src/network/qupzillaschemehandler.h b/src/network/qupzillaschemehandler.h index 1f6a0f016..cf3788c2d 100644 --- a/src/network/qupzillaschemehandler.h +++ b/src/network/qupzillaschemehandler.h @@ -47,8 +47,6 @@ public: virtual qint64 bytesAvailable() const; - void loadSpeedDialBack(); - protected: virtual qint64 readData(char* data, qint64 maxSize); virtual void abort() { } @@ -62,14 +60,9 @@ private: QString reportbugPage(); QString startPage(); QString speeddialPage(); - QString m_backImg; - QString m_backImgSize; QBuffer m_buffer; QString m_pageName; - - bool m_loaded; - }; #endif // QUPZILLASCHEMEHANDLER_H diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index 22db7bd88..e1a2b628e 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -75,8 +75,8 @@ void AboutDialog::showAuthors() ui->authorsButton->setText(tr("< About QupZilla")); if (m_authorsHtml.isEmpty()) { m_authorsHtml.append("
"); - m_authorsHtml.append(tr("

Main developers:
%1 <%2>

").arg(QupZilla::AUTHOR, "nowrep@gmail.com")); - m_authorsHtml.append(tr("

Contributors:
%1

").arg("Bryan M Dunsmore
Daniele Cocca
Jan Rajnoha")); + m_authorsHtml.append(tr("

Main developer:
%1 <%2>

").arg(QupZilla::AUTHOR, "nowrep@gmail.com")); + m_authorsHtml.append(tr("

Contributors:
%1

").arg("Mladen Pejaković
Bryan M Dunsmore
Jan Rajnoha
Daniele Cocca")); m_authorsHtml.append(tr("

Translators:
%1

").arg("Heimen Stoffels (Dutch)
" "Peter Vacula (Slovakia)
" "Ján Ďanovský (Slovakia)
" diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index a499b78e6..b1496e711 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -33,6 +33,8 @@ void SpeedDial::loadSettings() QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat); settings.beginGroup("SpeedDial"); m_allPages = settings.value("pages", "").toString(); + m_bgImg = settings.value("background", "").toString(); + m_bgImgSize = settings.value("backsize", "auto").toString(); settings.endGroup(); if (m_allPages.isEmpty()) { @@ -60,6 +62,8 @@ void SpeedDial::saveSettings() QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat); settings.beginGroup("SpeedDial"); settings.setValue("pages", m_allPages); + settings.setValue("background", m_bgImg); + settings.setValue("backsize", m_bgImgSize); settings.endGroup(); } @@ -92,6 +96,24 @@ void SpeedDial::addPage(const QUrl &url, const QString &title) } } +QString SpeedDial::backgroundImage() +{ + if (!m_loaded) { + loadSettings(); + } + + return m_bgImg; +} + +QString SpeedDial::backgroundImageSize() +{ + if (!m_loaded) { + loadSettings(); + } + + return m_bgImgSize; +} + QString SpeedDial::initialScript() { if (!m_loaded) { diff --git a/src/plugins/speeddial.h b/src/plugins/speeddial.h index 7ee2632a5..d98b2ad2b 100644 --- a/src/plugins/speeddial.h +++ b/src/plugins/speeddial.h @@ -37,9 +37,10 @@ public: void saveSettings(); void addWebFrame(QWebFrame* frame); - void addPage(const QUrl &url, const QString &title); + QString backgroundImage(); + QString backgroundImageSize(); QString initialScript(); signals: @@ -56,6 +57,8 @@ private: QString m_initialScript; QString m_allPages; QString m_thumbnailsDir; + QString m_bgImg; + QString m_bgImgSize; QList > m_webFrames; diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index cd507a050..c17a4483c 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Hlavní vývojář:</b><br/>%1 &lt;%2&gt;</p> + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Hlavní vývojáři:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Hlavní vývojáři:</b><br/>%1 &lt;%2&gt;</p> @@ -3222,37 +3226,37 @@ nebyl nalezen! Přispěvatelé - + Translators Překladatelé - + Speed Dial Rychlá volba - + Add New Page Přidat novou stránku - + Apply Uložit - + Load title from page Načíst titulek ze stránky - + Edit Upravit - + Remove Odstranit @@ -3264,30 +3268,30 @@ nebyl nalezen! If you are experiencing problems with QupZilla, please try to disable all plugins first. <br/>If this does not fix it, then please fill out this form: - + Pokud máte problém s používáním QupZilly, zakažte prosím všechny doplňky. <br/> Pokud problém přetrvává, vyplňte tento formulář: Please fill out all required fields! - + Vyplňte prosím všechna povinná pole! - + Reload Načíst znovu - + Url Adresa - + Title Titulek - + New Page Nová stránka @@ -4023,7 +4027,7 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ SpeedDial - + Unable to load Nepodařilo se načíst @@ -4143,41 +4147,6 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Nový panel - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager @@ -4436,22 +4405,22 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ &Copy page link - + Kopírovat &adresu stránky Send page link... - + Odeslat adresu stránky... &Print page - + Ti&sknout stránku Validate page - + Zkontrolovat stránku @@ -4512,17 +4481,17 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Send text... - + Odeslat text... Dictionary - + Slovník Go to &web address - + Přejít na web&ovou adresu diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 3f1c68141..c69280963 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Hauptentwickler:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Hauptentwickler:</b><br/>%1 &lt;%2&gt;</p> @@ -3157,57 +3161,57 @@ Mitwirkende - + Translators Übersetzer - + Speed Dial Schnellwahl - + Add New Page Neue Seite hinzufügen - + Apply Anwenden - + Load title from page Titel von der Web-Seite laden - + Edit Bearbeiten - + Remove Entfernen - + Reload Neu laden - + Url Url - + Title Titel - + New Page Neue Seite @@ -4023,7 +4027,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest SpeedDial - + Unable to load Laden nicht möglich @@ -4144,41 +4148,6 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Neuer Tab - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/el_GR.ts b/translations/el_GR.ts index b3901da06..9712bfa23 100644 --- a/translations/el_GR.ts +++ b/translations/el_GR.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Κύριοι Προγραμματιστές:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Κύριοι Προγραμματιστές:</b><br/>%1 &lt;%2&gt;</p> @@ -3221,37 +3225,37 @@ Συντελεστές - + Translators Μεταφραστές - + Speed Dial Γρήγορη κλήση - + Add New Page Προσθήκη νέας σελίδας - + Apply Εφαρμογή - + Load title from page Φόρτωση τίτλου από σελίδα - + Edit Επεξεργασία - + Remove Αφαίρεση @@ -3271,22 +3275,22 @@ - + Reload Ανανέωση - + Url Url - + Title Τίτλος - + New Page Νέα σελίδα @@ -4021,7 +4025,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load Αδυναμία φόρτωσης @@ -4141,41 +4145,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Νέα καρτέλα - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/empty.ts b/translations/empty.ts index 8fe1386c4..78cb7cb8c 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -47,7 +47,7 @@ - <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> @@ -3205,37 +3205,37 @@ - + Translators - + Speed Dial - + Add New Page - + Apply - + Load title from page - + Edit - + Remove @@ -3255,22 +3255,22 @@ - + Reload - + Url - + Title - + New Page @@ -4003,7 +4003,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load @@ -4123,41 +4123,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 31cb447a1..8639bc126 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Desarrolladores principales:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Desarrolladores principales:</b><br/>%1 &lt;%2&gt;</p> @@ -3220,37 +3224,37 @@ Contribuidores - + Translators Traductores - + Speed Dial Speed Dial - + Add New Page Añadir página nueva - + Apply Aplicar - + Load title from page Cargar título desde la página - + Edit Editar - + Remove Eliminar @@ -3270,22 +3274,22 @@ - + Reload Recargar - + Url Dirección - + Title Nombre - + New Page Página nueva @@ -4020,7 +4024,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup SpeedDial - + Unable to load No se puede cargar @@ -4140,41 +4144,6 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup Nueva pestaña - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index f1f4cc535..6e1c92d8d 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Développeurs principaux:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Développeurs principaux:</b><br/>%1 &lt;%2&gt;</p> @@ -3223,38 +3227,38 @@ n'a pas été trouvé! Contributeurs - + Translators Traducteurs - + Speed Dial Speed Dial - + Add New Page Ajouter une nouvelle page - + Apply Appliquer - + Load title from page ??? Charger le titre de la page - + Edit Modifier - + Remove Supprimer @@ -3274,22 +3278,22 @@ n'a pas été trouvé! - + Reload Actualiser - + Url URL - + Title Titre - + New Page Nouvelle Page @@ -4024,7 +4028,7 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer SpeedDial - + Unable to load Impossible d'actualiser @@ -4145,41 +4149,6 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer Nouvel onglet - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/it_IT.ts b/translations/it_IT.ts index d61658b4f..f344e744c 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Sviluppatori principali:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Sviluppatori principali:</b><br/>%1 &lt;%2&gt;</p> @@ -3223,37 +3227,37 @@ Collaboratori - + Translators Traduttori - + Speed Dial Speed dial - + Add New Page Aggiungi nuova pagina - + Apply Applica - + Load title from page Carica titolo dalla pagina - + Edit Modifica - + Remove Rimuovi @@ -3273,22 +3277,22 @@ - + Reload Ricarica - + Url Url - + Title Titolo - + New Page Nuova pagina @@ -4023,7 +4027,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari SpeedDial - + Unable to load Caricamento impossibile @@ -4143,41 +4147,6 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari Nuova scheda - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 77ecc96ed..0366d02bd 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Hoofdontwikkelaars:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Hoofdontwikkelaars:</b><br/>%1 &lt;%2&gt;</p> @@ -3222,37 +3226,37 @@ werd niet gevonden! Bijdragers - + Translators Vertalers - + Speed Dial Speed Dial - + Add New Page Voeg nieuwe pagina toe - + Apply Pas toe - + Load title from page Laad titel van pagina - + Edit Bewerk - + Remove Verwijder @@ -3272,22 +3276,22 @@ werd niet gevonden! - + Reload Herlaad - + Url URL - + Title Titel - + New Page Nieuwe pagina @@ -4023,7 +4027,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te SpeedDial - + Unable to load Niet in staat om te laden @@ -4143,41 +4147,6 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Nieuw tabblad - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 2f1066557..e942c6210 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Główny programista:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Główny programista:</b><br/>%1 &lt;%2&gt;</p> @@ -3221,37 +3225,37 @@ Współtwórcy - + Translators Tłumacze - + Speed Dial Speed Dial - + Add New Page Dodaj Nową Stronę - + Apply Potwierdź - + Load title from page Pobierz tytuł ze strony - + Edit Edytuj - + Remove Usuń @@ -3271,22 +3275,22 @@ - + Reload Odśwież - + Url Adres - + Title Tytuł - + New Page Nowa Strona @@ -4020,7 +4024,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load Nie można załadować @@ -4140,41 +4144,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Nowa karta - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index 357cddbe5..9c7320781 100755 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Programadores principais:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Programadores principais:</b><br/>%1 &lt;%2&gt;</p> @@ -3220,37 +3224,37 @@ não foi encontrado! Contributos - + Translators Tradutores - + Speed Dial Ligação rápida - + Add New Page Adicionar nova página - + Apply Aplicar - + Load title from page Carregar título da página - + Edit Editar - + Remove Remover @@ -3270,22 +3274,22 @@ não foi encontrado! - + Reload Recarregar - + Url Url - + Title Título - + New Page Nova página @@ -4020,7 +4024,7 @@ Após adicionar ou remover os caminhos dos certificados, tem que reiniciar o Qup SpeedDial - + Unable to load Incapaz de carregar @@ -4140,41 +4144,6 @@ Após adicionar ou remover os caminhos dos certificados, tem que reiniciar o Qup Novo separador - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 984e6a651..da110b252 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Главные разработчики:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Главные разработчики:</b><br/>%1 &lt;%2&gt;</p> @@ -3232,37 +3236,37 @@ Внесли вклад - + Translators Переводчики - + Speed Dial Страница быстрого доступа - + Add New Page Добавить новую страницу - + Apply Применить - + Load title from page Загрузить назвние из страницы - + Edit Изменить - + Remove Удалить @@ -3282,22 +3286,22 @@ - + Reload Обновить - + Url Url - + Title Название - + New Page Новая страница @@ -4033,7 +4037,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load Невозможно загрузить @@ -4154,41 +4158,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Новая вкладка - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 567f88e5b..12b06a4e1 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -5,7 +5,7 @@ AboutDialog <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Hlavní vývojári:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Hlavní vývojári:</b><br/>%1 &lt;%2&gt;</p> <b>WebKit version %1</b></p> @@ -47,6 +47,10 @@ <p><b>Contributors:</b><br/>%1</p> <p><b>Prispievatelia:</b><br/>%1</p> + + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + AcceptLanguage @@ -3293,33 +3297,6 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad Nepomenovaná tránka - - TestPlugin - - My first plugin action - - - - Hello - - - - First plugin action works :-) - - - - Example Plugin - - - - Example minimal plugin - - - - Very simple minimal plugin example - - - ThemeManager diff --git a/translations/sr_BA.ts b/translations/sr_BA.ts index 66a00d767..ba8dea231 100644 --- a/translations/sr_BA.ts +++ b/translations/sr_BA.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Главни програмери:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Главни програмери:</b><br/>%1 &lt;%2&gt;</p> @@ -3207,37 +3211,37 @@ Сарадници - + Translators Преводиоци - + Speed Dial Брзо бирање - + Add New Page Додај нову страницу - + Apply Примијени - + Load title from page Учитај наслов са странице - + Edit Уреди - + Remove Уклони @@ -3257,22 +3261,22 @@ Попуните сва обавезна поља! - + Reload Учитај поново - + Url Урл - + Title Име - + New Page Нова страница @@ -4006,7 +4010,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load Не могу да учитам @@ -4129,36 +4133,28 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla TestPlugin - - - My first plugin action - Моја прва радња прикључка + Моја прва радња прикључка - Hello - Здраво + Здраво - First plugin action works :-) - Прва радња прикључка ради :-) + Прва радња прикључка ради :-) - Example Plugin - Примјер прикључка + Примјер прикључка - Example minimal plugin - Примјер минималног прикључка + Примјер минималног прикључка - Very simple minimal plugin example - Веома једноставан примјер минималног прикључка + Веома једноставан примјер минималног прикључка diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index 14252613a..b6705e66a 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -47,8 +47,12 @@ + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + + + <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - <p><b>Главни програмери:</b><br/>%1 &lt;%2&gt;</p> + <p><b>Главни програмери:</b><br/>%1 &lt;%2&gt;</p> @@ -3207,37 +3211,37 @@ Сарадници - + Translators Преводиоци - + Speed Dial Брзо бирање - + Add New Page Додај нову страницу - + Apply Примени - + Load title from page Учитај наслов са странице - + Edit Уреди - + Remove Уклони @@ -3257,22 +3261,22 @@ Попуните сва обавезна поља! - + Reload Учитај поново - + Url Урл - + Title Име - + New Page Нова страница @@ -4006,7 +4010,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load Не могу да учитам @@ -4129,36 +4133,28 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla TestPlugin - - - My first plugin action - Моја прва радња прикључка + Моја прва радња прикључка - Hello - Здраво + Здраво - First plugin action works :-) - Прва радња прикључка ради :-) + Прва радња прикључка ради :-) - Example Plugin - Пример прикључка + Пример прикључка - Example minimal plugin - Пример минималног прикључка + Пример минималног прикључка - Very simple minimal plugin example - Веома једноставан пример минималног прикључка + Веома једноставан пример минималног прикључка diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 05daac130..43b6829d5 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -47,8 +47,8 @@ - <p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p> - + <p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p> + @@ -3218,37 +3218,37 @@ 贡献者 - + Translators 翻译 - + Speed Dial 快速拨号 - + Add New Page 添加新网页 - + Apply 应用 - + Load title from page 从网页载入标题 - + Edit 编辑 - + Remove 删除 @@ -3268,22 +3268,22 @@ - + Reload 刷新 - + Url 地址 - + Title 标题 - + New Page 新网页 @@ -4016,7 +4016,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load 无法加载 @@ -4136,41 +4136,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla 新标签 - - TestPlugin - - - - - My first plugin action - - - - - Hello - - - - - First plugin action works :-) - - - - - Example Plugin - - - - - Example minimal plugin - - - - - Very simple minimal plugin example - - - ThemeManager