diff options
30 files changed, 479 insertions, 495 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index ef09c1c0..00e02a53 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,5 @@ install: - - set QTDIR=C:\Qt\5.9\mingw53_32 + - set QTDIR=C:\Qt\5.10\mingw53_32 - choco install -y InnoSetup - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;%PATH%;"C:\Program Files (x86)\Inno Setup 5" build_script: diff --git a/.travis.yml b/.travis.yml index 1b45a9fe..a9ca3086 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt592-trusty; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: @@ -30,16 +30,15 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt59base qt59tools qt59svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt510base qt510tools qt510svg; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo apt-get -qq install g++-6 gcc-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 90; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --upgrade pip; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user codecov; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then npm install -g codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi before_script: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt59/bin/qt59-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt510/bin/qt510-env.sh; fi - qmake -v script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 364863ca..f3fc0f8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [Unreleased](https://github.com/IJHack/QtPass/tree/HEAD) + +[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.2...HEAD) + +**Closed issues:** + +- Unable to create new password [\#391](https://github.com/IJHack/QtPass/issues/391) +- Duplicate prefix in installation of tests directory in v1.2.2. [\#389](https://github.com/IJHack/QtPass/issues/389) +- Compilation error on FreeBSD member access into incomplete type [\#388](https://github.com/IJHack/QtPass/issues/388) +- No icons on macOS [\#377](https://github.com/IJHack/QtPass/issues/377) + +**Merged pull requests:** + +- Revert scroll bar changes [\#393](https://github.com/IJHack/QtPass/pull/393) ([destanyol](https://github.com/destanyol)) +- Fix High Dpi Support. Works now under Windows and KDE/Plasma. [\#392](https://github.com/IJHack/QtPass/pull/392) ([hgraeber](https://github.com/hgraeber)) + ## [v1.2.2](https://github.com/IJHack/QtPass/tree/v1.2.2) (2018-05-07) [Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.1...v1.2.2) diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 76d16c86..230bfac2 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -508,7 +508,7 @@ Expire-Date: 0 <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="271"/> + <location filename="../src/mainwindow.ui" line="243"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -520,62 +520,62 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="350"/> - <location filename="../src/mainwindow.ui" line="353"/> + <location filename="../src/mainwindow.ui" line="322"/> + <location filename="../src/mainwindow.ui" line="325"/> <location filename="../src/mainwindow.cpp" line="1203"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="358"/> - <location filename="../src/mainwindow.ui" line="361"/> + <location filename="../src/mainwindow.ui" line="330"/> + <location filename="../src/mainwindow.ui" line="333"/> <location filename="../src/mainwindow.cpp" line="1215"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="369"/> + <location filename="../src/mainwindow.ui" line="341"/> <source>git push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="366"/> + <location filename="../src/mainwindow.ui" line="338"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="337"/> + <location filename="../src/mainwindow.ui" line="309"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="377"/> + <location filename="../src/mainwindow.ui" line="349"/> <source>git pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="374"/> + <location filename="../src/mainwindow.ui" line="346"/> <source>Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="385"/> + <location filename="../src/mainwindow.ui" line="357"/> <source>Manage who can read password in folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="382"/> + <location filename="../src/mainwindow.ui" line="354"/> <location filename="../src/mainwindow.cpp" line="1197"/> <source>Users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="393"/> + <location filename="../src/mainwindow.ui" line="365"/> <source>Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="390"/> + <location filename="../src/mainwindow.ui" line="362"/> <source>Config</source> <translation type="unfinished"></translation> </message> @@ -762,15 +762,15 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="342"/> - <location filename="../src/mainwindow.ui" line="345"/> + <location filename="../src/mainwindow.ui" line="314"/> + <location filename="../src/mainwindow.ui" line="317"/> <location filename="../src/mainwindow.cpp" line="1195"/> <source>Add folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="331"/> - <location filename="../src/mainwindow.ui" line="334"/> + <location filename="../src/mainwindow.ui" line="303"/> + <location filename="../src/mainwindow.ui" line="306"/> <location filename="../src/mainwindow.cpp" line="1196"/> <source>Add password</source> <translation type="unfinished"></translation> @@ -852,7 +852,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="82"/> + <location filename="../main/main.cpp" line="81"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index 575f1336..c0a71487 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -533,26 +533,26 @@ Expire-Date: 0 <translation type="vanished">Afegeix</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="350"/> - <location filename="../src/mainwindow.ui" line="353"/> + <location filename="../src/mainwindow.ui" line="322"/> + <location filename="../src/mainwindow.ui" line="325"/> <location filename="../src/mainwindow.cpp" line="1203"/> <source>Edit</source> <translation>Edita</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="358"/> - <location filename="../src/mainwindow.ui" line="361"/> + <location filename="../src/mainwindow.ui" line="330"/> + <location filename="../src/mainwindow.ui" line="333"/> <location filename="../src/mainwindow.cpp" line="1215"/> <source>Delete</source> <translation>Suprimeix</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="369"/> + <location filename="../src/mainwindow.ui" line="341"/> <source>git push</source> <translation>git push</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="366"/> + <location filename="../src/mainwindow.ui" line="338"/> <source>Push</source> <translation>Puja</translation> </message> @@ -562,38 +562,38 @@ Expire-Date: 0 <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="337"/> + <location filename="../src/mainwindow.ui" line="309"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="377"/> + <location filename="../src/mainwindow.ui" line="349"/> <source>git pull</source> <translation>git pull</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="374"/> + <location filename="../src/mainwindow.ui" line="346"/> <source>Update</source> <translation>Actualitza</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="385"/> + <location filename="../src/mainwindow.ui" line="357"/> <source>Manage who can read password in folder</source> <translation>Gestioneu qui pot llegir la contrasenya a la carpeta</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="382"/> + <location filename="../src/mainwindow.ui" line="354"/> <location filename="../src/mainwindow.cpp" line="1197"/> <source>Users</source> <translation>Usuaris</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="393"/> + <location filename="../src/mainwindow.ui" line="365"/> <source>Configuration</source> <translation>Configuració</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="390"/> + <location filename="../src/mainwindow.ui" line="362"/> <source>Config</source> <translation>Configura</translation> </message> @@ -603,7 +603,7 @@ Expire-Date: 0 <translation>Benvingut a QtPass</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="271"/> + <location filename="../src/mainwindow.ui" line="243"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -834,15 +834,15 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="342"/> - <location filename="../src/mainwindow.ui" line="345"/> + <location filename="../src/mainwindow.ui" line="314"/> + <location filename="../src/mainwindow.ui" line="317"/> <location filename="../src/mainwindow.cpp" line="1195"/> <source>Add folder</source> <translation>Afegeix una carpeta</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="331"/> - <location filename="../src/mainwindow.ui" line="334"/> + <location filename="../src/mainwindow.ui" line="303"/> + <location filename="../src/mainwindow.ui" line="306"/> <location filename="../src/mainwindow.cpp" line="1196"/> <source>Add password</source> <translation>Afegeix una contrasenya</translation> @@ -925,7 +925,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="82"/> + <location filename="../main/main.cpp" line="81"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 75a59759..9335229c 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -533,31 +533,31 @@ Expire-Date: 0 <translation type="vanished">Přidat</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="350"/> - <location filename="../src/mainwindow.ui" line="353"/> + <location filename="../src/mainwindow.ui" line="322"/> + <location filename="../src/mainwindow.ui" line="325"/> <location filename="../src/mainwindow.cpp" line="1203"/> <source>Edit</source> <translation>Upravit</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="358"/> - <location filename="../src/mainwindow.ui" line="361"/> + <location filename="../src/mainwindow.ui" line="330"/> + <location filename="../src/mainwindow.ui" line="333"/> <location filename="../src/mainwindow.cpp" line="1215"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="369"/> + <location filename="../src/mainwindow.ui" line="341"/> <source>git push</source> <translation>git push</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="366"/> + <location filename="../src/mainwindow.ui" line="338"/> <source>Push</source> <translation>Odeslat</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="271"/> + <location filename="../src/mainwindow.ui" line="243"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -569,38 +569,38 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="337"/> + <location filename="../src/mainwindow.ui" line="309"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="377"/> + <location filename="../src/mainwindow.ui" line="349"/> <source>git pull</source> <translation>git pull</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="374"/> + <location filename="../src/mainwindow.ui" line="346"/> <source>Update</source> <translation>Stáhnout</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="385"/> + <location filename="../src/mainwindow.ui" line="357"/> <source>Manage who can read password in folder</source> <translation>Správa oprávnění číst data v adresáři</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="382"/> + <location filename="../src/mainwindow.ui" line="354"/> <location filename="../src/mainwindow.cpp" line="1197"/> <source>Users</source> <translation>Uživatelé</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="393"/> + <location filename="../src/mainwindow.ui" line="365"/> <source>Configuration</source> <translation>Konfigurace</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="390"/> + <location filename="../src/mainwindow.ui" line="362"/> <source>Config</source> <translation>Nastavení</translation> </message> @@ -823,15 +823,15 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="342"/> - <location filename="../src/mainwindow.ui" line="345"/> + <location filename="../src/mainwindow.ui" line="314"/> + <location filename="../src/mainwindow.ui" line="317"/> <location filename="../src/mainwindow.cpp" line="1195"/> <source>Add folder</source> <translation>Přidat adresář</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="331"/> - <location filename="../src/mainwindow.ui" line="334"/> + <location filename="../src/mainwindow.ui" line="303"/> + <location filename="../src/mainwindow.ui" line="306"/> <location filename="../src/mainwindow.cpp" line="1196"/> <source>Add password</source> <translation>Přidat heslo</translation> @@ -914,7 +914,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="82"/> + <location filename="../main/main.cpp" line="81"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 42a0883f..8cfb5ca6 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -521,31 +521,31 @@ Expire-Date: 0 <translation type="vanished">Hinzufügen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="350"/> - <location filename="../src/mainwindow.ui" line="353"/> + <location filename="../src/mainwindow.ui" line="322"/> + <location filename="../src/mainwindow.ui" line="325"/> <location filename="../src/mainwindow.cpp" line="1203"/> <source>Edit</source> <translation>Ändern</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="358"/> - <location filename="../src/mainwindow.ui" line="361"/> + <location filename="../src/mainwindow.ui" line="330"/> + <location filename="../src/mainwindow.ui" line="333"/> <location filename="../src/mainwindow.cpp" line="1215"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="369"/> + <location filename="../src/mainwindow.ui" line="341"/> <source>git push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="366"/> + <location filename="../src/mainwindow.ui" line="338"/> <source>Push</source> <translation>Hochladen (push)</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="271"/> + <location filename="../src/mainwindow.ui" line="243"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -557,38 +557,38 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="337"/> + <location filename="../src/mainwindow.ui" line="309"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="377"/> + <location filename="../src/mainwindow.ui" line="349"/> <source>git pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="374"/> + <location filename="../src/mainwindow.ui" line="346"/> <source>Update</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="385"/> + <location filename="../src/mainwindow.ui" line="357"/> <source>Manage who can read password in folder</source> <translation>Verwalten wer Passwörter im Ordner lesen kann</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="382"/> + <location filename="../src/mainwindow.ui" line="354"/> <location filename="../src/mainwindow.cpp" line="1197"/> <source>Users</source> <translation>Benutzer</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="393"/> + <location filename="../src/mainwindow.ui" line="365"/> <source>Configuration</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="390"/> + <location filename="../src/mainwindow.ui" line="362"/> <source>Config</source> <translation>Einstellungen</translation> </message> @@ -744,15 +744,15 @@ p, li { white-space: pre-wrap; } <translation>in Zwischenablage kopiert</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="342"/> - <location filename="../src/mainwindow.ui" line="345"/> + <location filename="../src/mainwindow.ui" line="314"/> + <location filename="../src/mainwindow.ui" line="317"/> <location filename="../src/mainwindow.cpp" line="1195"/> <source>Add folder</source> <translation>Ordner hinzufügen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="331"/> - <location filename="../src/mainwindow.ui" line="334"/> + <location filename="../src/mainwindow.ui" line="303"/> + <location filename="../src/mainwindow.ui" line="306"/> <location filename="../src/mainwindow.cpp" line="1196"/> <source>Add password</source> <translation>Passwort hinzufügen</translation> @@ -904,7 +904,7 @@ Neues Passwort-Datei: <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="82"/> + <location filename="../main/main.cpp" line="81"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index b5e51472..5987e7b1 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -520,31 +520,31 @@ Expire-Date: 0 <translation type="vanished">Hinzufügen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="350"/> - <location filename="../src/mainwindow.ui" line="353"/> + <location filename="../src/mainwindow.ui" line="322"/> + <location filename="../src/mainwindow.ui" line="325"/> <location filename="../src/mainwindow.cpp" line="1203"/> <source>Edit</source> <translation>Ändern</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="358"/> - <location filename="../src/mainwindow.ui" line="361"/> + <location filename="../src/mainwindow.ui" line="330"/> + <location filename="../src/mainwindow.ui" line="333"/> <location filename="../src/mainwindow.cpp" line="1215"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="369"/> + <location filename="../src/mainwindow.ui" line="341"/> <source>git push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.ui" line="366"/> + <location filename="../src/mainwindow.ui" line="338"/> <source>Push</source> <translation>Hochladen (push)</translation> </message> <message> - <location filename="../src/mainwindow.ui" line="271"/> + <location filename="../src/mainwindow.ui" line="243"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC- |