From b81c95aca886372a8943c1fe8c6747d56e1c5d02 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Fri, 27 May 2022 17:58:51 +0100 Subject: [PATCH] s/http/https/ in user-facing URIs --- README.md | 8 ++-- desktop/hotlist.c | 10 ++--- desktop/searchweb.c | 6 +-- desktop/searchweb.h | 2 +- frontends/amiga/pkg/SearchEngines | 2 +- frontends/gtk/toolbar.c | 6 +-- .../riscos/appdir/Resources/SearchEngines | 43 +++++++++---------- frontends/riscos/iconbar.c | 2 +- frontends/riscos/templates/de | 2 +- frontends/riscos/templates/en | 2 +- frontends/riscos/templates/fr | 2 +- frontends/riscos/templates/nl | 2 +- frontends/riscos/window.c | 8 ++-- frontends/windows/res/installer.nsi | 6 +-- frontends/windows/window.c | 6 +-- resources/SearchEngines | 39 ++++++++--------- resources/de/welcome.html | 30 ++++++------- resources/en/licence.html | 42 +++++++++--------- resources/en/welcome.html | 32 +++++++------- resources/it/licence.html | 42 +++++++++--------- resources/it/welcome.html | 30 ++++++------- resources/ja/welcome.html | 30 ++++++------- resources/nl/licence.html | 42 +++++++++--------- resources/nl/welcome.html | 36 ++++++++-------- resources/zh_CN/licence.html | 42 +++++++++--------- resources/zh_CN/welcome.html | 30 ++++++------- 26 files changed, 250 insertions(+), 252 deletions(-) diff --git a/README.md b/README.md index a6b688430..8f3843042 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,13 @@ Creating a new port Look at the existing front ends for example implementations. The framebuffer front end is simplest and most self-contained. -Also, you can [contact the developers](http://www.netsurf-browser.org/contact/) +Also, you can [contact the developers](https://www.netsurf-browser.org/contact/) for help. Further documentation --------------------- -* [Developer documentation](http://www.netsurf-browser.org/developers/) -* [Developer wiki](http://wiki.netsurf-browser.org/Documentation/) -* [Code style guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf) +* [Developer documentation](https://www.netsurf-browser.org/developers/) +* [Developer wiki](https://wiki.netsurf-browser.org/Documentation/) +* [Code style guide](https://www.netsurf-browser.org/developers/StyleGuide.pdf) diff --git a/desktop/hotlist.c b/desktop/hotlist.c index e9cbb5ffb..2e877b7c6 100644 --- a/desktop/hotlist.c +++ b/desktop/hotlist.c @@ -968,13 +968,13 @@ static nserror hotlist_generate(void) const char *url; const char *msg_key; } default_entries[] = { - { "http://www.netsurf-browser.org/", + { "https://www.netsurf-browser.org/", "HotlistHomepage" }, - { "http://www.netsurf-browser.org/downloads/", + { "https://www.netsurf-browser.org/downloads/", "HotlistDownloads" }, - { "http://www.netsurf-browser.org/documentation", + { "https://www.netsurf-browser.org/documentation", "HotlistDocumentation" }, - { "http://www.netsurf-browser.org/contact", + { "https://www.netsurf-browser.org/contact", "HotlistContact" } }; const int n_entries = sizeof(default_entries) / @@ -1626,7 +1626,7 @@ nserror hotlist_add_entry(nsurl *url, const char *title, bool at_y, int y) enum treeview_relationship rel; if (url == NULL) { - err = nsurl_create("http://netsurf-browser.org/", &url); + err = nsurl_create("https://netsurf-browser.org/", &url); if (err != NSERROR_OK) { return err; } diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 597b8fffe..361860190 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -53,7 +53,7 @@ static struct search_web_ctx_s { } search_web_ctx; -static const char *default_providers = "Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|\n"; +static const char *default_providers = "Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico|\n"; static const char *default_search_icon_url = "resource:icons/search.png"; @@ -333,11 +333,11 @@ search_web_omni(const char *term, } /* try with adding default scheme */ - eterm = malloc(strlen(term) + SLEN("http://") + 1); + eterm = malloc(strlen(term) + SLEN("https://") + 1); if (eterm == NULL) { return NSERROR_NOMEM; } - sprintf(eterm, "http://%s", term); + sprintf(eterm, "https://%s", term); ret = nsurl_create(eterm, &url); free(eterm); if (ret == NSERROR_OK) { diff --git a/desktop/searchweb.h b/desktop/searchweb.h index 69748b6d6..0712de9fe 100644 --- a/desktop/searchweb.h +++ b/desktop/searchweb.h @@ -62,7 +62,7 @@ enum search_web_omni_flags { * term. The flags allow control over the operation. By default the * operations are: * - interpret the \a term as a url - * - if missing a scheme as a http: url + * - if missing a scheme as a https: url * - combined with the search providers url into a url for that provider. * * \param term The search term. diff --git a/frontends/amiga/pkg/SearchEngines b/frontends/amiga/pkg/SearchEngines index 3f4bdd95b..3095d43cf 100644 --- a/frontends/amiga/pkg/SearchEngines +++ b/frontends/amiga/pkg/SearchEngines @@ -1,2 +1,2 @@ -Aminet|www.aminet.net|http://aminet.net/search?query=%s|http://aminet.net/favicon.ico| +Aminet|www.aminet.net|https://aminet.net/search?query=%s|https://aminet.net/favicon.ico| OS4Depot|www.os4depot.net|http://www.os4depot.net/index.php?function=search&tool=simple&f_fields=%s|http://www.os4depot.net/favicon.ico| diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index 32adabc5b..be676e210 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -3066,7 +3066,7 @@ contents_button_clicked_cb(GtkWidget *widget, gpointer data) struct nsgtk_toolbar *tb = (struct nsgtk_toolbar *)data; nserror res; - res = toolbar_navigate_to_url(tb, "http://www.netsurf-browser.org/documentation/"); + res = toolbar_navigate_to_url(tb, "https://www.netsurf-browser.org/documentation/"); if (res != NSERROR_OK) { nsgtk_warning(messages_get_errorcode(res), 0); } @@ -3087,7 +3087,7 @@ guide_button_clicked_cb(GtkWidget *widget, gpointer data) struct nsgtk_toolbar *tb = (struct nsgtk_toolbar *)data; nserror res; - res = toolbar_navigate_to_url(tb, "http://www.netsurf-browser.org/documentation/guide"); + res = toolbar_navigate_to_url(tb, "https://www.netsurf-browser.org/documentation/guide"); if (res != NSERROR_OK) { nsgtk_warning(messages_get_errorcode(res), 0); } @@ -3109,7 +3109,7 @@ info_button_clicked_cb(GtkWidget *widget, gpointer data) struct nsgtk_toolbar *tb = (struct nsgtk_toolbar *)data; nserror res; - res = toolbar_navigate_to_url(tb, "http://www.netsurf-browser.org/documentation/info"); + res = toolbar_navigate_to_url(tb, "https://www.netsurf-browser.org/documentation/info"); if (res != NSERROR_OK) { nsgtk_warning(messages_get_errorcode(res), 0); } diff --git a/frontends/riscos/appdir/Resources/SearchEngines b/frontends/riscos/appdir/Resources/SearchEngines index e7fd7cb65..1e4530f06 100644 --- a/frontends/riscos/appdir/Resources/SearchEngines +++ b/frontends/riscos/appdir/Resources/SearchEngines @@ -1,22 +1,21 @@ -Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| -Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| -Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| -Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| -Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| -BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| -Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| -Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| -Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| -Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| -Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| -Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| -AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| -AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| -Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| -Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| -Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| -IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| -ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| -Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| -DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico| -Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png| +Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico| +Yahoo|search.yahoo.com|https://search.yahoo.com/search?p=%s|https://www.yahoo.com/favicon.ico| +Bing|www.bing.com|https://www.bing.com/search?q=%s|https://www.bing.com/favicon.ico| +Business.com|www.business.com|https://www.business.com/search/rslt_default.asp?query=%s|https://www.business.com/favicon.ico| +Omgili|www.omgili.com|https://www.omgili.com/AAAAA/%s.html|https://www.omgili.com/favicon.ico| +BBC News|search.bbc.co.uk|https://search.bbc.co.uk/search?q=%s&tab=ns|https://news.bbc.co.uk/favicon.ico| +Ubuntu Packages|packages.ubuntu.com|https://packages.ubuntu.com/search?keywords=%s|https://packages.ubuntu.com/favicon.ico| +Creative Commons|creativecommons.org|https://creativecommons.org/?s=%s|https://creativecommons.org/favicon.ico| +Ask.com|www.ask.com|https://www.ask.com/web?q=%s|https://www.ask.com/favicon.ico| +Answers.com|www.answers.com|https://www.answers.com/%s|https://www.answers.com/favicon.ico| +Dictionary.com|dictionary.reference.com|https://dictionary.reference.com/browse/%s?jss=0|https://dictionary.reference.com/favicon.ico| +Youtube|www.youtube.com|https://www.youtube.com/results?search_query=%s|https://www.youtube.com/favicon.ico| +AeroMp3|www.aeromp3.com|https://www.aeromp3.com/search?q=%s|https://www.aeromp3.com/favicon.ico| +AOL|search.aol.com|https://search.aol.com/aol/search?query=%s|https://www.aol.com/favicon.ico| +Baidu|www.baidu.com|https://www.baidu.com/s?wd=%s|https://www.baidu.com/favicon.ico| +Amazon|www.amazon.com|https://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|https://www.amazon.com/favicon.ico| +Ebay|shop.ebay.com|https://shop.ebay.com/items/%s|https://www.ebay.com/favicon.ico| +IMDB|www.imdb.com|https://www.imdb.com/find?q=%s|https://www.imdb.com/favicon.ico| +ESPN|search.espn.go.com|https://search.espn.go.com/%s/|https://www.espn.go.com/favicon.ico| +Wikipedia|en.wikipedia.org|https://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|https://en.wikipedia.org/favicon.ico| +DuckDuckGo|www.duckduckgo.com|https://www.duckduckgo.com/?q=%s|https://www.duckduckgo.com/favicon.ico| diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c index a9a62a98f..c85827030 100644 --- a/frontends/riscos/iconbar.c +++ b/frontends/riscos/iconbar.c @@ -207,7 +207,7 @@ bool ro_gui_iconbar_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, switch (action) { case HELP_OPEN_CONTENTS: - error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); + error = nsurl_create("https://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de index 19a23e330..4ad051383 100644 --- a/frontends/riscos/templates/de +++ b/frontends/riscos/templates/de @@ -1145,7 +1145,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"http://netsurf.sourceforge.net/netsurf.zip" + text.text:"https://netsurf.sourceforge.net/netsurf.zip" text.size:* text.validation:"R2" } diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en index d5259d922..c418ed7b9 100644 --- a/frontends/riscos/templates/en +++ b/frontends/riscos/templates/en @@ -1355,7 +1355,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"http://netsurf.sourceforge.net/netsurf.zip" + text.text:"https://netsurf.sourceforge.net/netsurf.zip" text.size:* text.validation:"R2" } diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr index 76a4611bf..cdc109855 100644 --- a/frontends/riscos/templates/fr +++ b/frontends/riscos/templates/fr @@ -1145,7 +1145,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"http://netsurf.sourceforge.net/netsurf.zip" + text.text:"https://netsurf.sourceforge.net/netsurf.zip" text.size:* text.validation:"R2" } diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl index 01188b097..4cabafd53 100644 --- a/frontends/riscos/templates/nl +++ b/frontends/riscos/templates/nl @@ -1359,7 +1359,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"http://netsurf.sourceforge.net/netsurf.zip" + text.text:"https://netsurf.sourceforge.net/netsurf.zip" text.size:43 text.validation:"R2" } diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index cb1e5484b..2c442ab2c 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -1312,7 +1312,7 @@ ro_gui_window_handle_local_keypress(struct gui_window *g, case IS_WIMP_KEY + wimp_KEY_F1: /* Help. */ { nserror error = nsurl_create( - "http://www.netsurf-browser.org/documentation/", + "https://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, @@ -2574,7 +2574,7 @@ ro_gui_window_menu_select(wimp_w w, /* help actions */ case HELP_OPEN_CONTENTS: - error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); + error = nsurl_create("https://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, @@ -2586,7 +2586,7 @@ ro_gui_window_menu_select(wimp_w w, break; case HELP_OPEN_GUIDE: - error = nsurl_create("http://www.netsurf-browser.org/documentation/guide", &url); + error = nsurl_create("https://www.netsurf-browser.org/documentation/guide", &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, @@ -2598,7 +2598,7 @@ ro_gui_window_menu_select(wimp_w w, break; case HELP_OPEN_INFORMATION: - error = nsurl_create("http://www.netsurf-browser.org/documentation/info", &url); + error = nsurl_create("https://www.netsurf-browser.org/documentation/info", &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, diff --git a/frontends/windows/res/installer.nsi b/frontends/windows/res/installer.nsi index 7a03192f5..e91f29090 100644 --- a/frontends/windows/res/installer.nsi +++ b/frontends/windows/res/installer.nsi @@ -20,9 +20,9 @@ !endif # These will be displayed by the "Click here for support information" link in "Add/Remove Programs" -!define HELPURL "http://www.netsurf-browser.org/" # "Support Information" link -!define UPDATEURL "http://www.netsurf-browser.org/" # "Product Updates" link -!define ABOUTURL "http://www.netsurf-browser.org/" # "Publisher" link +!define HELPURL "https://www.netsurf-browser.org/" # "Support Information" link +!define UPDATEURL "https://www.netsurf-browser.org/" # "Product Updates" link +!define ABOUTURL "https://www.netsurf-browser.org/" # "Publisher" link # This is the size (in kB) of all the files copied into "Program Files" !define INSTALLSIZE 9000 diff --git a/frontends/windows/window.c b/frontends/windows/window.c index 750c57703..2f48ae28b 100644 --- a/frontends/windows/window.c +++ b/frontends/windows/window.c @@ -1250,17 +1250,17 @@ nsws_window_command(HWND hwnd, case IDM_HELP_CONTENTS: nsws_window_go(hwnd, - "http://www.netsurf-browser.org/documentation/"); + "https://www.netsurf-browser.org/documentation/"); break; case IDM_HELP_GUIDE: nsws_window_go(hwnd, - "http://www.netsurf-browser.org/documentation/guide"); + "https://www.netsurf-browser.org/documentation/guide"); break; case IDM_HELP_INFO: nsws_window_go(hwnd, - "http://www.netsurf-browser.org/documentation/info"); + "https://www.netsurf-browser.org/documentation/info"); break; case IDM_HELP_ABOUT: diff --git a/resources/SearchEngines b/resources/SearchEngines index 38e77957b..ab2a8d581 100644 --- a/resources/SearchEngines +++ b/resources/SearchEngines @@ -1,20 +1,19 @@ -Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| -Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| -Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| -Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| -Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://omgili.com/public/images/favicon.ico| -BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://www.bbc.co.uk/favicon.ico| -Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| -Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png -Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain -Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| -Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| -AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| -Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| -Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| -Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| -IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| -ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| -Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| -DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation -Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon +Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico| +Yahoo|search.yahoo.com|https://search.yahoo.com/search?p=%s|https://www.yahoo.com/favicon.ico| +Bing|www.bing.com|https://www.bing.com/search?q=%s|https://www.bing.com/favicon.ico| +Business.com|www.business.com|https://www.business.com/search/rslt_default.asp?query=%s|https://www.business.com/favicon.ico| +Omgili|www.omgili.com|https://www.omgili.com/AAAAA/%s.html|https://omgili.com/public/images/favicon.ico| +BBC News|search.bbc.co.uk|https://search.bbc.co.uk/search?q=%s&tab=ns|https://www.bbc.co.uk/favicon.ico| +Ubuntu Packages|packages.ubuntu.com|https://packages.ubuntu.com/search?keywords=%s|https://packages.ubuntu.com/favicon.ico| +Creative Commons|creativecommons.org|https://creativecommons.org/?s=%s|https://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png +Ask.com|www.ask.com|https://www.ask.com/web?q=%s|https://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain +Dictionary.com|dictionary.reference.com|https://dictionary.reference.com/browse/%s?jss=0|https://dictionary.reference.com/favicon.ico| +Youtube|www.youtube.com|https://www.youtube.com/results?search_query=%s|https://www.youtube.com/favicon.ico| +AOL|search.aol.com|https://search.aol.com/aol/search?query=%s|https://www.aol.com/favicon.ico| +Baidu|www.baidu.com|https://www.baidu.com/s?wd=%s|https://www.baidu.com/favicon.ico| +Amazon|www.amazon.com|https://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|https://www.amazon.com/favicon.ico| +Ebay|shop.ebay.com|https://shop.ebay.com/items/%s|https://www.ebay.com/favicon.ico| +IMDB|www.imdb.com|https://www.imdb.com/find?q=%s|https://www.imdb.com/favicon.ico| +ESPN|search.espn.go.com|https://search.espn.go.com/%s/|https://www.espn.go.com/favicon.ico| +Wikipedia|en.wikipedia.org|https://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|https://en.wikipedia.org/favicon.ico| +DuckDuckGo|www.duckduckgo.com|https://www.duckduckgo.com/html/?q=%s|https://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation diff --git a/resources/de/welcome.html b/resources/de/welcome.html index 1a27a8c8c..899f685f9 100644 --- a/resources/de/welcome.html +++ b/resources/de/welcome.html @@ -21,7 +21,7 @@

NetSurf ist ein kleiner, schneller Opensource Webbrowser. Wir sind ständig daran interessiert, unseren Browser zu verbessern. Bitte kontaktieren Sie uns, wenn Sie irgend welche Probleme bemerken.
Danke, dass Sie sich für NetSurf entschieden haben!

-
+
@@ -30,29 +30,29 @@ Danke, dass Sie sich für NetSurf entschieden haben!

diff --git a/resources/en/licence.html b/resources/en/licence.html index 750d4d773..8df32804c 100644 --- a/resources/en/licence.html +++ b/resources/en/licence.html @@ -56,73 +56,73 @@ version.

NetSurf Project Components

-
NetSurf
+
NetSurf
© 2002–2020 The NetSurf Developers GPLv2
-
LibCSS
+
LibCSS
© 2007–2019 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2019 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2019 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa
© 2017 Michael Drake MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox
© 2017 Vincent Sanders MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2020 NetSurf Browser Project, Daniel Silverstone MIT @@ -132,49 +132,49 @@ version.

Third Party Components

-
cURL
+
cURL
© 1996–2020 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-
OSLib
+
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -183,7 +183,7 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib diff --git a/resources/en/welcome.html b/resources/en/welcome.html index d10735880..a4dbcad36 100644 --- a/resources/en/welcome.html +++ b/resources/en/welcome.html @@ -20,7 +20,7 @@

NetSurf is a small, fast open source web browser. We are always keen to improve our browser, so get in touch if you run into any problems. Thanks for choosing NetSurf!

- +
@@ -29,29 +29,29 @@
@@ -61,4 +61,4 @@
- \ No newline at end of file + diff --git a/resources/it/licence.html b/resources/it/licence.html index d25d3be23..0de3ffa55 100644 --- a/resources/it/licence.html +++ b/resources/it/licence.html @@ -48,73 +48,73 @@ dl.components > dd > span + span {

Componenti del progetto NetSurf

-
NetSurf
+
NetSurf
© 2002–2020 The NetSurf Developers GPLv2
-
LibCSS
+
LibCSS
© 2007–2018 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2017 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2017 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -124,49 +124,49 @@ dl.components > dd > span + span {

Componenti di terze parti

-
cURL
+
cURL
© 1996–2020 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-q
OSLib
+q
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -175,7 +175,7 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib diff --git a/resources/it/welcome.html b/resources/it/welcome.html index c6b12b11d..98bb3a0ae 100644 --- a/resources/it/welcome.html +++ b/resources/it/welcome.html @@ -20,7 +20,7 @@

NetSurf la nostra idea di browser, per questo abbiamo scelto di renderlo veloce e sicuro ed ogni giorno lavoriamo per renderlo migliore, se hai qualche suggerimento o semplicemente hai bisogno di aiuto contattaci!

Grazie per aver scelto NetSurf!

- +
@@ -29,29 +29,29 @@
diff --git a/resources/ja/welcome.html b/resources/ja/welcome.html index 5db1b7066..6f6cf97f3 100644 --- a/resources/ja/welcome.html +++ b/resources/ja/welcome.html @@ -21,7 +21,7 @@

NetSurfは小さくて速いオープンソースのウェブブラウザです。私たちはいつもこのブラウザを改良する気満々ですから、どんな問題でも声をかけてください。NetSurfを選んでくれてありがとう！

- +
@@ -30,29 +30,29 @@
diff --git a/resources/nl/licence.html b/resources/nl/licence.html index 79138d728..6ea3714fb 100644 --- a/resources/nl/licence.html +++ b/resources/nl/licence.html @@ -59,73 +59,73 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.

Onderdelen van het NetSurf-project

-
NetSurf
+
NetSurf
© 2002–2020 De NetSurf-ontwikkerlaars GPLv2
-
LibCSS
+
LibCSS
© 2007–2018 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2018 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2018 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa
© 2016–2018 Michael Drake MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox
© 2016 Vincent Sanders MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -136,49 +136,49 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.

Onderdelen van derden

-
cURL
+
cURL
© 1996–2020 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-
OSLib
+
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -187,7 +187,7 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib diff --git a/resources/nl/welcome.html b/resources/nl/welcome.html index c4678f8ce..e138fb7bb 100644 --- a/resources/nl/welcome.html +++ b/resources/nl/welcome.html @@ -21,7 +21,7 @@

NetSurf is een kleine, snelle webbrowser met open broncode. Wij willen altijd onze browser nog beter maken. Neem dus contact op met de ontwikkelaars (in het Engels!) of met de vertalers (gewoon in het Nederlands) mocht je verbeteringsvoorstellen hebben en/of problemen ervaren. Bedankt dat je voor NetSurf hebt gekozen.

- +
@@ -32,36 +32,36 @@

Nieuws

RISC OS

Techniek

Zoeken

diff --git a/resources/zh_CN/licence.html b/resources/zh_CN/licence.html index dd8e9d364..c8e910922 100644 --- a/resources/zh_CN/licence.html +++ b/resources/zh_CN/licence.html @@ -56,73 +56,73 @@ version.

NetSurf 项目组件

-
NetSurf
+
NetSurf
© 2002–2020 NetSurf 开发人员 GPLv2
-
LibCSS
+
LibCSS
© 2007–2019 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2019 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2019 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa
© 2017 Michael Drake MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox
© 2017 Vincent Sanders MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2020 NetSurf 浏览器项目，Daniel Silverstone MIT @@ -132,49 +132,49 @@ version.

第三方组件

-
cURL
+
cURL
© 1996–2020 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane，Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-
OSLib
+
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young， Tim J. Hudson
© 1998–2010 OpenSSL 项目 OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan，Nick Burrett，Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett，John Tytgat，Peter Naulls， @@ -183,7 +183,7 @@ Graham Shaw，James Bursa and John-Mark Bell。 UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib diff --git a/resources/zh_CN/welcome.html b/resources/zh_CN/welcome.html index 1bbe30f98..340a8e206 100644 --- a/resources/zh_CN/welcome.html +++ b/resources/zh_CN/welcome.html @@ -21,7 +21,7 @@

NetSurf 是一款体积小、速读快的开源网络浏览器。我们一直致力于改进浏览器，如果遇到任何问题，请与我们联系。感谢您选择 NetSurf！

- +
@@ -30,29 +30,29 @@