From 1ea480679aff10dedf92cde62d97bc277962d263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sun, 8 Mar 2015 19:16:40 +0000 Subject: [PATCH] renamed swissbrowser to swisssurfer; redo change r367 but without typo --- README | 2 +- configure.in | 2 +- debian/changelog.in | 2 +- debian/control | 14 +++++++------- debian/copyright | 2 +- debian/menu | 10 +++++----- debian/swissbrowser.install | 11 ----------- ...sbrowser-dev.dirs => swisssurfer-dev.dirs} | 0 ...er-dev.install => swisssurfer-dev.install} | 2 +- .../{swissbrowser.dirs => swisssurfer.dirs} | 0 ...er.doc-base.EX => swisssurfer.doc-base.EX} | 6 +++--- debian/swisssurfer.install | 11 +++++++++++ doc/screenshot.png | Bin 285892 -> 285891 bytes src/Info.plist | 8 ++++---- src/browser.hxx | 4 ++-- src/browser.ui | 4 ++-- src/main.cxx | 10 +++++----- src/makefile.am | 4 ++-- src/qbrowserlib/qbrowserlib_de.ts | 4 ++-- src/qbrowserlib/qbrowserlib_en.ts | 4 ++-- src/qbrowserlib/qbrowserlib_fr.ts | 4 ++-- src/qbrowserlib/qbrowserlib_it.ts | 4 ++-- src/qbrowserlib/settings.ui | 4 ++-- src/qmake.pro.in | 2 +- src/resources.qrc | 4 ++-- ...8x32.png => SW_SwissSurfer_128x128x32.png} | Bin .../{swissbrowser.png => swisssurfer.png} | Bin ...6x32.png => SW_SwissSurfer_256x256x32.png} | Bin .../{swissbrowser.png => swisssurfer.png} | Bin ...x48x32.png => SW_SwissSurfer_48x48x32.png} | Bin ...2x32.png => SW_SwissSurfer_512x512x32.png} | Bin src/resources/icons/about.png | Bin 11472 -> 11470 bytes src/resources/icons/addbookmark.png | Bin 19710 -> 19708 bytes src/resources/icons/clearlocation.png | Bin 11983 -> 11981 bytes src/resources/icons/close.png | Bin 15280 -> 15278 bytes src/resources/icons/error.png | Bin 4420 -> 4418 bytes src/resources/icons/find.png | Bin 20860 -> 20858 bytes src/resources/icons/newtab.png | Bin 7650 -> 7648 bytes src/resources/icons/newwindow.png | Bin 7518 -> 7516 bytes src/resources/icons/print.png | Bin 4173 -> 4171 bytes src/resources/icons/printpreview.png | Bin 5634 -> 5632 bytes src/resources/icons/settings.png | Bin 18326 -> 18324 bytes .../{swissbrowser.ico => swisssurfer.ico} | Bin .../{swissbrowser.png => swisssurfer.png} | Bin ..._32x32x32.png => swisssurfer_32x32x32.png} | Bin src/resources/icons/usercert.png | Bin 25145 -> 25143 bytes .../{swissbrowser.png => swisssurfer.png} | Bin src/swissbrowser.desktop | 12 ------------ src/swisssurfer.desktop | 12 ++++++++++++ src/{swissbrowser.icns => swisssurfer.icns} | Bin src/{swissbrowser_de.ts => swisssurfer_de.ts} | 8 ++++---- src/{swissbrowser_en.ts => swisssurfer_en.ts} | 8 ++++---- src/{swissbrowser_fr.ts => swisssurfer_fr.ts} | 8 ++++---- src/{swissbrowser_it.ts => swisssurfer_it.ts} | 8 ++++---- swissbrowser.spec.in => swisssurfer.spec.in | 6 +++--- 55 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 debian/swissbrowser.install rename debian/{swissbrowser-dev.dirs => swisssurfer-dev.dirs} (100%) rename debian/{swissbrowser-dev.install => swisssurfer-dev.install} (78%) rename debian/{swissbrowser.dirs => swisssurfer.dirs} (100%) rename debian/{swissbrowser.doc-base.EX => swisssurfer.doc-base.EX} (79%) create mode 100644 debian/swisssurfer.install rename src/resources/icons/128x128/{SW_SwissBrowser_128x128x32.png => SW_SwissSurfer_128x128x32.png} (100%) rename src/resources/icons/16x16/{swissbrowser.png => swisssurfer.png} (100%) rename src/resources/icons/256x256/{SW_SwissBrowser_256x256x32.png => SW_SwissSurfer_256x256x32.png} (100%) rename src/resources/icons/32x32/{swissbrowser.png => swisssurfer.png} (100%) rename src/resources/icons/48x48/{SW_SwissBrowser_48x48x32.png => SW_SwissSurfer_48x48x32.png} (100%) rename src/resources/icons/512x512/{SW_SwissBrowser_512x512x32.png => SW_SwissSurfer_512x512x32.png} (100%) rename src/resources/icons/{swissbrowser.ico => swisssurfer.ico} (100%) rename src/resources/icons/{swissbrowser.png => swisssurfer.png} (100%) rename src/resources/icons/{swissbrowser_32x32x32.png => swisssurfer_32x32x32.png} (100%) rename src/resources/{swissbrowser.png => swisssurfer.png} (100%) delete mode 100644 src/swissbrowser.desktop create mode 100644 src/swisssurfer.desktop rename src/{swissbrowser.icns => swisssurfer.icns} (100%) rename src/{swissbrowser_de.ts => swisssurfer_de.ts} (99%) rename src/{swissbrowser_en.ts => swisssurfer_en.ts} (99%) rename src/{swissbrowser_fr.ts => swisssurfer_fr.ts} (99%) rename src/{swissbrowser_it.ts => swisssurfer_it.ts} (99%) rename swissbrowser.spec.in => swisssurfer.spec.in (92%) diff --git a/README b/README index 3336832..e2cd478 100644 --- a/README +++ b/README @@ -8,4 +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/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 diff --git a/configure.in b/configure.in index 7b42233..4877c8a 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ SRC_DIR=src TST_DIR=test DOC_DIR=doc -m4_define(x_packagename, swissbrowser) +m4_define(x_packagename, swisssurfer) m4_define(x_major, 1) m4_define(x_minor, 2) diff --git a/debian/changelog.in b/debian/changelog.in index 5aef502..d3336a7 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,5 +1,5 @@ @PACKAGE@ (@VERSION@-1) unstable; urgency=low - * see https://dev.swisssign.com/projects/swissbrowser for changes + * see https://dev.swisssign.com/projects/swisssurfer for changes -- Marc Wäckerlin (SwissSign AG) Wed, 07 Apr 2010 10:23:02 +0200 diff --git a/debian/control b/debian/control index 97e2972..0de8c67 100644 --- a/debian/control +++ b/debian/control @@ -1,27 +1,27 @@ -Source: swissbrowser +Source: swisssurfer Section: web Priority: extra Maintainer: Marc Wäckerlin (SwissSign AG) Build-Depends: debhelper (>= 7), autotools-dev, libpkcs11-helper1-dev Standards-Version: 3.8.1 -Homepage: https://dev.swisssign.com/projects/swissbrowser +Homepage: https://dev.swisssign.com/projects/swisssurfer -Package: swissbrowser-dev +Package: swisssurfer-dev Provides: swisssurfer-dev Conflicts: swisssurfer-dev Replaces: swisssurfer-dev Section: devel Architecture: any -Depends: swissbrowser (= ${binary:Version}) -Description: swissbrowser +Depends: swisssurfer (= ${binary:Version}) +Description: swisssurfer . -Package: swissbrowser +Package: swisssurfer Provides: swisssurfer Conflicts: swisssurfer Replaces: swisssurfer Section: web Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: swissbrowser +Description: swisssurfer . diff --git a/debian/copyright b/debian/copyright index 8d73ff9..60e23e7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Marc Wäckerlin (SwissSign AG) on Wed, 07 Apr 2010 10:23:02 +0200. -It was downloaded from https://dev.swisssign.com/projects/swissbrowser +It was downloaded from https://dev.swisssign.com/projects/swisssurfer Upstream Author(s): diff --git a/debian/menu b/debian/menu index dde0d9b..dcfafc8 100644 --- a/debian/menu +++ b/debian/menu @@ -1,8 +1,8 @@ -?package(swissbrowser):\ +?package(swisssurfer):\ needs="X11"\ hints="Lightweight,Fast,Small,Security,SSL,Cryptoki,Certificate"\ section="Applications/Network/Web Browsing"\ - title="SwissBrowser"\ - longtitle="SwissBrowser Internet Browser"\ - command="/usr/bin/swissbrowser"\ - icon="/usr/share/swissbrowser/swissbrowser.xpm" + title="SwissSurfer"\ + longtitle="SwissSurfer Internet Browser"\ + command="/usr/bin/swisssurfer"\ + icon="/usr/share/swisssurfer/swisssurfer.xpm" diff --git a/debian/swissbrowser.install b/debian/swissbrowser.install deleted file mode 100644 index 0a3c163..0000000 --- a/debian/swissbrowser.install +++ /dev/null @@ -1,11 +0,0 @@ -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.* diff --git a/debian/swissbrowser-dev.dirs b/debian/swisssurfer-dev.dirs similarity index 100% rename from debian/swissbrowser-dev.dirs rename to debian/swisssurfer-dev.dirs diff --git a/debian/swissbrowser-dev.install b/debian/swisssurfer-dev.install similarity index 78% rename from debian/swissbrowser-dev.install rename to debian/swisssurfer-dev.install index 2473b5e..4ef85a0 100644 --- a/debian/swissbrowser-dev.install +++ b/debian/swisssurfer-dev.install @@ -1,4 +1,4 @@ -usr/share/doc/swissbrowser/html +usr/share/doc/swisssurfer/html usr/include/* #usr/lib/lib*.a usr/lib/lib*.so diff --git a/debian/swissbrowser.dirs b/debian/swisssurfer.dirs similarity index 100% rename from debian/swissbrowser.dirs rename to debian/swisssurfer.dirs diff --git a/debian/swissbrowser.doc-base.EX b/debian/swisssurfer.doc-base.EX similarity index 79% rename from debian/swissbrowser.doc-base.EX rename to debian/swisssurfer.doc-base.EX index b2a28aa..c9255c2 100644 --- a/debian/swissbrowser.doc-base.EX +++ b/debian/swisssurfer.doc-base.EX @@ -1,7 +1,7 @@ -Document: swissbrowser -Title: Debian swissbrowser Manual +Document: swisssurfer +Title: Debian swisssurfer Manual Author: -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 diff --git a/debian/swisssurfer.install b/debian/swisssurfer.install new file mode 100644 index 0000000..7212bd1 --- /dev/null +++ b/debian/swisssurfer.install @@ -0,0 +1,11 @@ +usr/bin/swisssurfer +usr/share/applications/swisssurfer.desktop +usr/share/swisssurfer/swisssurfer.xpm +usr/share/swisssurfer/swisssurfer.png +usr/share/doc/swisssurfer/AUTHORS +usr/share/doc/swisssurfer/NEWS +usr/share/doc/swisssurfer/README +usr/share/doc/swisssurfer/COPYING +usr/share/doc/swisssurfer/INSTALL +usr/share/doc/swisssurfer/ChangeLog +usr/lib/lib*.so.* diff --git a/doc/screenshot.png b/doc/screenshot.png index 1700c4a11c91120b8c5ac0dae7f6b273164cbe42..ceb2971eec62088081fc4402d9d8c966a4da3f0b 100644 GIT binary patch delta 29 kcmX@IQ}FOk!3lvZ#id1QjbW`}jICiztzpbt!&vfS0JkO!2mk;8 delta 30 lcmX@SQ}D=6!3lw^Nk#eP#f_n@p^UAeOs%2JTSHm$VgSR$3vmDd diff --git a/src/Info.plist b/src/Info.plist index 54150d2..81296ac 100644 --- a/src/Info.plist +++ b/src/Info.plist @@ -5,17 +5,17 @@ CFBundleDevelopmentRegion English CFBundleExecutable - swissbrowser + swisssurfer CFBundleGetInfoString SwissSign, (c) 2011 CFBundleIconFile - swissbrowser.icns + swisssurfer.icns CFBundleIdentifier - com.swisssign.swissbrowser + com.swisssign.swisssurfer CFBundleInfoDictionaryVersion 6.0 CFBundleName - SwissBrowser + SwissSurfer CFBundlePackageType APPL CFBundleShortVersionString diff --git a/src/browser.hxx b/src/browser.hxx index 7b19fbb..31a04cc 100644 --- a/src/browser.hxx +++ b/src/browser.hxx @@ -1019,7 +1019,7 @@ class Browser: public QMainWindow, protected Ui::Browser { void resetWindowTitle() { if (qobject_cast(_tabs->currentWidget())) - setWindowTitle(trUtf8("[%1] - %2 - SwissBrowser (%3)", + setWindowTitle(trUtf8("[%1] - %2 - SwissSurfer (%3)", "main window title " "%1 = host name " "%2 = page title " @@ -1030,7 +1030,7 @@ class Browser: public QMainWindow, protected Ui::Browser { ->title())) .arg(_tabs->count())); else - setWindowTitle(trUtf8("SwissBrowser", "window title with no tab")); + setWindowTitle(trUtf8("SwissSurfer", "window title with no tab")); } void statusBarMessage(const QString& text) { diff --git a/src/browser.ui b/src/browser.ui index 96d3084..55e97c8 100644 --- a/src/browser.ui +++ b/src/browser.ui @@ -11,11 +11,11 @@ - SwissBrowser + SwissSurfer - :/icons/32x32/swissbrowser.png:/icons/32x32/swissbrowser.png + :/icons/32x32/swisssurfer.png:/icons/32x32/swisssurfer.png diff --git a/src/main.cxx b/src/main.cxx index a08a67b..0ed2180 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -29,7 +29,7 @@ #include -//! @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 @@ -115,15 +115,15 @@ int main(int argv, char** argc) try { QTextCodec::setCodecForLocale(utf8); QTextCodec::setCodecForTr(utf8); QApplication app(argv, argc); - app.setWindowIcon(QIcon(":/icons/32x32/swissbrowser.png")); - app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name")); + app.setWindowIcon(QIcon(":/icons/32x32/swisssurfer.png")); + 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/swissbrowser_"+ QLocale().name()); + appTranslator.load(":/language/swisssurfer_"+ QLocale().name()); app.installTranslator(&appTranslator); //---------------------------------------------------------------------------- TMP=QDir::toNativeSeparators(QDir::tempPath()); @@ -151,7 +151,7 @@ int main(int argv, char** argc) try { bool editbookmarks(false); QStringList args(app.arguments()); std::auto_ptr settings - (std::auto_ptr(new QSettings("SwissSign", "SwissBrowser"))); + (std::auto_ptr(new QSettings("SwissSign", "SwissSurfer"))); for (QStringList::iterator it(args.begin()); ++it!=args.end();) if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") { std::cout< +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -400,7 +400,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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts index 84fdf13..1701013 100644 --- a/src/qbrowserlib/qbrowserlib_en.ts +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -183,7 +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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -400,7 +400,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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts index 1112a0f..85a5d98 100644 --- a/src/qbrowserlib/qbrowserlib_fr.ts +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -183,7 +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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -400,7 +400,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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts index 2e91351..462d6f8 100644 --- a/src/qbrowserlib/qbrowserlib_it.ts +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -183,7 +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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -400,7 +400,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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/settings.ui b/src/qbrowserlib/settings.ui index a1091dd..cef0a63 100644 --- a/src/qbrowserlib/settings.ui +++ b/src/qbrowserlib/settings.ui @@ -53,7 +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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> DNS prefetch enabled @@ -342,7 +342,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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> private browsing diff --git a/src/qmake.pro.in b/src/qmake.pro.in index 1ae867a..12f3f7b 100644 --- a/src/qmake.pro.in +++ b/src/qmake.pro.in @@ -29,7 +29,7 @@ win32 { QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a CONFIG += release } -ICON = swissbrowser.icns +ICON = swisssurfer.icns TRANSLATIONS = @PACKAGENAME@_en.ts \ @PACKAGENAME@_de.ts \ diff --git a/src/resources.qrc b/src/resources.qrc index c4c17af..146678c 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,7 +1,7 @@ resources/icons/32x32/butt32_49.png - resources/icons/32x32/swissbrowser.png + resources/icons/32x32/swisssurfer.png resources/icons/32x32/butt32_01.png resources/icons/32x32/butt32_02.png resources/icons/32x32/butt32_03.png @@ -18,7 +18,7 @@ resources/icons/16x16/butt16_49.png - resources/icons/16x16/swissbrowser.png + resources/icons/16x16/swisssurfer.png resources/icons/16x16/butt16_01.png resources/icons/16x16/butt16_02.png resources/icons/16x16/butt16_03.png diff --git a/src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png b/src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png similarity index 100% rename from src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png rename to src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png diff --git a/src/resources/icons/16x16/swissbrowser.png b/src/resources/icons/16x16/swisssurfer.png similarity index 100% rename from src/resources/icons/16x16/swissbrowser.png rename to src/resources/icons/16x16/swisssurfer.png diff --git a/src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png b/src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png similarity index 100% rename from src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png rename to src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png diff --git a/src/resources/icons/32x32/swissbrowser.png b/src/resources/icons/32x32/swisssurfer.png similarity index 100% rename from src/resources/icons/32x32/swissbrowser.png rename to src/resources/icons/32x32/swisssurfer.png diff --git a/src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png b/src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png similarity index 100% rename from src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png rename to src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png diff --git a/src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png b/src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png similarity index 100% rename from src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png rename to src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png diff --git a/src/resources/icons/about.png b/src/resources/icons/about.png index 54046e86ffad672025770ee7f4b7fab20b21c91e..87baf762a9d945c650a441d84acc6a5ab0513fae 100644 GIT binary patch delta 28 hcmcZ*c`kB8pN>FrX;E5gk$!P`W^plyJ$ZqS0RXt$3>g3b delta 30 icmX>Xc_DH`pN>#cQGR)GYLR|%d1i4jm@|2vjsXDDTMY96 diff --git a/src/resources/icons/addbookmark.png b/src/resources/icons/addbookmark.png index 8070895fe00b33f276fb6cb97d7e8df4e57b7bf7..5bb80b2a1d39b4893057a2808974c9f06e9215d4 100644 GIT binary patch delta 30 jcmex2lkv|?#tqwi1d2fdp34MtDZn{X;E5gk$!P`W^plyJ$bsG1pv6i3>g3b delta 30 icmX>bdp>qUtDaC&QGR)GYLR|%d1i4jm@|2*o&^BXK@9T% diff --git a/src/resources/icons/close.png b/src/resources/icons/close.png index c44e18a3f02c842ea373c9ad37df37f2e1fd2c75..c935cd88547e817ced990b87a59fcf2baa09f532 100644 GIT binary patch delta 28 hcmdl`zOH;jp0z-6X;E5gk$!P`W^plyJ-NZ!006dI3-bT~ delta 30 icmZ2izM*_Wp0!X?QGR)GYLR|%d1i4jm@~P~+5iC0u?)=s diff --git a/src/resources/icons/error.png b/src/resources/icons/error.png index c2aca747f1eb164e9c3f257b2afbaae239b6a480..e3ea76488e10a953ac03330e1bf450802b216644 100644 GIT binary patch delta 28 hcmX@2bVz9flb}FxX;E5gk$!P`W^plyJy}H1005e23Pk__ delta 30 icmX@4bVO+blb}#iQGR)GYLR|%d1i4jm@`>O&;S6jjSC+D diff --git a/src/resources/icons/find.png b/src/resources/icons/find.png index a274e674faf76f1129746afafa64bdab9dc5a96b..8e718845cd2b44dcdfafa2b4c5d117084952003d 100644 GIT binary patch delta 30 jcmeyfi1F7V#tqhi0>!08X{kl}#pRjB#US=%-#~o;(GLu$ delta 32 kcmeyhi1E)N#tqhiLPLGWbZ(I0PG13f&c&j diff --git a/src/resources/icons/newtab.png b/src/resources/icons/newtab.png index d1825ba234eb44e0fb1b536a4c47f4269bf08739..4d4f661e898fb118ab08f0e08633ea49577c3188 100644 GIT binary patch delta 28 hcmaE4{lI#|d|83w(xSA~BK_j>%;I7Yd-6tELjbno3J)&u~+RSU}i diff --git a/src/resources/icons/print.png b/src/resources/icons/print.png index ce013711935c2360433eabee0cc4b5d6a39b7cde..559bfadbb08778ae35026a399770be90a2134c35 100644 GIT binary patch delta 28 hcmX@Ba9Uvlw}3!#X;E5gk$!P`W^plyJy}-3005k~3S$5O delta 30 icmX@Da8_Xhw}4PmQGR)GYLR|%d1i4jm@`>gzyJWW2@5>{ diff --git a/src/resources/icons/printpreview.png b/src/resources/icons/printpreview.png index b39f0c06a33c7076091f51c4fd345476f52a6ca6..080645bffe7d2808d12c9b32039f6b3d972f4959 100644 GIT binary patch delta 28 hcmZqDY0%lQQ&gb1v?wjLNWZu|v$z<3#tmN*1&T|H(o&1`i_0^Mi$UzkY)Qrd+QJO| delta 32 kcmdmfgmLE)#tmN*g_4T$%ZpQs^oz?gi;KaW$t+360QSla*8l(j diff --git a/src/resources/swissbrowser.png b/src/resources/swisssurfer.png similarity index 100% rename from src/resources/swissbrowser.png rename to src/resources/swisssurfer.png diff --git a/src/swissbrowser.desktop b/src/swissbrowser.desktop deleted file mode 100644 index fa92edf..0000000 --- a/src/swissbrowser.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/src/swisssurfer.desktop b/src/swisssurfer.desktop new file mode 100644 index 0000000..103d6e2 --- /dev/null +++ b/src/swisssurfer.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=swisssurfer +Name[de]=swisssurfer +Name[fr]=swisssurfer +Name[it]=swisssurfer +Name[en]=swisssurfer +GenericName=SwissSurfer +Comment=Browser with SuisseID login +Icon=/usr/share/swisssurfer/swisssurfer.png +Categories=Network;WebBrowser +Exec=/usr/bin/swisssurfer diff --git a/src/swissbrowser.icns b/src/swisssurfer.icns similarity index 100% rename from src/swissbrowser.icns rename to src/swisssurfer.icns diff --git a/src/swissbrowser_de.ts b/src/swisssurfer_de.ts similarity index 99% rename from src/swissbrowser_de.ts rename to src/swisssurfer_de.ts index 12a33d3..45f9439 100644 --- a/src/swissbrowser_de.ts +++ b/src/swisssurfer_de.ts @@ -405,7 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer @@ -455,13 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissBrowser (%3) + [%1] - %2 - SwissSurfer (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissBrowser + SwissSurfer window title with no tab @@ -762,7 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer application name diff --git a/src/swissbrowser_en.ts b/src/swisssurfer_en.ts similarity index 99% rename from src/swissbrowser_en.ts rename to src/swisssurfer_en.ts index a59c1b0..f4b54bd 100644 --- a/src/swissbrowser_en.ts +++ b/src/swisssurfer_en.ts @@ -405,7 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer @@ -455,13 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissBrowser (%3) + [%1] - %2 - SwissSurfer (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissBrowser + SwissSurfer window title with no tab @@ -762,7 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer application name diff --git a/src/swissbrowser_fr.ts b/src/swisssurfer_fr.ts similarity index 99% rename from src/swissbrowser_fr.ts rename to src/swisssurfer_fr.ts index 0bc51d7..d2973e8 100644 --- a/src/swissbrowser_fr.ts +++ b/src/swisssurfer_fr.ts @@ -405,7 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer @@ -455,13 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissBrowser (%3) + [%1] - %2 - SwissSurfer (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissBrowser + SwissSurfer window title with no tab @@ -762,7 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer application name diff --git a/src/swissbrowser_it.ts b/src/swisssurfer_it.ts similarity index 99% rename from src/swissbrowser_it.ts rename to src/swisssurfer_it.ts index 0b19ac3..09c0440 100644 --- a/src/swissbrowser_it.ts +++ b/src/swisssurfer_it.ts @@ -405,7 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer @@ -455,13 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissBrowser (%3) + [%1] - %2 - SwissSurfer (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissBrowser + SwissSurfer window title with no tab @@ -762,7 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissBrowser + SwissSurfer application name diff --git a/swissbrowser.spec.in b/swisssurfer.spec.in similarity index 92% rename from swissbrowser.spec.in rename to swisssurfer.spec.in index 52e3bc5..a3e520a 100644 --- a/swissbrowser.spec.in +++ b/swisssurfer.spec.in @@ -38,7 +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/swissbrowser/swissbrowser.spec +rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec %clean rm -rf $RPM_BUILD_ROOT @@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) /usr/bin/@PACKAGENAME@ /usr/share/applications/@PACKAGENAME@.desktop -/usr/share/swissbrowser/swissbrowser.png -/usr/share/swissbrowser/swissbrowser.xpm +/usr/share/swisssurfer/swisssurfer.png +/usr/share/swisssurfer/swisssurfer.xpm /usr/%_lib/lib*.so.* %doc /usr/share/doc/packages/@PACKAGENAME@/AUTHORS