diff --git a/configure.in b/configure.in index 304649f..ef32643 100644 --- a/configure.in +++ b/configure.in @@ -45,6 +45,10 @@ AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc.waeckerlin@tech.swiss AC_CONFIG_FILES([makefile ${PACKAGENAME}.spec src/version.cxx src/makefile src/qmake.pro src/languages.qrc + src/qbrowserlib/makefile + src/qbrowserlib/qmake.pro src/qbrowserlib/languages.qrc + src/designer/makefile + src/designer/qmake.pro src/designer/resources.qrc doc/doxyfile doc/makefile debian/changelog]) @@ -107,6 +111,37 @@ AC_ARG_ENABLE(dot, test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO"; AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"]) +# Qt Designer Plugin Dir +AC_MSG_CHECKING([QT_INSTALL_PLUGINS]) +AC_ARG_WITH([qt-install-plugins], + [AS_HELP_STRING([--with-qt-install-plugins=DIR], + [Qt designer plugin directory])], + QT_INSTALL_PLUGINS=$withval) +# Check that QTDIR is defined or that --with-qtdir given +if test x"$QT_INSTALL_PLUGINS" = x ; then + # some usual Qt-locations + QT_SEARCH="/usr/share/qt4 /usr/lib/qt /usr/X11R6 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.2.0 /usr/local/Trolltech/Qt-4.2.1 /usr/local/Trolltech/Qt-4.2.2" + for p in ${QT_SEARCH}; do + if test -d ${p}/plugins/designer; then + QT_INSTALL_PLUGINS=${d}/plugins/designer + break + fi + done + if test x"$QT_INSTALL_PLUGINS" = x ; then + for p in ${QT_SEARCH}; do + if test -d ${p}/plugins; then + QT_INSTALL_PLUGINS=${d}/plugins/designer + break + fi + done + fi +fi +if test x"$QT_INSTALL_PLUGINS" = x ; then + AC_MSG_ERROR([*** --with-qt-install-plugins or QT_INSTALL_PLUGINS must be given]) +fi +AC_MSG_RESULT([$QT_INSTALL_PLUGINS]) +AC_SUBST(QT_INSTALL_PLUGINS) + MINGW32=no MAC=no case $host_os in diff --git a/debian/rules b/debian/rules index 0e2df50..80675d7 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" + ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-install-plugins=\$${prefix}/share/qt4/plugins/designer CFLAGS="$(CFLAGS)" build: build-stamp @@ -84,7 +84,7 @@ binary-arch: install dh_compress dh_fixperms # dh_perl -# dh_makeshlibs + dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/debian/swissbrowser-dev.dirs b/debian/swissbrowser-dev.dirs index aac9d43..995e528 100644 --- a/debian/swissbrowser-dev.dirs +++ b/debian/swissbrowser-dev.dirs @@ -1,3 +1,3 @@ -#usr/lib -#usr/include +usr/lib +usr/include usr/share diff --git a/debian/swissbrowser-dev.install b/debian/swissbrowser-dev.install index 21fef99..610280c 100644 --- a/debian/swissbrowser-dev.install +++ b/debian/swissbrowser-dev.install @@ -1,7 +1,8 @@ -usr/share/doc/swissbrowser/html +#usr/share/doc/swissbrowser/html #usr/include/* #usr/lib/lib*.a -#usr/lib/lib*.so +usr/lib/lib*.so +usr/share/qt4 #usr/lib/*.la #usr/lib/pkgconfig #usr/share/pkgconfig diff --git a/debian/swissbrowser.dirs b/debian/swissbrowser.dirs index 7ccba22..79c81dd 100644 --- a/debian/swissbrowser.dirs +++ b/debian/swissbrowser.dirs @@ -1,3 +1,3 @@ -#usr/lib +usr/lib usr/bin usr/share diff --git a/debian/swissbrowser.install b/debian/swissbrowser.install index 68ca4b4..0a3c163 100644 --- a/debian/swissbrowser.install +++ b/debian/swissbrowser.install @@ -8,4 +8,4 @@ usr/share/doc/swissbrowser/README usr/share/doc/swissbrowser/COPYING usr/share/doc/swissbrowser/INSTALL usr/share/doc/swissbrowser/ChangeLog -#usr/lib/lib*.so.* +usr/lib/lib*.so.* diff --git a/src/browser.hxx b/src/browser.hxx index adfbd86..87927d3 100644 --- a/src/browser.hxx +++ b/src/browser.hxx @@ -8,7 +8,20 @@ #ifndef BROWSER_HXX #define BROWSER_HXX +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include + #include #include #include @@ -28,18 +41,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include diff --git a/src/designer/makefile.am b/src/designer/makefile.am new file mode 100644 index 0000000..ddd9bb1 --- /dev/null +++ b/src/designer/makefile.am @@ -0,0 +1,94 @@ +## @file +## +## $Id: makefile.am 7 2010-03-01 14:55:44Z marc $ +## +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +include_HEADERS = + +if !MINGW32 +if MAC +AM_CPPFLAGS += -I/opt/local/include +# -I/Library/OpenSC/include +AM_LDFLAGS = -L/opt/local/lib +# -F/System/Library/Frameworks/PCSC.framework +else +# AM_CPPFLAGS += -I/usr/include/PCSC +endif +endif + +EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.qrc.in @srcdir@/*.png +# @srcdir@/*.ui + +#LANGS = en de fr it +ALL_SRC = @srcdir@/*.[ch]xx \ + *.qrc +# @srcdir@/*.ui + +QMAKE_PROJECT = qmake.pro +QMAKE_MAKEFILE = makefile.qmake + +QMAKE_TARGET = libqbrowserlib-plugin.so +TARGETS = ${QMAKE_TARGET} + +all: ${TARGETS} $ +#$(LANGS:%=@PACKAGENAME@_%.ts) + +rebuild-ts: $(LANGS) + ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} + +# ${LANGS}: ${ALL_SRC} +# -rm @PACKAGENAME@_$@.qm +# svn revert @PACKAGENAME@_$@.ts +# mv @PACKAGENAME@_$@.ts translation.old +# ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} +# mv @PACKAGENAME@_$@.ts translation.new +# echo '' > @PACKAGENAME@_$@.ts +# echo '' >> @PACKAGENAME@_$@.ts +# echo '' >> @PACKAGENAME@_$@.ts +# xqilla merge-translation.xquery >> @PACKAGENAME@_$@.ts +# echo '' >> @PACKAGENAME@_$@.ts +# rm translation.old translation.new + +print: + @echo "LANGS=${LANGS}" + @echo "ALL_SRC=${ALL_SRC}" + @echo "QMAKE=${QMAKE}" + @echo "QMAKE_OPTIONS=${QMAKE_OPTIONS}" + @echo "QMAKE_MAKEFILE=${QMAKE_MAKEFILE}" + @echo "QMAKE_TARGET=${QMAKE_TARGET}" + @echo "TARGETS=${TARGETS}" + + +# @PACKAGENAME@_%.qm: @srcdir@/@PACKAGENAME@_%.ts +# ${LRELEASE} $< -qm $@ + +%.xpm: resources/%.png + convert $< $@ || cp $< $@ + +# %.ts: ${ALL_SRC} +# ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} + +${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC} + ${QMAKE} -o $@ $< + +# $(LANGS:%=@PACKAGENAME@_%.qm) +${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} + make -f ${QMAKE_MAKEFILE} + +install-data-local: ${QMAKE_MAKEFILE} + ${mkinstalldirs} ${QT_INSTALL_PLUGINS} + ${INSTALL} ${QMAKE_TARGET}* ${QT_INSTALL_PLUGINS} + +uninstall-local: + rm -r ${DESTDIR}${libdir}/${QMAKE_TARGET}* + +clean-local: + -rm -r ${QMAKE_TARGET}* + +# $(LANGS:%=@PACKAGENAME@_%.qm) +CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} \ + *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \ + ${QMAKE_TARGET} +MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE} diff --git a/src/designer/qmake.pro.in b/src/designer/qmake.pro.in new file mode 100644 index 0000000..c286ee1 --- /dev/null +++ b/src/designer/qmake.pro.in @@ -0,0 +1,48 @@ +QT += gui webkit network +CONFIG += designer plugin +QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto +QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter -std=c++0x +QMAKE_INCDIR += @top_srcdir@/src +QMAKE_LIBDIR += @top_builddir@/src/qbrowserlib +QMAKE_LIBS += -lqbrowserlib + +unix { + !macx { + CONFIG += debug + QMAKE_INCDIR += /usr/include/PCSC + QMAKE_INCDIR += /usr/local/include/PCSC + QMAKE_LIBS += -lpcsclite -lproxy + } +} +macx { + QMAKE_INCDIR += /opt/local/include + QMAKE_LIBDIR += /opt/local/lib + QMAKE_LFLAGS += -F/System/Library/Frameworks/PCSC.framework + LIBS += -framework PCSC + QMAKE_INCDIR += /System/Library/Frameworks/PCSC.framework/Headers + QMAKE_INFO_PLIST = Info.plist + CONFIG += x86 +} +win32 { + QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32 + QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a + CONFIG += release +} +SOURCES = webviewwidgetifc.cxx + +HEADERS = webviewwidgetifc.hxx + +FORMS = + +RESOURCES = resources.qrc.in + +TEMPLATE = lib +TARGET = qbrowserlib-plugin + +CODECFORSRC = UTF-8 +CODECFORTR = UTF-8 + +DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\' + +## DEBUG +# QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"< + + webview.png + + diff --git a/src/designer/webview.png b/src/designer/webview.png new file mode 100644 index 0000000..28cd015 Binary files /dev/null and b/src/designer/webview.png differ diff --git a/src/designer/webviewwidgetifc.cxx b/src/designer/webviewwidgetifc.cxx new file mode 100644 index 0000000..1f4622a --- /dev/null +++ b/src/designer/webviewwidgetifc.cxx @@ -0,0 +1,10 @@ +/*! @file + + @id $Id$ +*/ +// 1 2 3 4 5 6 7 8 +// 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +#include + +Q_EXPORT_PLUGIN2(webviewwidgetplugin, WebViewWidgetIfc); diff --git a/src/designer/webviewwidgetifc.hxx b/src/designer/webviewwidgetifc.hxx new file mode 100644 index 0000000..47f4ba1 --- /dev/null +++ b/src/designer/webviewwidgetifc.hxx @@ -0,0 +1,65 @@ +/*! @file + + @id $Id$ +*/ +// 1 2 3 4 5 6 7 8 +// 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +#ifndef __WEBVIEWWIDGETIFC_HXX +#define __WEBVIEWWIDGETIFC_HXX + +#include +#include + +//! WebView widget for Qt Designer +class WebViewWidgetIfc: public QObject, public QDesignerCustomWidgetInterface { + Q_OBJECT; + Q_INTERFACES(QDesignerCustomWidgetInterface); + public: + bool isContainer() const { + return false; + } + bool isInitialized() const { + return _initialized; + } + QIcon icon() const { + return QIcon(QPixmap("qrc:/icons/webview.png")); + } + QString domXml() const { + return + " \n" + " \n" + " 0\n" + " 0\n" + " 100\n" + " 100\n" + " \n" + " \n"; + } + QString group() const { + return "DisplayWidgets"; + } + QString includeFile() const { + return "qbrowserlib/webview.hxx"; + } + QString name() const { + return "SwissWebView"; + } + QString toolTip() const { + return "SwissWebView"; + } + QString whatsThis() const { + return "SwissWebView"; + } + QWidget *createWidget(QWidget *parent) { + return new WebView(parent); + } + void initialize(QDesignerFormEditorInterface *core) { + _initialized = true; + } + + private: + bool _initialized; +}; + +#endif diff --git a/src/makefile.am b/src/makefile.am index d6fe504..2d9c1e1 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -5,7 +5,9 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -include_HEADERS = +SUBDIRS = qbrowserlib designer + +include_HEADERS = @srcdir@/qbrowserlib/*.hxx if !MINGW32 if MAC @@ -25,7 +27,8 @@ mypkg_DATA = @PACKAGENAME@.xpm resources/@PACKAGENAME@.png applicationsdir = ${datarootdir}/applications dist_applications_DATA = @PACKAGENAME@.desktop -EXTRA_DIST = resources *.cxx *.hxx *.ui *.ts *.qrc +EXTRA_DIST = @srcdir@/resources @srcdir@/*.cxx @srcdir@/*.hxx \ + @srcdir@/*.ui @srcdir@/*.ts @srcdir@/*.qrc LANGS = en de fr it ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/src/*.ui $(shell find ${top_srcdir}/src/resources -name .svn -prune -o \( -type f -o -type l \) -print) diff --git a/src/qbrowserlib/languages.qrc.in b/src/qbrowserlib/languages.qrc.in new file mode 100644 index 0000000..af0eaba --- /dev/null +++ b/src/qbrowserlib/languages.qrc.in @@ -0,0 +1,8 @@ + + + qbrowserlib_de.qm + qbrowserlib_fr.qm + qbrowserlib_it.qm + qbrowserlib_en.qm + + diff --git a/src/qbrowserlib/makefile.am b/src/qbrowserlib/makefile.am new file mode 100644 index 0000000..352df3f --- /dev/null +++ b/src/qbrowserlib/makefile.am @@ -0,0 +1,91 @@ +## @file +## +## $Id: makefile.am 7 2010-03-01 14:55:44Z marc $ +## +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +include_HEADERS = + +if !MINGW32 +if MAC +AM_CPPFLAGS += -I/opt/local/include +# -I/Library/OpenSC/include +AM_LDFLAGS = -L/opt/local/lib +# -F/System/Library/Frameworks/PCSC.framework +else +# AM_CPPFLAGS += -I/usr/include/PCSC +endif +endif + +EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.ui @srcdir@/*.ts @srcdir@/*.qrc.in + +LANGS = en de fr it +ALL_SRC = @srcdir@/*.[ch]xx \ + *.qrc \ + @srcdir@/*.ui + +QMAKE_PROJECT = @srcdir@/qmake.pro +QMAKE_MAKEFILE = makefile.qmake + +QMAKE_TARGET = libqbrowserlib.so + +TARGETS = ${QMAKE_TARGET} + +all: ${TARGETS} $(LANGS:%=@srcdir@/qbrowserlib_%.ts) + +rebuild-ts: $(LANGS) + ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} + +${LANGS}: ${ALL_SRC} + -rm qbrowserlib_$@.qm + svn revert @srcdir@/qbrowserlib_$@.ts + mv @srcdir@/qbrowserlib_$@.ts translation.old + ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} + mv @srcdir@/qbrowserlib_$@.ts translation.new + echo '' > @srcdir@/qbrowserlib_$@.ts + echo '' >> @srcdir@/qbrowserlib_$@.ts + echo '' >> @srcdir@/qbrowserlib_$@.ts + xqilla merge-translation.xquery >> @srcdir@/qbrowserlib_$@.ts + echo '' >> @srcdir@/qbrowserlib_$@.ts + rm translation.old translation.new + +print: + @echo "LANGS=${LANGS}" + @echo "ALL_SRC=${ALL_SRC}" + @echo "QMAKE=${QMAKE}" + @echo "QMAKE_OPTIONS=${QMAKE_OPTIONS}" + @echo "QMAKE_MAKEFILE=${QMAKE_MAKEFILE}" + @echo "QMAKE_TARGET=${QMAKE_TARGET}" + @echo "TARGETS=${TARGETS}" + + +qbrowserlib_%.qm: @srcdir@/qbrowserlib_%.ts + ${LRELEASE} $< -qm $@ + +%.xpm: resources/%.png + convert $< $@ || cp $< $@ + +@srcdir@/%.ts: ${ALL_SRC} + ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT} + +${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC} + ${QMAKE} -o $@ $< + +${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=qbrowserlib_%.qm) + make -f ${QMAKE_MAKEFILE} + +install-data-local: + ${mkinstalldirs} ${DESTDIR}${libdir} + ${INSTALL} ${QMAKE_TARGET}* ${DESTDIR}${libdir} + +uninstall-local: + rm -r ${DESTDIR}${libdir}/${QMAKE_TARGET}* + +clean-local: + -rm -r ${QMAKE_TARGET}* + +CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=qbrowserlib_%.qm) \ + *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.qrc \ + ${QMAKE_TARGET} \ +MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE} diff --git a/src/pluginfactory.hxx b/src/qbrowserlib/pluginfactory.hxx similarity index 97% rename from src/pluginfactory.hxx rename to src/qbrowserlib/pluginfactory.hxx index f569a4f..64956a2 100644 --- a/src/pluginfactory.hxx +++ b/src/qbrowserlib/pluginfactory.hxx @@ -9,7 +9,7 @@ #define __PLUGINFACTORY_HXX__ #include -#include +#include #include #ifndef LOG diff --git a/src/qbrowserlib/qbrowserlib_de.ts b/src/qbrowserlib/qbrowserlib_de.ts new file mode 100644 index 0000000..6f29764 --- /dev/null +++ b/src/qbrowserlib/qbrowserlib_de.ts @@ -0,0 +1,86 @@ + + + +UTF-8 + + SaveOrRun + + File Exists + + + + File already exists: + +%1 + +Overwrite? + + + + Save File As ... + + + + Open File With ... + + + + Dokumente + Documents folder in local language + + + + Arbeitsfläche + Desktop folder in local language + + + + Download + + + + File: + + + + ... + + + + Type: + + + + Source + + + + Save File + + + + Save File As: + + + + browse ... + + + + remember save path + + + + Open in External Application + + + + Open File in: + + + + remember tool for this type + + + + diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts new file mode 100644 index 0000000..933c010 --- /dev/null +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -0,0 +1,86 @@ + + + +UTF-8 + + SaveOrRun + + File Exists + + + + File already exists: + +%1 + +Overwrite? + + + + Save File As ... + + + + Open File With ... + + + + Dokumente + Documents folder in local language + + + + Arbeitsfläche + Desktop folder in local language + + + + Download + + + + File: + + + + ... + + + + Type: + + + + Source + + + + Save File + + + + Save File As: + + + + browse ... + + + + remember save path + + + + Open in External Application + + + + Open File in: + + + + remember tool for this type + + + + diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts new file mode 100644 index 0000000..e39e1b7 --- /dev/null +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -0,0 +1,86 @@ + + + +UTF-8 + + SaveOrRun + + File Exists + + + + File already exists: + +%1 + +Overwrite? + + + + Save File As ... + + + + Open File With ... + + + + Dokumente + Documents folder in local language + + + + Arbeitsfläche + Desktop folder in local language + + + + Download + + + + File: + + + + ... + + + + Type: + + + + Source + + + + Save File + + + + Save File As: + + + + browse ... + + + + remember save path + + + + Open in External Application + + + + Open File in: + + + + remember tool for this type + + + + diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts new file mode 100644 index 0000000..d6b37f8 --- /dev/null +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -0,0 +1,86 @@ + + + +UTF-8 + + SaveOrRun + + File Exists + + + + File already exists: + +%1 + +Overwrite? + + + + Save File As ... + + + + Open File With ... + + + + Dokumente + Documents folder in local language + + + + Arbeitsfläche + Desktop folder in local language + + + + Download + + + + File: + + + + ... + + + + Type: + + + + Source + + + + Save File + + + + Save File As: + + + + browse ... + + + + remember save path + + + + Open in External Application + + + + Open File in: + + + + remember tool for this type + + + + diff --git a/src/qbrowserlib/qmake.pro.in b/src/qbrowserlib/qmake.pro.in new file mode 100644 index 0000000..a3f720e --- /dev/null +++ b/src/qbrowserlib/qmake.pro.in @@ -0,0 +1,55 @@ +QT += webkit network gui +QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto +QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter -std=c++0x +QMAKE_INCDIR += BULLSHIT1 @srcdir@/.. BULLSHIT2 .. BULLSHIT3 +INCLUDEPATH += BULLSHIT4 .. BULLSHIT5 +QMAKE_CXXFLAGS += -IBULLSHIT6 -I.. -IBULLSHIT7 + +unix { + !macx { + CONFIG += debug + QMAKE_INCDIR += /usr/include/PCSC + QMAKE_INCDIR += /usr/local/include/PCSC + QMAKE_LIBS += -lpcsclite -lproxy + } +} +macx { + QMAKE_INCDIR += /opt/local/include + QMAKE_LIBDIR += /opt/local/lib + QMAKE_LFLAGS += -F/System/Library/Frameworks/PCSC.framework + LIBS += -framework PCSC + QMAKE_INCDIR += /System/Library/Frameworks/PCSC.framework/Headers + QMAKE_INFO_PLIST = Info.plist + CONFIG += x86 +} +win32 { + QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32 + QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a + CONFIG += release +} +ICON = swissbrowser.icns + +TRANSLATIONS = @srcdir@/qbrowserlib_en.ts \ + @srcdir@/qbrowserlib_de.ts \ + @srcdir@/qbrowserlib_fr.ts \ + @srcdir@/qbrowserlib_it.ts + +SOURCES = + +HEADERS = @srcdir@/webview.hxx @srcdir@/webpage.hxx \ + @srcdir@/pluginfactory.hxx @srcdir@/saveorrun.hxx + +FORMS = @srcdir@/saveorrun.ui + +RESOURCES = languages.qrc + +TEMPLATE=lib +TARGET = qbrowserlib + +CODECFORSRC = UTF-8 +CODECFORTR = UTF-8 + +DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\' + +## DEBUG +# QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"< +#include #include #include diff --git a/src/saveorrun.ui b/src/qbrowserlib/saveorrun.ui similarity index 100% rename from src/saveorrun.ui rename to src/qbrowserlib/saveorrun.ui diff --git a/src/webpage.hxx b/src/qbrowserlib/webpage.hxx similarity index 100% rename from src/webpage.hxx rename to src/qbrowserlib/webpage.hxx diff --git a/src/webview.hxx b/src/qbrowserlib/webview.hxx similarity index 91% rename from src/webview.hxx rename to src/qbrowserlib/webview.hxx index 4fa8c1a..da48028 100644 --- a/src/webview.hxx +++ b/src/qbrowserlib/webview.hxx @@ -8,10 +8,8 @@ #ifndef WEBVIEW_HXX #define WEBVIEW_HXX -#include -#include -#include -#include +#include +#include #include diff --git a/src/qmake.pro.in b/src/qmake.pro.in index 1a62a82..e87ac18 100644 --- a/src/qmake.pro.in +++ b/src/qmake.pro.in @@ -1,6 +1,9 @@ QT += webkit network gui QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter -std=c++0x +QMAKE_INCDIR += @top_srcdir@/src +QMAKE_LIBDIR += @top_builddir@/src/qbrowserlib +QMAKE_LIBS += -lqbrowserlib unix { !macx { @@ -31,18 +34,25 @@ TRANSLATIONS = @PACKAGENAME@_en.ts \ @PACKAGENAME@_fr.ts \ @PACKAGENAME@_it.ts -SOURCES = main.cxx +SOURCES = @srcdir@/main.cxx -HEADERS = browser.hxx smartcardauth.hxx pinentry.hxx \ - downloadmanager.hxx settings.hxx sslclientnetworkmanager.hxx \ - authentication.hxx webview.hxx webpage.hxx errorlog.hxx \ - certificate.hxx logincertificate.hxx editbookmarks.hxx \ - pluginfactory.hxx pdfdisplay.hpp saveorrun.hxx temporaryfile.hxx +HEADERS = @srcdir@/browser.hxx @srcdir@/smartcardauth.hxx \ + @srcdir@/pinentry.hxx @srcdir@/downloadmanager.hxx \ + @srcdir@/settings.hxx \ + @srcdir@/sslclientnetworkmanager.hxx \ + @srcdir@/authentication.hxx @srcdir@/errorlog.hxx \ + @srcdir@/certificate.hxx \ + @srcdir@/logincertificate.hxx \ + @srcdir@/editbookmarks.hxx @srcdir@/pdfdisplay.hpp \ + @srcdir@/temporaryfile.hxx -FORMS = browser.ui settings.ui pinentry.ui authentication.ui errorlog.ui \ - certificate.ui logincertificate.ui editbookmarks.ui saveorrun.ui +FORMS = @srcdir@/browser.ui @srcdir@/settings.ui \ + @srcdir@/pinentry.ui @srcdir@/authentication.ui \ + @srcdir@/errorlog.ui @srcdir@/certificate.ui \ + @srcdir@/logincertificate.ui \ + @srcdir@/editbookmarks.ui -RESOURCES = languages.qrc resources.qrc +RESOURCES = languages.qrc @srcdir@/resources.qrc TARGET = @PACKAGENAME@ diff --git a/src/swissbrowser_de.ts b/src/swissbrowser_de.ts index 884a934..2cbbbcd 100644 --- a/src/swissbrowser_de.ts +++ b/src/swissbrowser_de.ts @@ -5,27 +5,22 @@ Authentication - Authorization - Authentication required for: - realm - Username: - Password: @@ -33,417 +28,328 @@ Browser - SwissBrowser - SwissSign Browser - toolBar - &File - Edit - - Info - - - - History - - neu laden + Info - - F5 - - - - - stoppen - - - - - zurückkehren - - - - - weitergehen - - - - - Startseite - - - - - Ctrl+Home - - - - - &New Browser - - - - - New Browser Window - - - - - Ctrl+N - - - - - Ctrl+W - - - - - &Proxy... - - - - Bookmarks - - Alt+Left + neu laden - - Alt+Right + F5 - - &Quit + stoppen - - Ctrl+P - - - - - Next Tab - - - - - Shift+Right - - - - - Previous Tab - - - - - Shift+Left - - - - - - New Tab - - - - - Add New Tab - - - - - Ctrl+T - - - - - Find - - - - - Close Find - - - - - &About - - - - - &Settings ... - - - - - &Reverse Find - - - - - Ctrl+R - - - - - Error Log - - - - - show error logs - - - - - User Login Certificate - - - - - &Proxy ... - - - - - Clear Location - - - - - clear location bar - - - - - Add Bookmark - - - - - add bookmark to location bar - - - - - Ctrl+D - - - - - &Bookmarks - - - - - Clear Find - - - - - clear find bar - - - - - &Close Tab - - - - - Sa&ve Session - - - - - &Load Session - - - - - Search - - - - - Clear Search - - - - - Esc - - find in page + zurückkehren - - Ctrl+F + Alt+Left + + + + weitergehen + + + + Alt+Right + + + + Startseite + + + + Ctrl+Home + + + + &New Browser + + + + New Browser Window + + + + Ctrl+N + + + + &Quit + + + + &Proxy... - Print ... - - Quick &Print - &Print - - - - Print Pre&view ... - - Checking: %1 - Opening: %1 + Quick &Print - - Reading: %1 - Reading: %1% + Ctrl+P - - Illegal URL: %1 + Next Tab - - Forbidden: %1 + Shift+Right + + + + Previous Tab + + + + Shift+Left + + + + New Tab + + + + Add New Tab + + + + Ctrl+T + + + + Find + + + + find in page + + + + Ctrl+F + + + + Close Find + + + + &About + + + + &Settings ... + + + + &Reverse Find + + + + Ctrl+R + + + + Error Log + + + + show error logs + + + + User Login Certificate + + + + &Proxy ... + + + + Clear Location + + + + clear location bar + + + + Add Bookmark + + + + add bookmark to location bar + + + + Ctrl+D + + + + &Bookmarks + + + + Clear Find + + + + clear find bar + + + + &Close Tab + + + + Ctrl+W + + + + Sa&ve Session + + + + &Load Session + + + + Search + + + + Clear Search - background-color: white search engines combobox - SSL Not Supported - SSL is not supported on your system - + Checking: %1 + + + + Forbidden: %1 + + + Access Denied - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + Reading: %1 + + + + Illegal URL: %1 + + + gg - http://www.google.com/search?hl=%2&q=%1 - Zoom: %1% - opening new window - Print Document - %1 - %2 statusbar actionBack_hovered %1=url %2=title - %1 - %2 statusbar actionForward_hovered %1=url %2=title - - background-color: white neutral find - - background-color: #ADA text found - - background-color: #F77 text not found - About - %8 Version: %1 Builddate: %2 @@ -455,58 +361,46 @@ openssl-%7 - %1 - Info: %1 - done. - %1 statusbar for hovered link %1=url - launching application ... - errors show error log - - background-color: #F77 invalid url - - background-color: white valid url - authentication required - ssl error @@ -514,258 +408,206 @@ openssl-%7 Certificate - + Form + + + + Attribute + + + + Value + + + Valid Since - Valid Until - - Issuer Info - - - - - Subject Info - - - - SuisseID Number - Certificate Serial Number - + Subject Info + + + Alternate Subject - + Issuer Info + + + E-Mail - URL - error unknown certificate subject alternate name - Organization - Common Name - Locality - Organizational Unit - Country - State or Province - error unknown certificate subject info - - - Form - - - - - Attribute - - - - - Value - - DownloadManager - Network connection successful, remote host can be reached. - The remote server refused the connection (the server is not accepting requests). - The remote server closed the connection prematurely, before the entire reply was received and processed. - The remote host name was not found (invalid hostname). - The connection to the remote server timed out. - The operation was canceled via calls to abort() or close() before it was finished. - The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - The connection to the proxy server was refused (the proxy server is not accepting requests). - The proxy server closed the connection prematurely, before the entire reply was received and processed. - The proxy host name was not found (invalid proxy hostname). - The connection to the proxy timed out or the proxy did not reply in time to the request sent. - The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - The access to the remote content was denied (similar to HTTP error 401). - The operation requested on the remote content is not permitted. - The remote content was not found at the server (similar to HTTP error 404). - The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - The Network Access API cannot honor the request because the protocol is not known. - The requested operation is invalid for this protocol. - An unknown network-related error was detected. - An unknown proxy-related error was detected. - An unknonwn error related to the remote content was detected. - A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - <strong>Unknown network error (code: %1).</string> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> - <h1>SSL Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> EditBookmarks - Edit Bookmarks - + - - - Use Drag/Drop to move, double-click to edit. @@ -773,7 +615,6 @@ openssl-%7 ErrorLog - Error Log @@ -781,7 +622,6 @@ openssl-%7 LoginCertificate - User Login Certificate @@ -789,67 +629,51 @@ openssl-%7 PinEntry - Certificate PIN Entry - SwissSign Pin Entry - Please enter your PIN to unlock Certificate - PIN: - Name: - - - TextLabel - E-Mail: - - SuisseID Number: - %1 PIN attempts left - bad or locked certificate - Show Certificate Details - Postzertifikat: title for postzertificate serial number - there are %1 PIN attempts left @@ -857,12 +681,10 @@ openssl-%7 QMessageBox - Wrong PIN - Authentication failed, please try again. @@ -870,13 +692,11 @@ openssl-%7 QObject - SwissBrowser application name - Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -904,153 +724,42 @@ Environment: - Cannot read PEM certificate from file: %1 - Read PEM certificates from file: %1 - Cannot read PEM RSA key from file: %1 - Read private key from file: %1 - Too few arguments. Try: %1 --help - - SaveOrRun - - - File Exists - - - - - File already exists: - -%1 - -Overwrite? - - - - - Save File As ... - - - - - Open File With ... - - - - - Dokumente - Documents folder in local language - - - - - Arbeitsfläche - Desktop folder in local language - - - - - Download - - - - - File: - - - - - - - ... - - - - - Type: - - - - - Source - - - - - Save File - - - - - Save File As: - - - - - - browse ... - - - - - remember save path - - - - - Open in External Application - - - - - Open File in: - - - - - remember tool for this type - - - Settings - Settings - Web - Network Connections - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1059,12 +768,10 @@ p, li { white-space: pre-wrap; } - auto load images - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1073,27 +780,22 @@ p, li { white-space: pre-wrap; } - DNS prefetch enabled - Rendering - Specifies whether JavaScript programs can open new windows. - JavaScript can open windows - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1102,12 +804,10 @@ p, li { white-space: pre-wrap; } - spatial navigation - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1116,12 +816,10 @@ p, li { white-space: pre-wrap; } - fokus links - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1130,12 +828,10 @@ p, li { white-space: pre-wrap; } - zoom text only - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1144,12 +840,10 @@ p, li { white-space: pre-wrap; } - print element backgrounds - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1158,12 +852,10 @@ p, li { white-space: pre-wrap; } - accelerated composing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1172,12 +864,10 @@ p, li { white-space: pre-wrap; } - tiled backing store - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1186,12 +876,10 @@ p, li { white-space: pre-wrap; } - frame flattening - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1200,22 +888,18 @@ p, li { white-space: pre-wrap; } - site specific quirks - Security - Extensions - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1224,12 +908,10 @@ p, li { white-space: pre-wrap; } - JavaScript - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1238,12 +920,10 @@ p, li { white-space: pre-wrap; } - Java - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1252,17 +932,14 @@ p, li { white-space: pre-wrap; } - Netscape plugins - Extras - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1271,17 +948,14 @@ p, li { white-space: pre-wrap; } - developer extras - Privacy - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1290,12 +964,10 @@ p, li { white-space: pre-wrap; } - private browsing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1304,12 +976,10 @@ p, li { white-space: pre-wrap; } - JavaScript can access clipboard - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1318,12 +988,10 @@ p, li { white-space: pre-wrap; } - offline storage database - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1332,12 +1000,10 @@ p, li { white-space: pre-wrap; } - offline webapplication cache - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1346,12 +1012,10 @@ p, li { white-space: pre-wrap; } - local storage - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1360,54 +1024,10 @@ p, li { white-space: pre-wrap; } - - Search Engines - - - - - Scheme - - - - - Query URL - - - - - Use %1 as placeholder for the query, use %2 as placeholder for your system language. - Use <QUERY> as placeholder for the query. - - - - - Session - - - - - Session Management - - - - - save window state when opened withiut URL - save window state - - - - - close mimetype helper applications on exit - - - - local content can access remote urls - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1416,12 +1036,10 @@ p, li { white-space: pre-wrap; } - local content can access file URLs - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1430,55 +1048,72 @@ p, li { white-space: pre-wrap; } - cross site scripting auditing - Applications - Mime-Type - Ext - Program - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">%1</span> as file name placeholder.</p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">&lt;FILENAME&gt;</span> as file name placeholder.</p></body></html> - - + - - - + + Search Engines + + + + Scheme + + + + Query URL + + + + Use %1 as placeholder for the query, use %2 as placeholder for your system language. + + + + Session + + + + Session Management + + + + save window state when opened withiut URL + + + + close mimetype helper applications on exit + + diff --git a/src/swissbrowser_en.ts b/src/swissbrowser_en.ts index 6de999b..7850840 100644 --- a/src/swissbrowser_en.ts +++ b/src/swissbrowser_en.ts @@ -5,27 +5,22 @@ Authentication - Authorization - Authentication required for: - realm - Username: - Password: @@ -33,413 +28,328 @@ Browser - SwissBrowser - toolBar - &File - Edit - History - Info - - neu laden - - - - - F5 - - - - - stoppen - - - - - - Esc - - - - - zurückkehren - - - - - weitergehen - - - - - Startseite - - - - - Ctrl+Home - - - - - &New Browser - - - - - New Browser Window - - - - - Ctrl+N - - - - - Ctrl+W - - - - - &Proxy... - - - - Bookmarks - + neu laden + + + + F5 + + + + stoppen + + + + Esc + + + + zurückkehren + + + Alt+Left - + weitergehen + + + Alt+Right - + Startseite + + + + Ctrl+Home + + + + &New Browser + + + + New Browser Window + + + + Ctrl+N + + + &Quit - + &Proxy... + + + Print ... - Print Pre&view ... - Quick &Print - Ctrl+P - Next Tab - Shift+Right - Previous Tab - Shift+Left - - New Tab - Add New Tab - Ctrl+T - Find - find in page - Ctrl+F - Close Find - &About - &Settings ... - &Reverse Find - Ctrl+R - Error Log - show error logs - User Login Certificate - &Proxy ... - Clear Location - clear location bar - Add Bookmark - add bookmark to location bar - Ctrl+D - &Bookmarks - Clear Find - clear find bar - &Close Tab - + Ctrl+W + + + Sa&ve Session - &Load Session - Search - Clear Search - - Checking: %1 - - - - - SSL Not Supported - - - - background-color: white search engines combobox - + SSL Not Supported + + + SSL is not supported on your system - + Checking: %1 + + + Forbidden: %1 - Access Denied - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - Reading: %1 - Illegal URL: %1 - gg - http://www.google.com/search?hl=%2&q=%1 - Zoom: %1% - opening new window - Print Document - %1 - %2 statusbar actionBack_hovered %1=url %2=title - %1 - %2 statusbar actionForward_hovered %1=url %2=title - - background-color: white neutral find - - background-color: #ADA text found - - background-color: #F77 text not found - About - %8 Version: %1 Builddate: %2 @@ -451,58 +361,46 @@ openssl-%7 - %1 - Info: %1 - done. - %1 statusbar for hovered link %1=url - launching application ... - errors show error log - - background-color: #F77 invalid url - - background-color: white valid url - authentication required - ssl error @@ -510,232 +408,187 @@ openssl-%7 Certificate - + Form + + + + Attribute + + + + Value + + + Valid Since - Valid Until - - Issuer Info - - - - - Subject Info - - - - SuisseID Number - Certificate Serial Number - + Subject Info + + + Alternate Subject - + Issuer Info + + + E-Mail - URL - error unknown certificate subject alternate name - Organization - Common Name - Locality - Organizational Unit - Country - State or Province - error unknown certificate subject info - - - Form - - - - - Attribute - - - - - Value - - DownloadManager - Network connection successful, remote host can be reached. - The remote server refused the connection (the server is not accepting requests). - The remote server closed the connection prematurely, before the entire reply was received and processed. - The remote host name was not found (invalid hostname). - The connection to the remote server timed out. - The operation was canceled via calls to abort() or close() before it was finished. - The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - The connection to the proxy server was refused (the proxy server is not accepting requests). - The proxy server closed the connection prematurely, before the entire reply was received and processed. - The proxy host name was not found (invalid proxy hostname). - The connection to the proxy timed out or the proxy did not reply in time to the request sent. - The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - The access to the remote content was denied (similar to HTTP error 401). - The operation requested on the remote content is not permitted. - The remote content was not found at the server (similar to HTTP error 404). - The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - The Network Access API cannot honor the request because the protocol is not known. - The requested operation is invalid for this protocol. - An unknown network-related error was detected. - An unknown proxy-related error was detected. - An unknonwn error related to the remote content was detected. - A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - <strong>Unknown network error (code: %1).</string> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -743,22 +596,18 @@ openssl-%7 EditBookmarks - Edit Bookmarks - + - - - Use Drag/Drop to move, double-click to edit. @@ -766,7 +615,6 @@ openssl-%7 ErrorLog - Error Log @@ -774,7 +622,6 @@ openssl-%7 LoginCertificate - User Login Certificate @@ -782,66 +629,51 @@ openssl-%7 PinEntry - Certificate PIN Entry - Please enter your PIN to unlock Certificate - PIN: - Name: - - - TextLabel - E-Mail: - - SuisseID Number: - %1 PIN attempts left - bad or locked certificate - Show Certificate Details - Postzertifikat: title for postzertificate serial number - there are %1 PIN attempts left @@ -849,12 +681,10 @@ openssl-%7 QMessageBox - Wrong PIN - Authentication failed, please try again. @@ -862,13 +692,11 @@ openssl-%7 QObject - SwissBrowser application name - Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -896,153 +724,42 @@ Environment: - Cannot read PEM certificate from file: %1 - Read PEM certificates from file: %1 - Cannot read PEM RSA key from file: %1 - Read private key from file: %1 - Too few arguments. Try: %1 --help - - SaveOrRun - - - File Exists - - - - - File already exists: - -%1 - -Overwrite? - - - - - Save File As ... - - - - - Open File With ... - - - - - Dokumente - Documents folder in local language - - - - - Arbeitsfläche - Desktop folder in local language - - - - - Download - - - - - File: - - - - - - - ... - - - - - Type: - - - - - Source - - - - - Save File - - - - - Save File As: - - - - - - browse ... - - - - - remember save path - - - - - Open in External Application - - - - - Open File in: - - - - - remember tool for this type - - - Settings - Settings - Web - Network Connections - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1051,12 +768,10 @@ p, li { white-space: pre-wrap; } - auto load images - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1065,27 +780,22 @@ p, li { white-space: pre-wrap; } - DNS prefetch enabled - Rendering - Specifies whether JavaScript programs can open new windows. - JavaScript can open windows - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1094,12 +804,10 @@ p, li { white-space: pre-wrap; } - spatial navigation - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1108,12 +816,10 @@ p, li { white-space: pre-wrap; } - fokus links - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1122,12 +828,10 @@ p, li { white-space: pre-wrap; } - zoom text only - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1136,12 +840,10 @@ p, li { white-space: pre-wrap; } - print element backgrounds - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1150,12 +852,10 @@ p, li { white-space: pre-wrap; } - accelerated composing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1164,12 +864,10 @@ p, li { white-space: pre-wrap; } - tiled backing store - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1178,12 +876,10 @@ p, li { white-space: pre-wrap; } - frame flattening - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1192,22 +888,18 @@ p, li { white-space: pre-wrap; } - site specific quirks - Security - Extensions - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1216,12 +908,10 @@ p, li { white-space: pre-wrap; } - JavaScript - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1230,12 +920,10 @@ p, li { white-space: pre-wrap; } - Java - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1244,17 +932,14 @@ p, li { white-space: pre-wrap; } - Netscape plugins - Extras - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1263,17 +948,14 @@ p, li { white-space: pre-wrap; } - developer extras - Privacy - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1282,12 +964,10 @@ p, li { white-space: pre-wrap; } - private browsing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1296,12 +976,10 @@ p, li { white-space: pre-wrap; } - JavaScript can access clipboard - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1310,12 +988,10 @@ p, li { white-space: pre-wrap; } - offline storage database - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1324,12 +1000,10 @@ p, li { white-space: pre-wrap; } - offline webapplication cache - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1338,12 +1012,10 @@ p, li { white-space: pre-wrap; } - local storage - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1352,12 +1024,10 @@ p, li { white-space: pre-wrap; } - local content can access remote urls - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1366,12 +1036,10 @@ p, li { white-space: pre-wrap; } - local content can access file URLs - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1380,32 +1048,26 @@ p, li { white-space: pre-wrap; } - cross site scripting auditing - Applications - Mime-Type - Ext - Program - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1414,55 +1076,42 @@ p, li { white-space: pre-wrap; } - - + - - - - Search Engines - Scheme - Query URL - Use %1 as placeholder for the query, use %2 as placeholder for your system language. - Session - Session Management - save window state when opened withiut URL - save window state - close mimetype helper applications on exit diff --git a/src/swissbrowser_fr.ts b/src/swissbrowser_fr.ts index 884a934..2cbbbcd 100644 --- a/src/swissbrowser_fr.ts +++ b/src/swissbrowser_fr.ts @@ -5,27 +5,22 @@ Authentication - Authorization - Authentication required for: - realm - Username: - Password: @@ -33,417 +28,328 @@ Browser - SwissBrowser - SwissSign Browser - toolBar - &File - Edit - - Info - - - - History - - neu laden + Info - - F5 - - - - - stoppen - - - - - zurückkehren - - - - - weitergehen - - - - - Startseite - - - - - Ctrl+Home - - - - - &New Browser - - - - - New Browser Window - - - - - Ctrl+N - - - - - Ctrl+W - - - - - &Proxy... - - - - Bookmarks - - Alt+Left + neu laden - - Alt+Right + F5 - - &Quit + stoppen - - Ctrl+P - - - - - Next Tab - - - - - Shift+Right - - - - - Previous Tab - - - - - Shift+Left - - - - - - New Tab - - - - - Add New Tab - - - - - Ctrl+T - - - - - Find - - - - - Close Find - - - - - &About - - - - - &Settings ... - - - - - &Reverse Find - - - - - Ctrl+R - - - - - Error Log - - - - - show error logs - - - - - User Login Certificate - - - - - &Proxy ... - - - - - Clear Location - - - - - clear location bar - - - - - Add Bookmark - - - - - add bookmark to location bar - - - - - Ctrl+D - - - - - &Bookmarks - - - - - Clear Find - - - - - clear find bar - - - - - &Close Tab - - - - - Sa&ve Session - - - - - &Load Session - - - - - Search - - - - - Clear Search - - - - - Esc - - find in page + zurückkehren - - Ctrl+F + Alt+Left + + + + weitergehen + + + + Alt+Right + + + + Startseite + + + + Ctrl+Home + + + + &New Browser + + + + New Browser Window + + + + Ctrl+N + + + + &Quit + + + + &Proxy... - Print ... - - Quick &Print - &Print - - - - Print Pre&view ... - - Checking: %1 - Opening: %1 + Quick &Print - - Reading: %1 - Reading: %1% + Ctrl+P - - Illegal URL: %1 + Next Tab - - Forbidden: %1 + Shift+Right + + + + Previous Tab + + + + Shift+Left + + + + New Tab + + + + Add New Tab + + + + Ctrl+T + + + + Find + + + + find in page + + + + Ctrl+F + + + + Close Find + + + + &About + + + + &Settings ... + + + + &Reverse Find + + + + Ctrl+R + + + + Error Log + + + + show error logs + + + + User Login Certificate + + + + &Proxy ... + + + + Clear Location + + + + clear location bar + + + + Add Bookmark + + + + add bookmark to location bar + + + + Ctrl+D + + + + &Bookmarks + + + + Clear Find + + + + clear find bar + + + + &Close Tab + + + + Ctrl+W + + + + Sa&ve Session + + + + &Load Session + + + + Search + + + + Clear Search - background-color: white search engines combobox - SSL Not Supported - SSL is not supported on your system - + Checking: %1 + + + + Forbidden: %1 + + + Access Denied - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + Reading: %1 + + + + Illegal URL: %1 + + + gg - http://www.google.com/search?hl=%2&q=%1 - Zoom: %1% - opening new window - Print Document - %1 - %2 statusbar actionBack_hovered %1=url %2=title - %1 - %2 statusbar actionForward_hovered %1=url %2=title - - background-color: white neutral find - - background-color: #ADA text found - - background-color: #F77 text not found - About - %8 Version: %1 Builddate: %2 @@ -455,58 +361,46 @@ openssl-%7 - %1 - Info: %1 - done. - %1 statusbar for hovered link %1=url - launching application ... - errors show error log - - background-color: #F77 invalid url - - background-color: white valid url - authentication required - ssl error @@ -514,258 +408,206 @@ openssl-%7 Certificate - + Form + + + + Attribute + + + + Value + + + Valid Since - Valid Until - - Issuer Info - - - - - Subject Info - - - - SuisseID Number - Certificate Serial Number - + Subject Info + + + Alternate Subject - + Issuer Info + + + E-Mail - URL - error unknown certificate subject alternate name - Organization - Common Name - Locality - Organizational Unit - Country - State or Province - error unknown certificate subject info - - - Form - - - - - Attribute - - - - - Value - - DownloadManager - Network connection successful, remote host can be reached. - The remote server refused the connection (the server is not accepting requests). - The remote server closed the connection prematurely, before the entire reply was received and processed. - The remote host name was not found (invalid hostname). - The connection to the remote server timed out. - The operation was canceled via calls to abort() or close() before it was finished. - The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - The connection to the proxy server was refused (the proxy server is not accepting requests). - The proxy server closed the connection prematurely, before the entire reply was received and processed. - The proxy host name was not found (invalid proxy hostname). - The connection to the proxy timed out or the proxy did not reply in time to the request sent. - The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - The access to the remote content was denied (similar to HTTP error 401). - The operation requested on the remote content is not permitted. - The remote content was not found at the server (similar to HTTP error 404). - The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - The Network Access API cannot honor the request because the protocol is not known. - The requested operation is invalid for this protocol. - An unknown network-related error was detected. - An unknown proxy-related error was detected. - An unknonwn error related to the remote content was detected. - A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - <strong>Unknown network error (code: %1).</string> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> - <h1>SSL Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> EditBookmarks - Edit Bookmarks - + - - - Use Drag/Drop to move, double-click to edit. @@ -773,7 +615,6 @@ openssl-%7 ErrorLog - Error Log @@ -781,7 +622,6 @@ openssl-%7 LoginCertificate - User Login Certificate @@ -789,67 +629,51 @@ openssl-%7 PinEntry - Certificate PIN Entry - SwissSign Pin Entry - Please enter your PIN to unlock Certificate - PIN: - Name: - - - TextLabel - E-Mail: - - SuisseID Number: - %1 PIN attempts left - bad or locked certificate - Show Certificate Details - Postzertifikat: title for postzertificate serial number - there are %1 PIN attempts left @@ -857,12 +681,10 @@ openssl-%7 QMessageBox - Wrong PIN - Authentication failed, please try again. @@ -870,13 +692,11 @@ openssl-%7 QObject - SwissBrowser application name - Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -904,153 +724,42 @@ Environment: - Cannot read PEM certificate from file: %1 - Read PEM certificates from file: %1 - Cannot read PEM RSA key from file: %1 - Read private key from file: %1 - Too few arguments. Try: %1 --help - - SaveOrRun - - - File Exists - - - - - File already exists: - -%1 - -Overwrite? - - - - - Save File As ... - - - - - Open File With ... - - - - - Dokumente - Documents folder in local language - - - - - Arbeitsfläche - Desktop folder in local language - - - - - Download - - - - - File: - - - - - - - ... - - - - - Type: - - - - - Source - - - - - Save File - - - - - Save File As: - - - - - - browse ... - - - - - remember save path - - - - - Open in External Application - - - - - Open File in: - - - - - remember tool for this type - - - Settings - Settings - Web - Network Connections - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1059,12 +768,10 @@ p, li { white-space: pre-wrap; } - auto load images - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1073,27 +780,22 @@ p, li { white-space: pre-wrap; } - DNS prefetch enabled - Rendering - Specifies whether JavaScript programs can open new windows. - JavaScript can open windows - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1102,12 +804,10 @@ p, li { white-space: pre-wrap; } - spatial navigation - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1116,12 +816,10 @@ p, li { white-space: pre-wrap; } - fokus links - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1130,12 +828,10 @@ p, li { white-space: pre-wrap; } - zoom text only - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1144,12 +840,10 @@ p, li { white-space: pre-wrap; } - print element backgrounds - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1158,12 +852,10 @@ p, li { white-space: pre-wrap; } - accelerated composing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1172,12 +864,10 @@ p, li { white-space: pre-wrap; } - tiled backing store - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1186,12 +876,10 @@ p, li { white-space: pre-wrap; } - frame flattening - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1200,22 +888,18 @@ p, li { white-space: pre-wrap; } - site specific quirks - Security - Extensions - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1224,12 +908,10 @@ p, li { white-space: pre-wrap; } - JavaScript - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1238,12 +920,10 @@ p, li { white-space: pre-wrap; } - Java - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1252,17 +932,14 @@ p, li { white-space: pre-wrap; } - Netscape plugins - Extras - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1271,17 +948,14 @@ p, li { white-space: pre-wrap; } - developer extras - Privacy - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1290,12 +964,10 @@ p, li { white-space: pre-wrap; } - private browsing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1304,12 +976,10 @@ p, li { white-space: pre-wrap; } - JavaScript can access clipboard - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1318,12 +988,10 @@ p, li { white-space: pre-wrap; } - offline storage database - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1332,12 +1000,10 @@ p, li { white-space: pre-wrap; } - offline webapplication cache - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1346,12 +1012,10 @@ p, li { white-space: pre-wrap; } - local storage - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1360,54 +1024,10 @@ p, li { white-space: pre-wrap; } - - Search Engines - - - - - Scheme - - - - - Query URL - - - - - Use %1 as placeholder for the query, use %2 as placeholder for your system language. - Use <QUERY> as placeholder for the query. - - - - - Session - - - - - Session Management - - - - - save window state when opened withiut URL - save window state - - - - - close mimetype helper applications on exit - - - - local content can access remote urls - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1416,12 +1036,10 @@ p, li { white-space: pre-wrap; } - local content can access file URLs - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1430,55 +1048,72 @@ p, li { white-space: pre-wrap; } - cross site scripting auditing - Applications - Mime-Type - Ext - Program - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">%1</span> as file name placeholder.</p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">&lt;FILENAME&gt;</span> as file name placeholder.</p></body></html> - - + - - - + + Search Engines + + + + Scheme + + + + Query URL + + + + Use %1 as placeholder for the query, use %2 as placeholder for your system language. + + + + Session + + + + Session Management + + + + save window state when opened withiut URL + + + + close mimetype helper applications on exit + + diff --git a/src/swissbrowser_it.ts b/src/swissbrowser_it.ts index eb48237..9f16069 100644 --- a/src/swissbrowser_it.ts +++ b/src/swissbrowser_it.ts @@ -5,27 +5,22 @@ Authentication - Authorization - Authentication required for: - realm - Username: - Password: @@ -33,413 +28,328 @@ Browser - SwissBrowser - toolBar - &File - Edit - History - Info - - neu laden - - - - - F5 - - - - - stoppen - - - - - - Esc - - - - - zurückkehren - - - - - weitergehen - - - - - Startseite - - - - - Ctrl+Home - - - - - &New Browser - - - - - New Browser Window - - - - - Ctrl+N - - - - - Ctrl+W - - - - - &Proxy... - - - - Bookmarks - + neu laden + + + + F5 + + + + stoppen + + + + Esc + + + + zurückkehren + + + Alt+Left - + weitergehen + + + Alt+Right - + Startseite + + + + Ctrl+Home + + + + &New Browser + + + + New Browser Window + + + + Ctrl+N + + + &Quit - + &Proxy... + + + Print ... - Print Pre&view ... - Quick &Print - Ctrl+P - Next Tab - Shift+Right - Previous Tab - Shift+Left - - New Tab - Add New Tab - Ctrl+T - Find - find in page - Ctrl+F - Close Find - &About - &Settings ... - &Reverse Find - Ctrl+R - Error Log - show error logs - User Login Certificate - &Proxy ... - Clear Location - clear location bar - Add Bookmark - add bookmark to location bar - Ctrl+D - &Bookmarks - Clear Find - clear find bar - &Close Tab - + Ctrl+W + + + Sa&ve Session - &Load Session - Search - Clear Search - background-color: white search engines combobox - SSL Not Supported - SSL is not supported on your system - Checking: %1 - Forbidden: %1 - Access Denied - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - Reading: %1 - Illegal URL: %1 - gg - http://www.google.com/search?hl=%2&q=%1 - Zoom: %1% - opening new window - Print Document - %1 - %2 statusbar actionBack_hovered %1=url %2=title - %1 - %2 statusbar actionForward_hovered %1=url %2=title - - background-color: white neutral find - - background-color: #ADA text found - - background-color: #F77 text not found - About - %8 Version: %1 Builddate: %2 @@ -451,58 +361,46 @@ openssl-%7 - %1 - Info: %1 - done. - %1 statusbar for hovered link %1=url - launching application ... - errors show error log - - background-color: #F77 invalid url - - background-color: white valid url - authentication required - ssl error @@ -510,103 +408,83 @@ openssl-%7 Certificate - Form - Attribute - Value - Valid Since - Valid Until - SuisseID Number - Certificate Serial Number - Subject Info - Alternate Subject - Issuer Info - E-Mail - URL - error unknown certificate subject alternate name - Organization - Common Name - Locality - Organizational Unit - Country - State or Province - error unknown certificate subject info @@ -615,127 +493,102 @@ openssl-%7 DownloadManager - Network connection successful, remote host can be reached. - The remote server refused the connection (the server is not accepting requests). - The remote server closed the connection prematurely, before the entire reply was received and processed. - The remote host name was not found (invalid hostname). - The connection to the remote server timed out. - The operation was canceled via calls to abort() or close() before it was finished. - The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - The connection to the proxy server was refused (the proxy server is not accepting requests). - The proxy server closed the connection prematurely, before the entire reply was received and processed. - The proxy host name was not found (invalid proxy hostname). - The connection to the proxy timed out or the proxy did not reply in time to the request sent. - The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). - The access to the remote content was denied (similar to HTTP error 401). - The operation requested on the remote content is not permitted. - The remote content was not found at the server (similar to HTTP error 404). - The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - The Network Access API cannot honor the request because the protocol is not known. - The requested operation is invalid for this protocol. - An unknown network-related error was detected. - An unknown proxy-related error was detected. - An unknonwn error related to the remote content was detected. - A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - <strong>Unknown network error (code: %1).</string> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -743,22 +596,18 @@ openssl-%7 EditBookmarks - Edit Bookmarks - + - - - Use Drag/Drop to move, double-click to edit. @@ -766,7 +615,6 @@ openssl-%7 ErrorLog - Error Log @@ -774,7 +622,6 @@ openssl-%7 LoginCertificate - User Login Certificate @@ -782,66 +629,51 @@ openssl-%7 PinEntry - Certificate PIN Entry - Please enter your PIN to unlock Certificate - PIN: - Name: - - - TextLabel - E-Mail: - - SuisseID Number: - %1 PIN attempts left - bad or locked certificate - Show Certificate Details - Postzertifikat: title for postzertificate serial number - there are %1 PIN attempts left @@ -849,12 +681,10 @@ openssl-%7 QMessageBox - Wrong PIN - Authentication failed, please try again. @@ -862,13 +692,11 @@ openssl-%7 QObject - SwissBrowser application name - Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -896,153 +724,42 @@ Environment: - Cannot read PEM certificate from file: %1 - Read PEM certificates from file: %1 - Cannot read PEM RSA key from file: %1 - Read private key from file: %1 - Too few arguments. Try: %1 --help - - SaveOrRun - - - File Exists - - - - - File already exists: - -%1 - -Overwrite? - - - - - Save File As ... - - - - - Open File With ... - - - - - Dokumente - Documents folder in local language - - - - - Arbeitsfläche - Desktop folder in local language - - - - - Download - - - - - File: - - - - - - - ... - - - - - Type: - - - - - Source - - - - - Save File - - - - - Save File As: - - - - - - browse ... - - - - - remember save path - - - - - Open in External Application - - - - - Open File in: - - - - - remember tool for this type - - - Settings - Settings - Web - Network Connections - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1051,12 +768,10 @@ p, li { white-space: pre-wrap; } - auto load images - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1065,27 +780,22 @@ p, li { white-space: pre-wrap; } - DNS prefetch enabled - Rendering - Specifies whether JavaScript programs can open new windows. - JavaScript can open windows - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1094,12 +804,10 @@ p, li { white-space: pre-wrap; } - spatial navigation - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1108,12 +816,10 @@ p, li { white-space: pre-wrap; } - fokus links - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1122,12 +828,10 @@ p, li { white-space: pre-wrap; } - zoom text only - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1136,12 +840,10 @@ p, li { white-space: pre-wrap; } - print element backgrounds - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1150,12 +852,10 @@ p, li { white-space: pre-wrap; } - accelerated composing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1164,12 +864,10 @@ p, li { white-space: pre-wrap; } - tiled backing store - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1178,12 +876,10 @@ p, li { white-space: pre-wrap; } - frame flattening - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1192,22 +888,18 @@ p, li { white-space: pre-wrap; } - site specific quirks - Security - Extensions - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1216,12 +908,10 @@ p, li { white-space: pre-wrap; } - JavaScript - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1230,12 +920,10 @@ p, li { white-space: pre-wrap; } - Java - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1244,17 +932,14 @@ p, li { white-space: pre-wrap; } - Netscape plugins - Extras - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1263,17 +948,14 @@ p, li { white-space: pre-wrap; } - developer extras - Privacy - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1282,12 +964,10 @@ p, li { white-space: pre-wrap; } - private browsing - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1296,12 +976,10 @@ p, li { white-space: pre-wrap; } - JavaScript can access clipboard - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1310,12 +988,10 @@ p, li { white-space: pre-wrap; } - offline storage database - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1324,12 +1000,10 @@ p, li { white-space: pre-wrap; } - offline webapplication cache - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1338,12 +1012,10 @@ p, li { white-space: pre-wrap; } - local storage - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1352,12 +1024,10 @@ p, li { white-space: pre-wrap; } - local content can access remote urls - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1366,12 +1036,10 @@ p, li { white-space: pre-wrap; } - local content can access file URLs - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1380,32 +1048,26 @@ p, li { white-space: pre-wrap; } - cross site scripting auditing - Applications - Mime-Type - Ext - Program - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1414,55 +1076,42 @@ p, li { white-space: pre-wrap; } - - + - - - - Search Engines - Scheme - Query URL - Use %1 as placeholder for the query, use %2 as placeholder for your system language. - Session - Session Management - save window state when opened withiut URL - save window state - close mimetype helper applications on exit diff --git a/swissbrowser.spec.in b/swissbrowser.spec.in index bdd729b..9059e85 100644 --- a/swissbrowser.spec.in +++ b/swissbrowser.spec.in @@ -1,9 +1,9 @@ -Summary: @PACKAGENAME@ PLEASE DESCRIBE +Summary: @PACKAGENAME@ PKCS#11 aware WebKit Browser Name: @PACKAGENAME@ Version: @VERSION@ Release: 1 License: LGPL -Group: Development/Libraries/C++ +Group: Applications/Internet URL: https://dev.swisssign.com/projects/@PACKAGENAME@ Source0: %{name}-%{version}.tar.gz BuildRequires: subversion libcppunit-devel gcc-c++ doxygen graphviz texlive automake autoconf libtool make @@ -15,13 +15,13 @@ Obsoletes: swisssurfer %description @README@ -This package contains only the shared libraries required at runtime. +This package contains the program and shared libraries required at runtime. %prep %setup -q ./configure --prefix=/usr \ --docdir=/usr/share/doc/packages/@PACKAGENAME@ \ - --libdir=/usr/lib + --libdir=/usr/%_lib %build make @@ -42,10 +42,25 @@ rm -rf $RPM_BUILD_ROOT /usr/share/applications/@PACKAGENAME@.desktop /usr/share/swissbrowser/swissbrowser.png /usr/share/swissbrowser/swissbrowser.xpm +/usr/%_lib/lib*.so.* %doc /usr/share/doc/packages/@PACKAGENAME@/AUTHORS /usr/share/doc/packages/@PACKAGENAME@/ChangeLog /usr/share/doc/packages/@PACKAGENAME@/NEWS /usr/share/doc/packages/@PACKAGENAME@/README +%package devel +Summary: @PACKAGENAME@ PKCS#11 aware WebKit Browser (development files) +Group: Development/Libraries/C++ + +%description devel +@README@ + +This Package contains all files required for developement. + +%files devel +%defattr(-,root,root,-) +/usr/share/qt4 +/usr/%_lib/lib*.so + %changelog