diff --git a/src/lib/3rdparty/squeezelabelv2.cpp b/src/lib/3rdparty/squeezelabelv2.cpp
index 707a2d9fa..7bd5efa86 100644
--- a/src/lib/3rdparty/squeezelabelv2.cpp
+++ b/src/lib/3rdparty/squeezelabelv2.cpp
@@ -51,7 +51,7 @@ void SqueezeLabelV2::copy()
}
}
-void SqueezeLabelV2::contextMenuEvent(QContextMenuEvent *event)
+void SqueezeLabelV2::contextMenuEvent(QContextMenuEvent* event)
{
QMenu menu;
QAction* act = menu.addAction(tr("Copy"), this, SLOT(copy()));
@@ -61,7 +61,7 @@ void SqueezeLabelV2::contextMenuEvent(QContextMenuEvent *event)
menu.exec(event->globalPos());
}
-void SqueezeLabelV2::keyPressEvent(QKeyEvent *event)
+void SqueezeLabelV2::keyPressEvent(QKeyEvent* event)
{
if (event->key() == Qt::Key_C && event->modifiers() == Qt::ControlModifier) {
copy();
diff --git a/src/lib/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h
index 8d37c3c12..15b683a26 100644
--- a/src/lib/3rdparty/squeezelabelv2.h
+++ b/src/lib/3rdparty/squeezelabelv2.h
@@ -37,8 +37,8 @@ private slots:
void copy();
protected:
- void contextMenuEvent(QContextMenuEvent *event);
- void keyPressEvent(QKeyEvent *event);
+ void contextMenuEvent(QContextMenuEvent* event);
+ void keyPressEvent(QKeyEvent* event);
void resizeEvent(QResizeEvent* event);
private:
diff --git a/src/lib/app/commandlineoptions.cpp b/src/lib/app/commandlineoptions.cpp
index d7dea01d7..7c5dcf076 100644
--- a/src/lib/app/commandlineoptions.cpp
+++ b/src/lib/app/commandlineoptions.cpp
@@ -36,26 +36,26 @@ void CommandLineOptions::showHelp()
using namespace std;
const char* help = " Usage: qupzilla [options] URL \n"
- "\n"
- " QupZilla options:\n"
- " -h or --help print this message \n"
- " -a or --authors print QupZilla authors \n"
- " -v or --version print QupZilla version \n"
- "\n"
- " -p=PROFILE or --profile=PROFILE start with specified profile \n"
- " -ne or --no-extensions start without extensions\n"
- "\n"
- " Options to control running QupZilla:\n"
- " -nt or --new-tab open new tab\n"
- " -nw or --new-window open new window\n"
- " -pb or --private-browsing start private browsing\n"
- " -dm or --download-manager show download manager\n"
- "\n"
- " QupZilla is a new, fast and secure web browser\n"
- " based on WebKit core (http://webkit.org) and\n"
- " written in Qt Framework (http://qt.nokia.com) \n\n"
- " For more information please visit wiki at \n"
- " https://github.com/nowrep/QupZilla/wiki \n";
+ "\n"
+ " QupZilla options:\n"
+ " -h or --help print this message \n"
+ " -a or --authors print QupZilla authors \n"
+ " -v or --version print QupZilla version \n"
+ "\n"
+ " -p=PROFILE or --profile=PROFILE start with specified profile \n"
+ " -ne or --no-extensions start without extensions\n"
+ "\n"
+ " Options to control running QupZilla:\n"
+ " -nt or --new-tab open new tab\n"
+ " -nw or --new-window open new window\n"
+ " -pb or --private-browsing start private browsing\n"
+ " -dm or --download-manager show download manager\n"
+ "\n"
+ " QupZilla is a new, fast and secure web browser\n"
+ " based on WebKit core (http://webkit.org) and\n"
+ " written in Qt Framework (http://qt.nokia.com) \n\n"
+ " For more information please visit wiki at \n"
+ " https://github.com/nowrep/QupZilla/wiki \n";
cout << help << " > " << QupZilla::WWWADDRESS.toUtf8().data() << endl;
}
@@ -92,9 +92,9 @@ void CommandLineOptions::parseActions()
if (arg == "-v" || arg == "--version") {
cout << "QupZilla v" << QupZilla::VERSION.toUtf8().data()
- #ifdef GIT_REVISION
+#ifdef GIT_REVISION
<< " rev " << GIT_REVISION << " "
- #endif
+#endif
<< "(build " << QupZilla::BUILDTIME.toUtf8().data() << ")"
<< endl;
ActionPair pair;
diff --git a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
index 2ec825c06..836455ccd 100644
--- a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
+++ b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
@@ -25,6 +25,7 @@ TRANSLATIONS = \
translations/nl_NL.ts \
translations/sr_BA.ts \
translations/sr_RS.ts \
+ translations/sv_SE.ts \
translations/zh_TW.ts \
include(../../plugins.pri)
diff --git a/src/plugins/AccessKeysNavigation/akn_res.qrc b/src/plugins/AccessKeysNavigation/akn_res.qrc
index e5381513d..3db2710a6 100644
--- a/src/plugins/AccessKeysNavigation/akn_res.qrc
+++ b/src/plugins/AccessKeysNavigation/akn_res.qrc
@@ -9,6 +9,7 @@
locale/nl_NL.qm
locale/sr_BA.qm
locale/sr_RS.qm
+ locale/sv_SE.qm
locale/zh_TW.qm
diff --git a/src/plugins/AccessKeysNavigation/translations/sv_SE.ts b/src/plugins/AccessKeysNavigation/translations/sv_SE.ts
new file mode 100644
index 000000000..51498a3af
--- /dev/null
+++ b/src/plugins/AccessKeysNavigation/translations/sv_SE.ts
@@ -0,0 +1,47 @@
+
+
+
+
+ AKN_Settings
+
+
+
+ Navigation med Snabbknappar
+
+
+
+
+ <h1>Navigation med Snabbknappar</h1>
+
+
+
+
+ Ctrl
+
+
+
+
+ Alt
+
+
+
+
+ Shift
+
+
+
+
+ Dubbeltryck
+
+
+
+
+ Tangent för att visa snabbknappar:
+
+
+
+
+ Licens
+
+
+
diff --git a/src/plugins/MouseGestures/MouseGestures.pro b/src/plugins/MouseGestures/MouseGestures.pro
index ff03a253c..3b78df777 100644
--- a/src/plugins/MouseGestures/MouseGestures.pro
+++ b/src/plugins/MouseGestures/MouseGestures.pro
@@ -34,6 +34,7 @@ TRANSLATIONS = \
translations/sk_SK.ts \
translations/sr_BA.ts \
translations/sr_RS.ts \
+ translations/sv_SE.ts \
translations/zh_TW.ts \
include(../../plugins.pri)
diff --git a/src/plugins/MouseGestures/mousegestures.qrc b/src/plugins/MouseGestures/mousegestures.qrc
index 0092a9b8f..386bee993 100644
--- a/src/plugins/MouseGestures/mousegestures.qrc
+++ b/src/plugins/MouseGestures/mousegestures.qrc
@@ -20,6 +20,7 @@
locale/sk_SK.qm
locale/sr_BA.qm
locale/sr_RS.qm
+ locale/sv_SE.qm
locale/zh_TW.qm
diff --git a/src/plugins/MouseGestures/translations/sv_SE.ts b/src/plugins/MouseGestures/translations/sv_SE.ts
new file mode 100644
index 000000000..c83ba980a
--- /dev/null
+++ b/src/plugins/MouseGestures/translations/sv_SE.ts
@@ -0,0 +1,62 @@
+
+
+
+
+ MouseGesturesSettingsDialog
+
+
+
+ Musgester
+
+
+
+
+ <h1>Musgester</h1>
+
+
+
+
+ Tryck och håll ner musens mittenknapp och rör musen enligt anvisningarna.
+
+
+
+
+ <b>Stopp</b><br/>Stoppa hämtning av sida
+
+
+
+
+ <b>Ny flik</b><br/>Öppna en ny flik
+
+
+
+
+ <b>Bakåt</b><br/>Gå bakåt i historiken
+
+
+
+
+ <b>Framåt</b><br/>Gå framåt i historiken
+
+
+
+
+ <b>Hämta om</b><br/>Hämta om sida
+
+
+
+
+ <b>Stäng flik</b><br/>Stäng aktuell flik
+
+
+
+
+ <b>Hem</b><br/>Gå till startsidan
+
+
+
+
+ Licens
+
+
+
diff --git a/src/plugins/TestPlugin/TestPlugin.pro b/src/plugins/TestPlugin/TestPlugin.pro
index d8c07f7f0..0f40126c1 100644
--- a/src/plugins/TestPlugin/TestPlugin.pro
+++ b/src/plugins/TestPlugin/TestPlugin.pro
@@ -20,6 +20,7 @@ TRANSLATIONS += translations/cs_CZ.ts\
translations/sk_SK.ts\
translations/sr_BA.ts\
translations/sr_RS.ts\
+ translations/sv_SE.ts\
translations/zh_CN.ts\
translations/zh_TW.ts\
diff --git a/src/plugins/TestPlugin/testplugin.qrc b/src/plugins/TestPlugin/testplugin.qrc
index 281478abb..b5cadc902 100644
--- a/src/plugins/TestPlugin/testplugin.qrc
+++ b/src/plugins/TestPlugin/testplugin.qrc
@@ -8,6 +8,7 @@
locale/sk_SK.qm
locale/sr_BA.qm
locale/sr_RS.qm
+ locale/sv_SE.qm
locale/zh_CN.qm
locale/zh_TW.qm
diff --git a/src/plugins/TestPlugin/translations/sv_SE.ts b/src/plugins/TestPlugin/translations/sv_SE.ts
new file mode 100644
index 000000000..b30147622
--- /dev/null
+++ b/src/plugins/TestPlugin/translations/sv_SE.ts
@@ -0,0 +1,32 @@
+
+
+
+
+ TestPlugin
+
+
+
+ Stäng
+
+
+
+
+ Inställningar för exempelplugin
+
+
+
+
+ Min första pluginfunktion
+
+
+
+
+ Hallå
+
+
+
+
+ Min första pluginfunktion fungerar :-)
+
+
+
diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts
index 17cdf5ff7..bab40a9ab 100644
--- a/translations/nl_NL.ts
+++ b/translations/nl_NL.ts
@@ -1019,12 +1019,12 @@
-
+ Verwijder web-databases
-
+ Verwijder lokale opslag
@@ -1039,7 +1039,7 @@
- Verwijder iconen
+ Verwijder pictogrammen
@@ -2446,17 +2446,17 @@ werd niet gevonden!
-
+ <b>Uitzonderingen</b>
- Server:
+ Server:
-
+ Gebruik andere proxy voor https-verbinding
@@ -4236,7 +4236,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
-
+ Databases
@@ -4292,24 +4292,24 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
-
+ <b>Database-details</b>
- Naam:
+ Naam:
- Pad:
+ Pad:
-
+ <database niet geselecteerd>
@@ -4330,7 +4330,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
-
+ Er zijn geen databases in gebruik door deze pagina.
@@ -4617,7 +4617,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
- Kopieren
+ Kopieer
@@ -4910,7 +4910,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
-
+ Onbekende netwerkfout
diff --git a/translations/sv_SE.ts b/translations/sv_SE.ts
index a02a5540b..93605b611 100644
--- a/translations/sv_SE.ts
+++ b/translations/sv_SE.ts
@@ -430,7 +430,7 @@
-
+ <b>Observera:</b> För närvarande kan endast Importera från HTML-fil importera bokmärkesmappar.
@@ -1020,12 +1020,12 @@
-
+ Rensa webbdatabaser
-
+ Rensa lokal lagring
@@ -1592,7 +1592,7 @@
-
+ Bildfiler
@@ -1800,7 +1800,7 @@
- Licensvisare
+ Licensvisare
@@ -2060,7 +2060,7 @@
-
+ Kan ej ladda insticksmodul!
@@ -2392,17 +2392,17 @@
-
+ Insticksmoduler
-
+ Hämta inte flikar förrän de väljs
-
+ Tillåt Netscape-insticksmoduler (Flash)
@@ -2510,17 +2510,17 @@
-
+ <b>Undantag</b>
- Server:
+ Server:
-
+ Använd annan proxy för https-anslutningar
@@ -3104,12 +3104,12 @@
- Senaste sessionen kraschade
+ Senaste sessionen kraschade
- <b>QupZilla krashade :-(</b><br/>Hoppsan,den senaste sessionen av QupZilla avslutades oväntat. Vi är ledsna för detta. Vill du prova att återställa senast sparade läge?
+ <b>QupZilla krashade :-(</b><br/>Hoppsan,den senaste sessionen av QupZilla avslutades oväntat. Vi är ledsna för detta. Vill du prova att återställa senast sparade läge?
@@ -3240,17 +3240,18 @@
-
+ Det finns fortfarande %1 öppna flikar och din session kommer inte att sparas.
+Är du säker på att du vill avsluta QupZilla?
- Fråga inte igen
+ Fråga inte igen
- Det finns fortfarande öppna flikar
+ Det finns fortfarande öppna flikar
@@ -3384,22 +3385,22 @@ Are you sure to quit QupZilla?
-
+ HTML-filer
-
+ Bildfiler
-
+ Textfiler
-
+ Alla filer<
@@ -3577,12 +3578,12 @@ Are you sure to quit QupZilla?
-
+ Om du har problem med QupZilla, prova att inaktivera alla insticksmoduler först. <br/> Om detta inte löser problemet, fyll i i detta formulär:
-
+ Byggflaggor
@@ -3597,7 +3598,7 @@ Are you sure to quit QupZilla?
-
+ Insticksmoduler
@@ -3686,7 +3687,7 @@ Are you sure to quit QupZilla?
- Stäng
+ Stäng
@@ -3746,12 +3747,12 @@ Are you sure to quit QupZilla?
-
+ Denna sida innehåller information om QupZillas aktuella konfiguration - relevant för felsökning. Vänligen inkludera denna information i buggrapporter.
-
+ Inga tillgängliga insticksmoduler
@@ -3764,7 +3765,7 @@ Are you sure to quit QupZilla?
-
+ Inaktiverad
@@ -3773,7 +3774,7 @@ Are you sure to quit QupZilla?
-
+ <b>Aktiverad</b>
@@ -3783,17 +3784,17 @@ Are you sure to quit QupZilla?
-
+ WebGL-stöd
-
+ Windows 7 API
-
+ KDE-integration
@@ -4235,7 +4236,7 @@ Efter att ha lagt till eller tagit bort certifikats sökvägar måste QupZilla s
-
+ Databaser
@@ -4301,24 +4302,24 @@ Efter att ha lagt till eller tagit bort certifikats sökvägar måste QupZilla s
-
+ <b>Databasdetaljer</b>
- Namn:
+ Namn:
- Sökväg:
+ Sökväg:
-
+ <databas inte vald>
@@ -4328,7 +4329,7 @@ Efter att ha lagt till eller tagit bort certifikats sökvägar måste QupZilla s
-
+ Inga databaser används av denna sida.
@@ -4597,7 +4598,7 @@ Efter att ha lagt till eller tagit bort certifikats sökvägar måste QupZilla s
-
+ Bildfiler
@@ -4615,7 +4616,7 @@ Efter att ha lagt till eller tagit bort certifikats sökvägar måste QupZilla s
- Kopiera
+ Kopiera
@@ -4909,7 +4910,7 @@ beställningsbekräftelse)
-
+ Okänt nätverksfel
@@ -4964,7 +4965,7 @@ beställningsbekräftelse)
-
+ JavaScript-varning
@@ -5109,7 +5110,7 @@ beställningsbekräftelse)
-
+ Skapa sökmotor
diff --git a/windows/languages.nsh b/windows/languages.nsh
index bb3353f88..0dfb2d928 100644
--- a/windows/languages.nsh
+++ b/windows/languages.nsh
@@ -278,6 +278,23 @@ LangString DESC_SecDesktop ${LANG_JAPANESE} "デスクトップにアイコン
LangString DESC_SecExtensions ${LANG_JAPANESE} "QupZillaにhtm、htmlファイルを関連付けます。"
LangString DESC_SecThemes ${LANG_JAPANESE} "QupZillaのデフォルトテーマ以外のテーマをダウンロードします。"
+;;;;SWEDISH
+LangString TITLE_SecMain ${LANG_SWEDISH} "Huvudkomponenter"
+LangString DESC_SecMain ${LANG_SWEDISH} "Programmets viktigaste komponenter."
+LangString TITLE_SecTranslations ${LANG_SWEDISH} "Översättningar"
+LangString DESC_SecTranslations ${LANG_SWEDISH} "Andra översättningar tillgängliga för installation. Förval är Engelska."
+LangString TITLE_SecPlugins ${LANG_SWEDISH} "Insticksmoduler"
+LangString DESC_SecPlugins ${LANG_SWEDISH} "Andra insticksmoduler tillgängliga för installation."
+LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Exempel-plugin"
+LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Funktionslöst exempel på en insticksmodul."
+LangString TITLE_SecDesktop ${LANG_SWEDISH} "Skrivbordsikon"
+LangString DESC_SecDesktop ${LANG_SWEDISH} "Lägg till en ikon på skrivbordet."
+LangString TITLE_SecExtensions ${LANG_SWEDISH} "Filbindningar"
+LangString DESC_SecExtensions ${LANG_SWEDISH} "Associera QupZilla med .htm- och .html-filer"
+LangString FILE_Htm ${LANG_SWEDISH} "HTM-fil"
+LangString FILE_Html ${LANG_SWEDISH} "HTML-fil"
+LangString TITLE_SecThemes ${LANG_SWEDISH} "Teman"
+LangString DESC_SecThemes ${LANG_SWEDISH} "Ytterligare teman för QupZilla"
;;;;;;;;;
;;;;;;;;;
@@ -287,71 +304,55 @@ LangString DESC_SecThemes ${LANG_JAPANESE} "QupZillaのデフォルトテーマ
LangString TITLE_SecMain ${LANG_KOREAN} "Main Components"
LangString TITLE_SecMain ${LANG_RUSSIAN} "Main Components"
LangString TITLE_SecMain ${LANG_SPANISH} "Main Components"
-LangString TITLE_SecMain ${LANG_SWEDISH} "Main Components"
LangString DESC_SecMain ${LANG_KOREAN} "Main components of application."
LangString DESC_SecMain ${LANG_RUSSIAN} "Main components of application."
LangString DESC_SecMain ${LANG_SPANISH} "Main components of application."
-LangString DESC_SecMain ${LANG_SWEDISH} "Main components of application."
LangString TITLE_SecTranslations ${LANG_KOREAN} "Translations"
LangString TITLE_SecTranslations ${LANG_RUSSIAN} "Translations"
LangString TITLE_SecTranslations ${LANG_SPANISH} "Translations"
-LangString TITLE_SecTranslations ${LANG_SWEDISH} "Translations"
LangString DESC_SecTranslations ${LANG_KOREAN} "Other translations available to install. Default is English."
LangString DESC_SecTranslations ${LANG_RUSSIAN} "Other translations available to install. Default is English."
LangString DESC_SecTranslations ${LANG_SPANISH} "Other translations available to install. Default is English."
-LangString DESC_SecTranslations ${LANG_SWEDISH} "Other translations available to install. Default is English."
LangString TITLE_SecPlugins ${LANG_KOREAN} "Plugins"
LangString TITLE_SecPlugins ${LANG_RUSSIAN} "Plugins"
LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins"
-LangString TITLE_SecPlugins ${LANG_SWEDISH} "Plugins"
LangString DESC_SecPlugins ${LANG_KOREAN} "Other plugins available to install."
LangString DESC_SecPlugins ${LANG_RUSSIAN} "Other plugins available to install."
LangString DESC_SecPlugins ${LANG_SPANISH} "Other plugins available to install."
-LangString DESC_SecPlugins ${LANG_SWEDISH} "Other plugins available to install."
LangString TITLE_SecExamplePlugin ${LANG_KOREAN} "Example Plugin"
LangString TITLE_SecExamplePlugin ${LANG_RUSSIAN} "Example Plugin"
LangString TITLE_SecExamplePlugin ${LANG_SPANISH} "Example Plugin"
-LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Example Plugin"
LangString DESC_SecExamplePlugin ${LANG_KOREAN} "Useless example plugin."
LangString DESC_SecExamplePlugin ${LANG_RUSSIAN} "Useless example plugin."
LangString DESC_SecExamplePlugin ${LANG_SPANISH} "Useless example plugin."
-LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Useless example plugin."
LangString TITLE_SecDesktop ${LANG_KOREAN} "Desktop Icon"
LangString TITLE_SecDesktop ${LANG_RUSSIAN} "Desktop Icon"
LangString TITLE_SecDesktop ${LANG_SPANISH} "Desktop Icon"
-LangString TITLE_SecDesktop ${LANG_SWEDISH} "Desktop Icon"
LangString DESC_SecDesktop ${LANG_KOREAN} "Add launcher to desktop."
LangString DESC_SecDesktop ${LANG_RUSSIAN} "Add launcher to desktop."
LangString DESC_SecDesktop ${LANG_SPANISH} "Add launcher to desktop."
-LangString DESC_SecDesktop ${LANG_SWEDISH} "Add launcher to desktop."
LangString TITLE_SecExtensions ${LANG_KOREAN} "File Associations"
LangString TITLE_SecExtensions ${LANG_RUSSIAN} "File Associations"
LangString TITLE_SecExtensions ${LANG_SPANISH} "File Associations"
-LangString TITLE_SecExtensions ${LANG_SWEDISH} "File Associations"
LangString DESC_SecExtensions ${LANG_KOREAN} "Associate QupZilla with .htm and .html files"
LangString DESC_SecExtensions ${LANG_RUSSIAN} "Associate QupZilla with .htm and .html files"
LangString DESC_SecExtensions ${LANG_SPANISH} "Associate QupZilla with .htm and .html files"
-LangString DESC_SecExtensions ${LANG_SWEDISH} "Associate QupZilla with .htm and .html files"
LangString FILE_Htm ${LANG_KOREAN} "HTM File"
LangString FILE_Htm ${LANG_RUSSIAN} "HTM File"
LangString FILE_Htm ${LANG_SPANISH} "HTM File"
-LangString FILE_Htm ${LANG_SWEDISH} "HTM File"
LangString FILE_Html ${LANG_KOREAN} "HTML File"
LangString FILE_Html ${LANG_RUSSIAN} "HTML File"
LangString FILE_Html ${LANG_SPANISH} "HTML File"
-LangString FILE_Html ${LANG_SWEDISH} "HTML File"
LangString TITLE_SecThemes ${LANG_KOREAN} "Themes"
LangString TITLE_SecThemes ${LANG_RUSSIAN} "Themes"
LangString TITLE_SecThemes ${LANG_SPANISH} "Themes"
-LangString TITLE_SecThemes ${LANG_SWEDISH} "Themes"
LangString DESC_SecThemes ${LANG_KOREAN} "Additional themes for QupZilla"
LangString DESC_SecThemes ${LANG_RUSSIAN} "Additional themes for QupZilla"
LangString DESC_SecThemes ${LANG_SPANISH} "Additional themes for QupZilla"
-LangString DESC_SecThemes ${LANG_SWEDISH} "Additional themes for QupZilla"
\ No newline at end of file