diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-03-10 10:21:33 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-03-10 10:21:33 +0000 |
commit | 0d59fe834f6304e5d8172c97b936a4152d511911 (patch) | |
tree | 62628ef9efb4c4966e5c5013fb76bc604821ba49 | |
parent | 6af5ba0c8f6a08813fceab8e02dec0a9ae6497b8 (diff) | |
parent | f4b3f10d57207b824039d5cdd07f9ff7d51baefa (diff) | |
download | netsurf-0d59fe834f6304e5d8172c97b936a4152d511911.tar.gz netsurf-0d59fe834f6304e5d8172c97b936a4152d511911.tar.bz2 |
Merge remote-tracking branch 'origin/stevef/ibarmenu'
-rw-r--r-- | resources/FatMessages | 20 | ||||
-rw-r--r-- | riscos/iconbar.c | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/resources/FatMessages b/resources/FatMessages index 5539e8413..590212841 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -51,11 +51,21 @@ it.ami.NetSurfDesc:Piccolo come un mouse, veloce come un ghepardo. NetSurf è un en.all.Info:Info fr.all.Info:Information nl.all.Info:Informatie -en.ro.AppHelp:Help... F1 -de.ro.AppHelp:Hilfe... F1 -fr.ro.AppHelp:Aide... F1 -it.ro.AppHelp:Aiuto... F1 -nl.ro.AppHelp:Hulp... F1 +en.ro.AppHelpNoShortcut:Help... +de.ro.AppHelpNoShortcut:Hilfe... +fr.ro.AppHelpNoShortcut:Aide... +it.ro.AppHelpNoShortcut:Aiuto... +nl.ro.AppHelpNoShortcut:Hulp... +en.ro.HotlistShowNoShortcut:Show hotlist... +de.ro.HotlistShowNoShortcut:Hotlist zeigen... +fr.ro.HotlistShowNoShortcut:Montrer les favoris... +it.ro.HotlistShowNoShortcut:Mostra... +nl.ro.HotlistShowNoShortcut:Favorieten... +en.ro.HistGlobalNoShortcut:Show global history... +de.ro.HistGlobalNoShortcut:History (global) zeigen... +fr.ro.HistGlobalNoShortcut:Montrer l'historique global... +it.ro.HistGlobalNoShortcut:Mostra cronologia globale... +nl.ro.HistGlobalNoShortcut:Browsergeschiedenis... en.all.Open:Open de.all.Open:Öffnen fr.all.Open:Ouvrir diff --git a/riscos/iconbar.c b/riscos/iconbar.c index c234bc25d..23df24c3d 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -72,11 +72,11 @@ void ro_gui_iconbar_initialise(void) static const struct ns_menu iconbar_definition = { "NetSurf", { { "Info", NO_ACTION, &dialog_info }, - { "AppHelp", HELP_OPEN_CONTENTS, 0 }, + { "AppHelpNoShortcut", HELP_OPEN_CONTENTS, 0 }, { "Open", BROWSER_NAVIGATE_URL, 0 }, { "Open.OpenURL", BROWSER_NAVIGATE_URL, &dialog_openurl }, - { "Open.HotlistShow", HOTLIST_SHOW, 0 }, - { "Open.HistGlobal", HISTORY_SHOW_GLOBAL, 0 }, + { "Open.HotlistShowNoShortcut", HOTLIST_SHOW, 0 }, + { "Open.HistGlobalNoShortcut", HISTORY_SHOW_GLOBAL, 0 }, { "Open.ShowCookies", COOKIES_SHOW, 0 }, { "Choices", CHOICES_SHOW, 0 }, { "Quit", APPLICATION_QUIT, 0 }, |