summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2004-07-16 00:05:32 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2004-07-16 00:05:32 +0000
commit99d1c18252833c577dc5046e73ef7f7cc12bdb3a (patch)
tree1363c8394b0dc561506c2cb507653592be97eb03
parent2858f0b685a55bdd6317f1c2cd86ce4030b51590 (diff)
downloadnetsurf-99d1c18252833c577dc5046e73ef7f7cc12bdb3a.tar.gz
netsurf-99d1c18252833c577dc5046e73ef7f7cc12bdb3a.tar.bz2
[project @ 2004-07-16 00:05:31 by rjw]
Updates to the interactive help text to reflect current interface. Removed development code so the hotlist can be saved. svn path=/import/netsurf/; revision=1080
-rw-r--r--!NetSurf/Resources/en/Messages12
-rw-r--r--!NetSurf/Resources/fr/Messages12
-rw-r--r--riscos/hotlist.c1
3 files changed, 12 insertions, 13 deletions
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index b98cc62c9..fe928137c 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -190,7 +190,7 @@ HelpToolbar3:\Treload button.|M\Sreload this page.|M\Areload this page and any o
HelpToolbar5:\Thistory button.|M\Sopen the local history \w.
HelpToolbar6:\Tsave button.|M\Ssave the current document.
#HelpToolbar7:\Tprint button.|M\Sprint this page.|MOpens a print dialogue box.
-HelpToolbar8:\Thotlist button.|M\Sadd this address to the hotlist.|M\Aopen the hotlist management \w.
+HelpToolbar8:\Thotlist button.|M\Sopen the hotlist management \w.\Aadd this address to the hotlist.|M
HelpToolbar9:\Tscale view button.|M\Sscale the page, affecting both text and images.
#HelpToolbar10:\Tsearch button.
#HelpToolbar11:\Tup button.|M\Smove up the directory structure.
@@ -234,7 +234,7 @@ HelpBrowserMenu2:\Rsee the navigation options.
HelpBrowserMenu2-1:\Sgo back a page in the local history.|MForm information is not resubmitted.
HelpBrowserMenu2-2:\Sstep forward a page in the local history.|MForm information is not resubmitted.
HelpBrowserMenu2-3:\Sfetch the current page again.
-HelpBrowserMenu2-3:\Sstop NetSurf from continuing to load this page.
+HelpBrowserMenu2-4:\Sstop NetSurf from continuing to load this page.
HelpBrowserMenu3:\Rset the local display options.
HelpBrowserMenu3-0:\Rscale the page, affecting both text and images.
HelpBrowserMenu3-1:\Rset the local image options.
@@ -248,11 +248,11 @@ HelpBrowserMenu3-2-0:\Stoggle the display of the toolbar buttons.|MURL bar uses
HelpBrowserMenu3-2-1:\Stoggle the display of the address (URL) bar.
HelpBrowserMenu3-2-2:\Stoggle the display of the throbber.|MURL bar uses the remaining space.
HelpBrowserMenu3-2-3:\Stoggle the display of the status bar.|MHorizontal scroll bar uses the remaining width.
-HelpBrowserMenu3-3:\Rcontrol the default window positioning.
-HelpBrowserMenu3-3-0:\Sto make the current window position the default.
-HelpBrowserMenu3-3-3:\Sto return to the default window positioning.
-HelpBrowserMenu3-4:\Smake your local display options the default options for NetSurf.
+HelpBrowserMenu3-3:\Smake your local display options the default options for NetSurf.
HelpBrowserMenu4:\Rto access NetSurf's built in utilities.|MUtilities are tools such as the hotlist, history tree and setup options.
+HelpBrowserMenu4-1:\Rcontrol the default window positioning.
+HelpBrowserMenu4-1-0:\Sto make the current window position the default.
+HelpBrowserMenu4-1-3:\Sto return to the default window positioning.
HelpBrowserMenu5:\Rsee the help resources available.
HelpBrowserMenu5-0:\Sopen the documentation contents page in a new \w.
HelpBrowserMenu5-1:\Sopen the user guide in a new \w.
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index 9f8176219..3e6b8ae41 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -190,7 +190,7 @@ HelpToolbar3:\Treload button.|M\Sreload this page.|M\Areload this page and any o
HelpToolbar5:\Thistory button.|M\Sopen the local history \w.
HelpToolbar6:\Tsave button.|M\Ssave the current document.
#HelpToolbar7:\Tprint button.|M\Sprint this page.|MOpens a print dialogue box.
-HelpToolbar8:\Thotlist button.|M\Sadd this address to the hotlist.|M\Aopen the hotlist management \w.
+HelpToolbar8:\Thotlist button.|M\Sopen the hotlist management \w.\Aadd this address to the hotlist.|M
HelpToolbar9:\Tscale view button.|M\Sscale the page, affecting both text and images.
#HelpToolbar10:\Tsearch button.
#HelpToolbar11:\Tup button.|M\Smove up the directory structure.
@@ -234,7 +234,7 @@ HelpBrowserMenu2:\Rsee the navigation options.
HelpBrowserMenu2-1:\Sgo back a page in the local history.|MForm information is not resubmitted.
HelpBrowserMenu2-2:\Sstep forward a page in the local history.|MForm information is not resubmitted.
HelpBrowserMenu2-3:\Sfetch the current page again.
-HelpBrowserMenu2-3:\Sstop NetSurf from continuing to load this page.
+HelpBrowserMenu2-4:\Sstop NetSurf from continuing to load this page.
HelpBrowserMenu3:\Rset the local display options.
HelpBrowserMenu3-0:\Rscale the page, affecting both text and images.
HelpBrowserMenu3-1:\Rset the local image options.
@@ -248,11 +248,11 @@ HelpBrowserMenu3-2-0:\Stoggle the display of the toolbar buttons.|MURL bar uses
HelpBrowserMenu3-2-1:\Stoggle the display of the address (URL) bar.
HelpBrowserMenu3-2-2:\Stoggle the display of the throbber.|MURL bar uses the remaining space.
HelpBrowserMenu3-2-3:\Stoggle the display of the status bar.|MHorizontal scroll bar uses the remaining width.
-HelpBrowserMenu3-3:\Rcontrol the default window positioning.
-HelpBrowserMenu3-3-0:\Sto make the current window position the default.
-HelpBrowserMenu3-3-3:\Sto return to the default window positioning.
-HelpBrowserMenu3-4:\Smake your local display options the default options for NetSurf.
+HelpBrowserMenu3-3:\Smake your local display options the default options for NetSurf.
HelpBrowserMenu4:\Rto access NetSurf's built in utilities.|MUtilities are tools such as the hotlist, history tree and setup options.
+HelpBrowserMenu4-1:\Rcontrol the default window positioning.
+HelpBrowserMenu4-1-0:\Sto make the current window position the default.
+HelpBrowserMenu4-1-3:\Sto return to the default window positioning.
HelpBrowserMenu5:\Rsee the help resources available.
HelpBrowserMenu5-0:\Sopen the documentation contents page in a new \w.
HelpBrowserMenu5-1:\Sopen the user guide in a new \w.
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 52bebc7eb..728bf9f1c 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -537,7 +537,6 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry) {
* Perform a save to the default file
*/
void ro_gui_hotlist_save(void) {
- return;
/* Don't save if we didn't load
*/
if (!hotlist_window) return;