web
/
surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set SWISSSURFER_USERAGENT e.g. to "Mozilla/5.0 (%Platform%; %Security%; %Subplatform%; %Locale%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"; closes #88

Browse Source
master
Marc Wäckerlin 14 years ago
parent 313b75fbf0
commit 6d16b9e672
7 changed files with 166 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      swisssurfer/src/browser.hxx
  2. 21
      swisssurfer/src/main.cxx
  3. 78
      swisssurfer/src/swisssurfer_de.ts
  4. 56
      swisssurfer/src/swisssurfer_en.ts
  5. 78
      swisssurfer/src/swisssurfer_fr.ts
  6. 78
      swisssurfer/src/swisssurfer_it.ts
  7. 7
      swisssurfer/src/webpage.hxx

7
swisssurfer/src/browser.hxx
Unescape View File

@ -630,8 +630,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
} }
void on_actionAbout_triggered() { void on_actionAbout_triggered() {
QMessageBox::about(this, tr("About"), QMessageBox::about(this, tr("About"),
tr("SwissSurfer\n" tr("%8\n"
"Version: %1\n" "Version: %1\n"
"Builddate: %2\n" "Builddate: %2\n"
"Libraries:\n" "Libraries:\n"
@ -645,7 +645,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
.arg(QString::fromStdString(pcsc::version())) .arg(QString::fromStdString(pcsc::version()))
.arg(qVersion()) .arg(qVersion())
.arg(QT_VERSION_STR) .arg(QT_VERSION_STR)
.arg(SHLIB_VERSION_NUMBER)); .arg(SHLIB_VERSION_NUMBER)
.arg(QApplication::applicationName()));
} }
void on_actionSettings_triggered() { void on_actionSettings_triggered() {

21
swisssurfer/src/main.cxx
Unescape View File

@ -250,6 +250,8 @@ int main(int argv, char** argc) try {
QTextCodec::setCodecForTr(utf8); QTextCodec::setCodecForTr(utf8);
QApplication app(argv, argc); QApplication app(argv, argc);
app.setWindowIcon(QIcon(":/icons/appicon")); app.setWindowIcon(QIcon(":/icons/appicon"));
app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name"));
app.setApplicationVersion(VERSION);
QTranslator qtTranslator; QTranslator qtTranslator;
if (env.contains("LANGUAGE")) QLocale::setDefault(env["LANGUAGE"]); if (env.contains("LANGUAGE")) QLocale::setDefault(env["LANGUAGE"]);
qtTranslator.load(":/language/qt_" + QLocale::system().name()); qtTranslator.load(":/language/qt_" + QLocale::system().name());
@ -322,13 +324,22 @@ int main(int argv, char** argc) try {
" start <tool> for mimetype <mime>\n" " start <tool> for mimetype <mime>\n"
" <url> optional full URL\n" " <url> optional full URL\n"
"Environment:\n" "Environment:\n"
" LANGUAGE \"de\", \"en\", ... (actual: %5)\n" " LANGUAGE \"de\", \"en\", ... (actual: %5)\n"
" PROXY_TYPE \"http\" or \"socks\" or \"\" (actual: %2)\n" " PROXY_TYPE \"http\" or \"socks\" or \"\" (actual: %2)\n"
" PROXY_PORT proxy port number (actual: %3)\n" " PROXY_PORT proxy port number (actual: %3)\n"
" PROXY_HOST proxy host name (actual: %4)\n") " PROXY_HOST proxy host name (actual: %4)\n"
" SWISSSURFER_USERAGENT fake user agent (actual: %6)\n"
" %Platform% and %Subplatform% are expanded\n"
" to the windowing system and the operation\n"
" system. %Security% expands to U if SSL is\n"
" available, otherwise N. %Locale% is\n"
" replaced with locale name. %WebKitVersion%\n"
" is the version of WebKit the application\n"
" was compiled against. %AppVersion% expands\n"
" to application name/version\n")
.arg(QFileInfo(argc[0]).fileName()) .arg(QFileInfo(argc[0]).fileName())
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"]) .arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"])
.arg(env["LANGUAGE"]) .arg(env["LANGUAGE"]).arg(env["SWISSSURFER_USERAGENT"])
.toStdString() .toStdString()
<<std::endl; <<std::endl;
return 0; return 0;

78
swisssurfer/src/swisssurfer_de.ts
Unescape View File

@ -280,22 +280,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="694"/> <location filename="browser.hxx" line="695"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="960"/> <location filename="browser.hxx" line="961"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -338,7 +338,7 @@
</message> </message>
<message> <message>
<location filename="browser.hxx" line="634"/> <location filename="browser.hxx" line="634"/>
<source>SwissSurfer <source>%8
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -346,8 +346,7 @@ Libraries:
%4 %4
qt-%5 (%6) qt-%5 (%6)
openssl-%7</source> openssl-%7</source>
<oldsource>SwissSurfer %1 (%2) <oldsource>SwissSurfer
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="689"/> <location filename="browser.hxx" line="690"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1096"/> <location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1159"/> <location filename="browser.hxx" line="1160"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1171"/> <location filename="browser.hxx" line="1172"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="307"/> <location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@ -699,57 +704,44 @@ Options:
start &lt;tool&gt; for mimetype &lt;mime&gt; start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL &lt;url&gt; optional full URL
Environment: Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5) LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2) PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source> </source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="352"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="358"/> <location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="370"/> <location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="381"/> <location filename="main.cxx" line="392"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

56
swisssurfer/src/swisssurfer_en.ts
Unescape View File

@ -312,7 +312,7 @@
</message> </message>
<message> <message>
<location filename="browser.hxx" line="634"/> <location filename="browser.hxx" line="634"/>
<source>SwissSurfer <source>%8
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -320,8 +320,7 @@ Libraries:
%4 %4
qt-%5 (%6) qt-%5 (%6)
openssl-%7</source> openssl-%7</source>
<oldsource>SwissSurfer %1 (%2) <oldsource>SwissSurfer
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -332,43 +331,43 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="689"/> <location filename="browser.hxx" line="690"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="694"/> <location filename="browser.hxx" line="695"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="960"/> <location filename="browser.hxx" line="961"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1096"/> <location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1159"/> <location filename="browser.hxx" line="1160"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1171"/> <location filename="browser.hxx" line="1172"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -671,7 +670,13 @@ openssl-%7</oldsource>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="307"/> <location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@ -689,35 +694,44 @@ Options:
start &lt;tool&gt; for mimetype &lt;mime&gt; start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL &lt;url&gt; optional full URL
Environment: Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5) LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2) PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="352"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="358"/> <location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="370"/> <location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="381"/> <location filename="main.cxx" line="392"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

78
swisssurfer/src/swisssurfer_fr.ts
Unescape View File

@ -280,22 +280,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="694"/> <location filename="browser.hxx" line="695"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="960"/> <location filename="browser.hxx" line="961"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -338,7 +338,7 @@
</message> </message>
<message> <message>
<location filename="browser.hxx" line="634"/> <location filename="browser.hxx" line="634"/>
<source>SwissSurfer <source>%8
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -346,8 +346,7 @@ Libraries:
%4 %4
qt-%5 (%6) qt-%5 (%6)
openssl-%7</source> openssl-%7</source>
<oldsource>SwissSurfer %1 (%2) <oldsource>SwissSurfer
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="689"/> <location filename="browser.hxx" line="690"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1096"/> <location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1159"/> <location filename="browser.hxx" line="1160"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1171"/> <location filename="browser.hxx" line="1172"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="307"/> <location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@ -699,57 +704,44 @@ Options:
start &lt;tool&gt; for mimetype &lt;mime&gt; start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL &lt;url&gt; optional full URL
Environment: Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5) LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2) PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source> </source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="352"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="358"/> <location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="370"/> <location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="381"/> <location filename="main.cxx" line="392"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

78
swisssurfer/src/swisssurfer_it.ts
Unescape View File

@ -280,22 +280,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="694"/> <location filename="browser.hxx" line="695"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="707"/> <location filename="browser.hxx" line="708"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="960"/> <location filename="browser.hxx" line="961"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -338,7 +338,7 @@
</message> </message>
<message> <message>
<location filename="browser.hxx" line="634"/> <location filename="browser.hxx" line="634"/>
<source>SwissSurfer <source>%8
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -346,8 +346,7 @@ Libraries:
%4 %4
qt-%5 (%6) qt-%5 (%6)
openssl-%7</source> openssl-%7</source>
<oldsource>SwissSurfer %1 (%2) <oldsource>SwissSurfer
Version: %1 Version: %1
Builddate: %2 Builddate: %2
Libraries: Libraries:
@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="689"/> <location filename="browser.hxx" line="690"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1096"/> <location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1159"/> <location filename="browser.hxx" line="1160"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1171"/> <location filename="browser.hxx" line="1172"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="307"/> <location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@ -699,57 +704,44 @@ Options:
start &lt;tool&gt; for mimetype &lt;mime&gt; start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL &lt;url&gt; optional full URL
Environment: Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5) LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2) PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source> </source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="352"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="358"/> <location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="370"/> <location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="381"/> <location filename="main.cxx" line="392"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

7
swisssurfer/src/webpage.hxx
Unescape View File

@ -9,6 +9,7 @@
#define __WEBPAGE_HXX__ #define __WEBPAGE_HXX__
#include <QtWebKit/QWebPage> #include <QtWebKit/QWebPage>
#include <QtCore/QProcessEnvironment>
class Browser; class Browser;
@ -16,7 +17,11 @@ class WebPage: public QWebPage {
public: public:
WebPage(Browser* b, QObject *parent = 0): QWebPage(parent), _browser(b) {} WebPage(Browser* b, QObject *parent = 0): QWebPage(parent), _browser(b) {}
protected: protected:
QWebPage* createWindow(WebWindowType type); virtual QWebPage* createWindow(WebWindowType type);
virtual QString userAgentForUrl(const QUrl& url) const {
return QProcessEnvironment::systemEnvironment()
.value("SWISSSURFER_USERAGENT", QWebPage::userAgentForUrl(url));
}
private: private:
Browser* _browser; Browser* _browser;
}; };

Write Preview
Loading…
Cancel
Save