diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp index 58d69eb47..251e5e82d 100644 --- a/src/lib/plugins/plugins.cpp +++ b/src/lib/plugins/plugins.cpp @@ -21,6 +21,7 @@ #include "speeddial.h" #include "settings.h" +#include #include #include diff --git a/src/lib/preferences/preferences.ui b/src/lib/preferences/preferences.ui index 365d0b9db..aaa5021ad 100644 --- a/src/lib/preferences/preferences.ui +++ b/src/lib/preferences/preferences.ui @@ -1017,30 +1017,23 @@ - + - - - Allow storing web icons - - - - Allow saving history - + Delete history on close - + Qt::Horizontal @@ -1056,21 +1049,21 @@ - + Allow local storage of HTML5 web content - + Delete locally stored HTML5 web content on close - + Qt::Horizontal @@ -1083,7 +1076,7 @@ - + @@ -1098,7 +1091,7 @@ - + Qt::Vertical @@ -1111,6 +1104,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + @@ -2235,7 +2244,6 @@ showBackForward allowCache cacheMB - storeIcons saveHistory proxyType deleteHistoryOnClose diff --git a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro index 836455ccd..50610cf00 100644 --- a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro +++ b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro @@ -20,9 +20,11 @@ RESOURCES = akn_res.qrc TRANSLATIONS = \ translations/cs_CZ.ts \ translations/de_DE.ts \ + translations/el_GR.ts \ translations/id_ID.ts \ translations/ja_JP.ts \ translations/nl_NL.ts \ + translations/ro_RO.ts \ translations/sr_BA.ts \ translations/sr_RS.ts \ translations/sv_SE.ts \ diff --git a/src/plugins/AccessKeysNavigation/akn_res.qrc b/src/plugins/AccessKeysNavigation/akn_res.qrc index 3db2710a6..b8180f271 100644 --- a/src/plugins/AccessKeysNavigation/akn_res.qrc +++ b/src/plugins/AccessKeysNavigation/akn_res.qrc @@ -4,9 +4,11 @@ data/copyright locale/cs_CZ.qm locale/de_DE.qm + locale/el_GR.qm locale/id_ID.qm locale/ja_JP.qm locale/nl_NL.qm + locale/ro_RO.qm locale/sr_BA.qm locale/sr_RS.qm locale/sv_SE.qm diff --git a/src/plugins/MouseGestures/MouseGestures.pro b/src/plugins/MouseGestures/MouseGestures.pro index 3b78df777..0a1b36da7 100644 --- a/src/plugins/MouseGestures/MouseGestures.pro +++ b/src/plugins/MouseGestures/MouseGestures.pro @@ -28,9 +28,11 @@ RESOURCES = mousegestures.qrc TRANSLATIONS = \ translations/cs_CZ.ts \ translations/de_DE.ts \ + translations/el_GR.ts \ translations/id_ID.ts \ translations/ja_JP.ts \ translations/nl_NL.ts \ + translations/ro_RO.ts \ translations/sk_SK.ts \ translations/sr_BA.ts \ translations/sr_RS.ts \ diff --git a/src/plugins/MouseGestures/mousegestures.qrc b/src/plugins/MouseGestures/mousegestures.qrc index 386bee993..e5c0591e7 100644 --- a/src/plugins/MouseGestures/mousegestures.qrc +++ b/src/plugins/MouseGestures/mousegestures.qrc @@ -14,9 +14,11 @@ data/copyright locale/cs_CZ.qm locale/de_DE.qm + locale/el_GR.qm locale/id_ID.qm locale/ja_JP.qm locale/nl_NL.qm + locale/ro_RO.qm locale/sk_SK.qm locale/sr_BA.qm locale/sr_RS.qm diff --git a/src/plugins/TestPlugin/TestPlugin.pro b/src/plugins/TestPlugin/TestPlugin.pro index 0f40126c1..b48b77f34 100644 --- a/src/plugins/TestPlugin/TestPlugin.pro +++ b/src/plugins/TestPlugin/TestPlugin.pro @@ -16,7 +16,9 @@ TRANSLATIONS += translations/cs_CZ.ts\ translations/de_DE.ts\ translations/el_GR.ts\ translations/id_ID.ts\ + translations/ja_JP.ts\ translations/nl_NL.ts\ + translations/ro_RO.ts\ translations/sk_SK.ts\ translations/sr_BA.ts\ translations/sr_RS.ts\ diff --git a/src/plugins/TestPlugin/testplugin.qrc b/src/plugins/TestPlugin/testplugin.qrc index b5cadc902..cd6c58a55 100644 --- a/src/plugins/TestPlugin/testplugin.qrc +++ b/src/plugins/TestPlugin/testplugin.qrc @@ -4,7 +4,9 @@ locale/de_DE.qm locale/el_GR.qm locale/id_ID.qm + locale/ja_JP.qm locale/nl_NL.qm + locale/ro_RO.qm locale/sk_SK.qm locale/sr_BA.qm locale/sr_RS.qm