diff --git a/netsurf/desktop/searchweb.c b/netsurf/desktop/searchweb.c index 2c0873d..6efdf62 100644 --- a/netsurf/desktop/searchweb.c +++ b/netsurf/desktop/searchweb.c @@ -34,9 +34,9 @@ #include "desktop/gui_internal.h" struct search_provider { - char *name; /**< readable name such as 'google', 'yahoo', etc */ - char *hostname; /**< host address such as www.google.com */ - char *searchstring; /** < such as "www.google.com?search=%s" */ + char *name; /**< readable name such as 'duckduckgo', 'seeks', etc */ + char *hostname; /**< host address such as www.duckduckgo.com/html */ + char *searchstring; /** < such as "www.duckduckgo.com/html/?q=%s" */ char *ico; /** < location of domain's favicon */ hlcache_handle *ico_handle; }; @@ -52,7 +52,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|http://duckduckgo.com/html/?q=%s|http://www.google.com/favicon.ico|\n"; static const char *default_search_icon_url = "resource:icons/search.png"; diff --git a/netsurf/frontends/amiga/dist/NetSurf.guide b/netsurf/frontends/amiga/dist/NetSurf.guide index 0bdd900..e2be43c 100755 --- a/netsurf/frontends/amiga/dist/NetSurf.guide +++ b/netsurf/frontends/amiga/dist/NetSurf.guide @@ -308,13 +308,13 @@ eg. | +- -- | - +- Google + +- DuckDuckGo HTML Will look something like the following within the menu: |NetSurf »| - |NetSurf Homepage | |---------| |More NetSurf links| -|Google | +|DuckDuckGo HTML | @endnode diff --git a/netsurf/frontends/gtk/res/options.gtk2.ui b/netsurf/frontends/gtk/res/options.gtk2.ui index 907d0b5..a2de65c 100644 --- a/netsurf/frontends/gtk/res/options.gtk2.ui +++ b/netsurf/frontends/gtk/res/options.gtk2.ui @@ -188,68 +188,17 @@ - - Google - - - Yahoo! - - - Microsoft Live - - - Buisiness.com - - - Omgili - - - BBC News - - - Ubuntu Packages - Creative Commons - - Ask - - - Answers - Dictionary.com - - YouTube - - - AeroMP3 - - - AOL - - - Baidu - - - Amazon - - - Ebay - - - IMBD - - - ESPN - Wikipedia - DuckDuckGo + DuckDuckGo HTML diff --git a/netsurf/frontends/gtk/res/options.gtk3.ui b/netsurf/frontends/gtk/res/options.gtk3.ui index 82a3e17..029af01 100644 --- a/netsurf/frontends/gtk/res/options.gtk3.ui +++ b/netsurf/frontends/gtk/res/options.gtk3.ui @@ -2907,68 +2907,17 @@ - - Google - - - Yahoo! - - - Microsoft Live - - - Buisiness.com - - - Omgili - - - BBC News - - - Ubuntu Packages - Creative Commons - - Ask - - - Answers - Dictionary.com - - YouTube - - - AeroMP3 - - - AOL - - - Baidu - - - Amazon - - - Ebay - - - IMBD - - - ESPN - Wikipedia - DuckDuckGo + DuckDuckGo HTML diff --git a/netsurf/frontends/riscos/appdir/Resources/SearchEngines b/netsurf/frontends/riscos/appdir/Resources/SearchEngines index e7fd7cb..f06b66a 100644 --- a/netsurf/frontends/riscos/appdir/Resources/SearchEngines +++ b/netsurf/frontends/riscos/appdir/Resources/SearchEngines @@ -1,22 +1,5 @@ -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| +DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico| +Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png| diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf deleted file mode 120000 index d3cfb11..0000000 --- a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../../../resources/de/welcome.html \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf new file mode 100644 index 0000000..cdd204a --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf @@ -0,0 +1,55 @@ + + +Welcome to NetSurf + + + + +

NetSurf

+ + + +
+

Willkommen zu NetSurf

+ +

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!

+ +
+
+ + +
+
+ +
+
    +
+ +
    +
+ + + + +
+ +
+

NetSurf ist lizensiert unter der GNU Public Licence Version 2

+
+
+ + + diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf deleted file mode 120000 index 71020bf..0000000 --- a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../../../resources/en/welcome.html \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf new file mode 100644 index 0000000..6c146dd --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf @@ -0,0 +1,54 @@ + + +Welcome to NetSurf + + + + +

NetSurf

+ + + +
+

Welcome to NetSurf

+ +

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!

+ +
+
+ + +
+
+ +
+
    +
+ +
    +
+ + + + +
+ +
+

NetSurf is licensed under the GNU Public Licence version 2

+
+
+ + + \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf deleted file mode 120000 index 6e24135..0000000 --- a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../../../resources/it/welcome.html \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf new file mode 100644 index 0000000..1dc24f7 --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf @@ -0,0 +1,54 @@ + + +Benvenuti su NetSurf + + + + +

NetSurf

+ + + +
+

Benvenuti su NetSurf

+ +

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!

+ +
+
+ + +
+
+ +
+
    +
+ +
    +
+ + + + +
+ +
+

NetSurf è rilasciato liberamente secondo i termini della Licenza Pubblica Generica GNU 2.0

+
+
+ + + diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf deleted file mode 120000 index 1dfdbd7..0000000 --- a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../../../resources/ja/welcome.html \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf new file mode 100644 index 0000000..925ac38 --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf @@ -0,0 +1,55 @@ + + + +NetSurfã¸ã‚ˆã†ã“ã + + + + +

NetSurf

+ + + +
+

NetSurfã¸ã‚ˆã†ã“ã

+ +

NetSurfã¯å°ã•ãã¦é€Ÿã„オープンソースã®ã‚¦ã‚§ãƒ–ブラウザã§ã™ã€‚ç§ãŸã¡ã¯ã„ã¤ã‚‚ã“ã®ãƒ–ラウザを改良ã™ã‚‹æ°—満々ã§ã™ã‹ã‚‰ã€ã©ã‚“ãªå•é¡Œã§ã‚‚声をã‹ã‘ã¦ãã ã•ã„。NetSurfã‚’é¸ã‚“ã§ãã‚Œã¦ã‚ã‚ŠãŒã¨ã†ï¼

+ +
+
+ + +
+
+ +
+
    +
+ +
    +
+ + + + +
+ +
+

NetSurfã¯GNU Public Licence version 2ã§ãƒ©ã‚¤ã‚»ãƒ³ã‚·ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚

+
+
+ + + diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf deleted file mode 120000 index 6de5c4a..0000000 --- a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf +++ /dev/null @@ -1 +0,0 @@ -../../../../../resources/nl/welcome.html \ No newline at end of file diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf new file mode 100644 index 0000000..62dc1bb --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf @@ -0,0 +1,66 @@ + + +Welkom bij NetSurf + + + + +

NetSurf

+ + + +
+

Welkom bij NetSurf

+ +

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.

+ +
+
+ + +
+
+ +
+ +

Nieuws

+

+ +

RISC OS

+

+ +

Techniek

+

+ +

Zoeken

+

+
+ +
+

NetSurf is beschikbaar overeenkomstig GNU Public Licentie, versie 2

+
+
+ + + diff --git a/netsurf/resources/SearchEngines b/netsurf/resources/SearchEngines index 38e7795..c4dd5e2 100644 --- a/netsurf/resources/SearchEngines +++ b/netsurf/resources/SearchEngines @@ -1,20 +1,5 @@ -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 +DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation +Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon