undo last change r367 due to typo

README

@@ -8,5 +8,4 @@ Start e.g. with:
 
 SWISSSIGNER='java -Xmx256M -Dorg.jpedal.jai=true -Dswing.aatext=true -Dch.abacus.swisssigner.incamail.certlogin=false -splash:swisssigner-splash.png -Dch.abacus.pkcs11.configuration=swisssigner-pkcs11.cfg -Duser.language=de -cp /home/marc/downloads/swisssigner/swisssigner.jar:/home/marc/downloads/swisssigner/bc.jar:bcmail.jar:/home/marc/downloads/swisssigner/bcpg.jar:/home/marc/downloads/swisssigner/bctsp.jar:/home/marc/downloads/swisssigner/exml.jar:/home/marc/downloads/swisssigner/itext.jar:/home/marc/downloads/swisssigner/jai_codec.jar:/home/marc/downloads/swisssigner/jai_core.jar:/home/marc/downloads/swisssigner/jai_imageio.jar:/home/marc/downloads/swisssigner/jdic.jar:/home/marc/downloads/swisssigner/jdic_native.jar:/home/marc/downloads/swisssigner/jdic_stub_unix.jar:/home/marc/downloads/swisssigner/jpedal.jar: ch.abacus.hotdog.SwissSigner locale=de document=%1 browser_bin=firefox keystores=pkcs11'
 
-src/swisssurfer --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten
+src/swissbrowser --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten
-src/swisssurfer --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten

configure.in

@@ -21,8 +21,7 @@ SRC_DIR=src
 TST_DIR=test
 DOC_DIR=doc
 
-m4_define(x_packagename, swisssurfer)
+m4_define(x_packagename, swissbrowser)
-m4_define(x_packagename, swisssurfer)
 m4_define(x_major, 1)
 m4_define(x_minor, 2)
 

debian/changelog.in

@@ -1,6 +1,5 @@
 @PACKAGE@ (@VERSION@-1) unstable; urgency=low
 
-  * see https://dev.swisssign.com/projects/swisssurfer for changes
+  * see https://dev.swisssign.com/projects/swissbrowser for changes
-  * see https://dev.swisssign.com/projects/swisssurfer for changes
 
  -- Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>  Wed, 07 Apr 2010 10:23:02 +0200

debian/control

@@ -1,34 +1,27 @@
-Source: swisssurfer
+Source: swissbrowser
-Source: swisssurfer
 Section: web
 Priority: extra
 Maintainer: Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>
 Build-Depends: debhelper (>= 7), autotools-dev, libpkcs11-helper1-dev
 Standards-Version: 3.8.1
-Homepage: https://dev.swisssign.com/projects/swisssurfer
+Homepage: https://dev.swisssign.com/projects/swissbrowser
-Homepage: https://dev.swisssign.com/projects/swisssurfer
 
-Package: swisssurfer-dev
+Package: swissbrowser-dev
-Package: swisssurfer-dev
 Provides: swisssurfer-dev
 Conflicts: swisssurfer-dev
 Replaces: swisssurfer-dev
 Section: devel
 Architecture: any
-Depends: swisssurfer (= ${binary:Version})
+Depends: swissbrowser (= ${binary:Version})
-Depends: swisssurfer (= ${binary:Version})
+Description: swissbrowser
-Description: swisssurfer
-Description: swisssurfer
  .
 
-Package: swisssurfer
+Package: swissbrowser
-Package: swisssurfer
 Provides: swisssurfer
 Conflicts: swisssurfer
 Replaces: swisssurfer
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: swisssurfer
+Description: swissbrowser
-Description: swisssurfer
  .

debian/copyright

@@ -1,8 +1,7 @@
 This package was debianized by Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com> on
 Wed, 07 Apr 2010 10:23:02 +0200.
 
-It was downloaded from https://dev.swisssign.com/projects/swisssurfer
+It was downloaded from https://dev.swisssign.com/projects/swissbrowser
-It was downloaded from https://dev.swisssign.com/projects/swisssurfer
 
 Upstream Author(s):
 

debian/menu

@@ -1,13 +1,8 @@
-?package(swisssurfer):\
+?package(swissbrowser):\
-?package(swisssurfer):\
   needs="X11"\
   hints="Lightweight,Fast,Small,Security,SSL,Cryptoki,Certificate"\
   section="Applications/Network/Web Browsing"\
-  title="SwissSurfer"\
+  title="SwissBrowser"\
-  title="SwissSurfer"\
+  longtitle="SwissBrowser Internet Browser"\
-  longtitle="SwissSurfer Internet Browser"\
+  command="/usr/bin/swissbrowser"\
-  longtitle="SwissSurfer Internet Browser"\
+  icon="/usr/share/swissbrowser/swissbrowser.xpm"
-  command="/usr/bin/swisssurfer"\
-  command="/usr/bin/swisssurfer"\
-  icon="/usr/share/swisssurfer/swisssurfer.xpm"
-  icon="/usr/share/swisssurfer/swisssurfer.xpm"

debian/swissbrowser-dev.install

@@ -1,5 +1,4 @@
-usr/share/doc/swisssurfer/html
+usr/share/doc/swissbrowser/html
-usr/share/doc/swisssurfer/html
 usr/include/*
 #usr/lib/lib*.a
 usr/lib/lib*.so

debian/swissbrowser.doc-base.EX

@@ -1,10 +1,7 @@
-Document: swisssurfer
+Document: swissbrowser
-Document: swisssurfer
+Title: Debian swissbrowser Manual
-Title: Debian swisssurfer Manual
-Title: Debian swisssurfer Manual
 Author: <insert document author here>
-Abstract: This manual describes what swisssurfer is
+Abstract: This manual describes what swissbrowser is
-Abstract: This manual describes what swisssurfer is
  and how it can be used to
  manage online manuals on Debian systems.
 Section: unknown

debian/swissbrowser.install

@@ -0,0 +1,11 @@
+usr/bin/swissbrowser
+usr/share/applications/swissbrowser.desktop
+usr/share/swissbrowser/swissbrowser.xpm
+usr/share/swissbrowser/swissbrowser.png
+usr/share/doc/swissbrowser/AUTHORS
+usr/share/doc/swissbrowser/NEWS
+usr/share/doc/swissbrowser/README
+usr/share/doc/swissbrowser/COPYING
+usr/share/doc/swissbrowser/INSTALL
+usr/share/doc/swissbrowser/ChangeLog
+usr/lib/lib*.so.*

debian/swisssurfer.install

@@ -1,21 +0,0 @@
-usr/bin/swisssurfer
-usr/bin/swisssurfer
-usr/share/applications/swisssurfer.desktop
-usr/share/applications/swisssurfer.desktop
-usr/share/swisssurfer/swisssurfer.xpm
-usr/share/swisssurfer/swisssurfer.xpm
-usr/share/swisssurfer/swisssurfer.png
-usr/share/swisssurfer/swisssurfer.png
-usr/share/doc/swisssurfer/AUTHORS
-usr/share/doc/swisssurfer/AUTHORS
-usr/share/doc/swisssurfer/NEWS
-usr/share/doc/swisssurfer/NEWS
-usr/share/doc/swisssurfer/README
-usr/share/doc/swisssurfer/README
-usr/share/doc/swisssurfer/COPYING
-usr/share/doc/swisssurfer/COPYING
-usr/share/doc/swisssurfer/INSTALL
-usr/share/doc/swisssurfer/INSTALL
-usr/share/doc/swisssurfer/ChangeLog
-usr/share/doc/swisssurfer/ChangeLog
-usr/lib/lib*.so.*

src/Info.plist

@@ -5,21 +5,17 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>swisssurfer</string>
+	<string>swissbrowser</string>
-	<string>swisssurfer</string>
 	<key>CFBundleGetInfoString</key>
 	<string>SwissSign, (c) 2011</string>
 	<key>CFBundleIconFile</key>
-	<string>swisssurfer.icns</string>
+	<string>swissbrowser.icns</string>
-	<string>swisssurfer.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.swisssign.swisssurfer</string>
+	<string>com.swisssign.swissbrowser</string>
-	<string>com.swisssign.swisssurfer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>SwissSurfer</string>
+	<string>SwissBrowser</string>
-	<string>SwissSurfer</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

src/browser.hxx

@@ -1019,8 +1019,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
     void resetWindowTitle() {
       if (qobject_cast<QWebView*>(_tabs->currentWidget()))
-        setWindowTitle(trUtf8("[%1] - %2 - SwissSurfer (%3)",
+        setWindowTitle(trUtf8("[%1] - %2 - SwissBrowser (%3)",
-        setWindowTitle(trUtf8("[%1] - %2 - SwissSurfer (%3)",
                               "main window title "
                               "%1 = host name "
                               "%2 = page title "
@@ -1031,8 +1030,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
                             ->title()))
                        .arg(_tabs->count()));
       else
-        setWindowTitle(trUtf8("SwissSurfer", "window title with no tab"));
+        setWindowTitle(trUtf8("SwissBrowser", "window title with no tab"));
-        setWindowTitle(trUtf8("SwissSurfer", "window title with no tab"));
     }
     
     void statusBarMessage(const QString& text) {

src/browser.ui

@@ -11,13 +11,11 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SwissSurfer</string>
+   <string>SwissBrowser</string>
-   <string>SwissSurfer</string>
   </property>
   <property name="windowIcon">
    <iconset resource="resources.qrc">
-    <normaloff>:/icons/32x32/swisssurfer.png</normaloff>:/icons/32x32/swisssurfer.png</iconset>
+    <normaloff>:/icons/32x32/swissbrowser.png</normaloff>:/icons/32x32/swissbrowser.png</iconset>
-    <normaloff>:/icons/32x32/swisssurfer.png</normaloff>:/icons/32x32/swisssurfer.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_3">

src/main.cxx

@@ -29,8 +29,7 @@
 #include <memory>
 
 
-//! @defgroup browser The SwissSurfer Executable and Main Window
+//! @defgroup browser The SwissBrowser Executable and Main Window
-//! @defgroup browser The SwissSurfer Executable and Main Window
 //! @defgroup pkcs11 The PKCS#11 Client Authentication
 //! @defgroup qbrowserlib The Swiss Browser Library
 //! @defgroup designer Qt Designer Plugin for Browser Related Widgets
@@ -116,18 +115,15 @@ int main(int argv, char** argc) try {
   QTextCodec::setCodecForLocale(utf8);
   QTextCodec::setCodecForTr(utf8);
   QApplication app(argv, argc);
-  app.setWindowIcon(QIcon(":/icons/32x32/swisssurfer.png"));
+  app.setWindowIcon(QIcon(":/icons/32x32/swissbrowser.png"));
-  app.setWindowIcon(QIcon(":/icons/32x32/swisssurfer.png"));
+  app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name"));
-  app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name"));
-  app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name"));
   app.setApplicationVersion(VERSION);
   QTranslator qtTranslator;
   if (env().contains("LANGUAGE")) QLocale::setDefault(env()["LANGUAGE"]);
   qtTranslator.load(":/language/qt_" + QLocale().name());
   app.installTranslator(&qtTranslator);
   QTranslator appTranslator;
-  appTranslator.load(":/language/swisssurfer_"+ QLocale().name());
+  appTranslator.load(":/language/swissbrowser_"+ QLocale().name());
-  appTranslator.load(":/language/swisssurfer_"+ QLocale().name());
   app.installTranslator(&appTranslator);
   //----------------------------------------------------------------------------
   TMP=QDir::toNativeSeparators(QDir::tempPath());
@@ -155,8 +151,7 @@ int main(int argv, char** argc) try {
   bool editbookmarks(false);
   QStringList args(app.arguments());
   std::auto_ptr<QSettings> settings
-    (std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissSurfer")));
+    (std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissBrowser")));
-    (std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissSurfer")));
   for (QStringList::iterator it(args.begin()); ++it!=args.end();)
     if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") {
       std::cout<<helptext().toStdString()<<std::endl;

src/makefile.am

@@ -38,8 +38,7 @@ ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/src/*.ui $(shell find ${top_s
 QMAKE_PROJECT = qmake.pro
 QMAKE_MAKEFILE = makefile.qmake
 
-bin_SCRIPTS = swisssurfer
+bin_SCRIPTS = swissbrowser
-bin_SCRIPTS = swisssurfer
 QMAKE_TARGET = ${bin_SCRIPTS}
 
 TARGETS = ${QMAKE_TARGET}
@@ -105,7 +104,6 @@ clean-local:
 
 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
              *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
-	     ${QMAKE_TARGET} object_script.swisssurfer \
+	     ${QMAKE_TARGET} object_script.swissbrowser \
-	     ${QMAKE_TARGET} object_script.swisssurfer \
 	     @PACKAGENAME@.xpm
 MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}

src/qbrowserlib/qbrowserlib_de.ts

@@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; }
 <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;">
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/qbrowserlib/qbrowserlib_en.ts

@@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; }
 <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;">
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/qbrowserlib/qbrowserlib_fr.ts

@@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; }
 <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;">
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/qbrowserlib/qbrowserlib_it.ts

@@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; }
 <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;">
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/qbrowserlib/settings.ui

@@ -53,8 +53,7 @@ p, li { white-space: pre-wrap; }
 <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;">
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="text">
                <string>DNS prefetch enabled</string>
@@ -343,8 +342,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:medium; color:#363534;&quot;&gt;Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="text">
                <string>private browsing</string>

src/qmake.pro.in

@@ -29,8 +29,7 @@ win32 {
   QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
   CONFIG += release
 }
-ICON = swisssurfer.icns
+ICON = swissbrowser.icns
-ICON = swisssurfer.icns
 
 TRANSLATIONS = @PACKAGENAME@_en.ts \
                @PACKAGENAME@_de.ts \

src/resources.qrc

@@ -1,8 +1,7 @@
 <RCC>
   <qresource prefix="icons/32x32">
     <file alias="butt32_49.png">resources/icons/32x32/butt32_49.png</file>
-    <file alias="swisssurfer.png">resources/icons/32x32/swisssurfer.png</file>
+    <file alias="swissbrowser.png">resources/icons/32x32/swissbrowser.png</file>
-    <file alias="swisssurfer.png">resources/icons/32x32/swisssurfer.png</file>
     <file alias="butt32_01.png">resources/icons/32x32/butt32_01.png</file>
     <file alias="butt32_02.png">resources/icons/32x32/butt32_02.png</file>
     <file alias="butt32_03.png">resources/icons/32x32/butt32_03.png</file>
@@ -19,8 +18,7 @@
   </qresource>
   <qresource prefix="icons/16x16">
     <file alias="butt16_49.png">resources/icons/16x16/butt16_49.png</file>
-    <file alias="swisssurfer.png">resources/icons/16x16/swisssurfer.png</file>
+    <file alias="swissbrowser.png">resources/icons/16x16/swissbrowser.png</file>
-    <file alias="swisssurfer.png">resources/icons/16x16/swisssurfer.png</file>
     <file alias="butt16_01.png">resources/icons/16x16/butt16_01.png</file>
     <file alias="butt16_02.png">resources/icons/16x16/butt16_02.png</file>
     <file alias="butt16_03.png">resources/icons/16x16/butt16_03.png</file>

src/swissbrowser.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=swissbrowser
+Name[de]=swissbrowser
+Name[fr]=swissbrowser
+Name[it]=swissbrowser
+Name[en]=swissbrowser
+GenericName=SwissBrowser
+Comment=Browser with SuisseID login
+Icon=/usr/share/swissbrowser/swissbrowser.png
+Categories=Network;WebBrowser
+Exec=/usr/bin/swissbrowser

src/swissbrowser_de.ts

@@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.ui" line="14"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.hxx" line="1017"/>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
+        <source>[%1] - %2 - SwissBrowser (%3)</source>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
         <comment>main window title %1 = host name %2 = page title %3 = number of open tabs</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.hxx" line="1028"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>window title with no tab</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="main.cxx" line="119"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>

src/swissbrowser_en.ts

@@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.ui" line="14"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.hxx" line="1017"/>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
+        <source>[%1] - %2 - SwissBrowser (%3)</source>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
         <comment>main window title %1 = host name %2 = page title %3 = number of open tabs</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.hxx" line="1028"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>window title with no tab</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="main.cxx" line="119"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>

src/swissbrowser_fr.ts

@@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.ui" line="14"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.hxx" line="1017"/>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
+        <source>[%1] - %2 - SwissBrowser (%3)</source>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
         <comment>main window title %1 = host name %2 = page title %3 = number of open tabs</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.hxx" line="1028"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>window title with no tab</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="main.cxx" line="119"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>

src/swissbrowser_it.ts

@@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.ui" line="14"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="browser.hxx" line="1017"/>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
+        <source>[%1] - %2 - SwissBrowser (%3)</source>
-        <source>[%1] - %2 - SwissSurfer (%3)</source>
         <comment>main window title %1 = host name %2 = page title %3 = number of open tabs</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.hxx" line="1028"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>window title with no tab</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof
     </message>
     <message>
         <location filename="main.cxx" line="119"/>
-        <source>SwissSurfer</source>
+        <source>SwissBrowser</source>
-        <source>SwissSurfer</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>

src/swisssurfer.desktop

@@ -1,20 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=swisssurfer
-Name=swisssurfer
-Name[de]=swisssurfer
-Name[de]=swisssurfer
-Name[fr]=swisssurfer
-Name[fr]=swisssurfer
-Name[it]=swisssurfer
-Name[it]=swisssurfer
-Name[en]=swisssurfer
-Name[en]=swisssurfer
-GenericName=SwissSurfer
-GenericName=SwissSurfer
-Comment=Browser with SuisseID login
-Icon=/usr/share/swisssurfer/swisssurfer.png
-Icon=/usr/share/swisssurfer/swisssurfer.png
-Categories=Network;WebBrowser
-Exec=/usr/bin/swisssurfer
-Exec=/usr/bin/swisssurfer

swissbrowser.spec.in

@@ -38,8 +38,7 @@ DESTDIR=$RPM_BUILD_ROOT make install
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/html
 rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/COPYING
 rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/INSTALL
-rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec
+rm $RPM_BUILD_ROOT/usr/share/doc/packages/swissbrowser/swissbrowser.spec
-rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,10 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 /usr/bin/@PACKAGENAME@
 /usr/share/applications/@PACKAGENAME@.desktop
-/usr/share/swisssurfer/swisssurfer.png
+/usr/share/swissbrowser/swissbrowser.png
-/usr/share/swisssurfer/swisssurfer.png
+/usr/share/swissbrowser/swissbrowser.xpm
-/usr/share/swisssurfer/swisssurfer.xpm
-/usr/share/swisssurfer/swisssurfer.xpm
 /usr/%_lib/lib*.so.*
 %doc
 /usr/share/doc/packages/@PACKAGENAME@/AUTHORS