summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/menu.c9
-rwxr-xr-xamiga/menu.h9
-rw-r--r--resources/FatMessages56
3 files changed, 38 insertions, 36 deletions
diff --git a/amiga/menu.c b/amiga/menu.c
index 3e9ac9708..ef1338cc8 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -199,16 +199,17 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_IFF);
ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
+ ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', NULL,
+ ami_menu_item_project_print, NULL);
+ ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_CLOSETAB, NM_ITEM, "CloseTab", 'K', NULL,
ami_menu_item_project_closetab, NULL);
ami_menu_alloc_item(gwin, M_CLOSEWIN, NM_ITEM, "CloseWindow", 0, NULL,
ami_menu_item_project_closewin, NULL);
- ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
- ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', NULL,
- ami_menu_item_project_print, NULL);
- ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
+ ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_ABOUT, NM_ITEM, "About", '?', NULL,
ami_menu_item_project_about, NULL);
+ ami_menu_alloc_item(gwin, M_BAR_P5, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_QUIT, NM_ITEM, "Quit", 'Q', NULL,
ami_menu_item_project_quit, NULL);
diff --git a/amiga/menu.h b/amiga/menu.h
index e96fcf0ee..dea99c569 100755
--- a/amiga/menu.h
+++ b/amiga/menu.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2008,2009 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2008,2009,2013 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -46,12 +46,13 @@ enum {
M_SAVEPDF,
#endif
M_BAR_P2,
+ M_PRINT,
+ M_BAR_P3,
M_CLOSETAB,
M_CLOSEWIN,
- M_BAR_P3,
- M_PRINT,
M_BAR_P4,
M_ABOUT,
+ M_BAR_P5,
M_QUIT,
/* Edit menu */
M_EDIT,
@@ -112,7 +113,7 @@ enum {
#define AMI_MENU_SAVEAS_COMPLETE FULLMENUNUM(0,4,2)
#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,3)
#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,4)
-#define AMI_MENU_CLOSETAB FULLMENUNUM(0,6,0)
+#define AMI_MENU_CLOSETAB FULLMENUNUM(0,8,0)
#define AMI_MENU_CUT FULLMENUNUM(1,0,0)
#define AMI_MENU_COPY FULLMENUNUM(1,1,0)
#define AMI_MENU_PASTE FULLMENUNUM(1,2,0)
diff --git a/resources/FatMessages b/resources/FatMessages
index 20f7a2fd8..4e7c0b05a 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -244,7 +244,7 @@ nl.all.LinkSave:Save
en.all.LinkDload:Download target
de.all.LinkDload:Ziel speichern
fr.all.LinkDload:Download target
-it.all.LinkDload:Salva file in...
+it.all.LinkDload:Salva file in
nl.all.LinkDload:Download target
en.all.LinkNew:New window
de.all.LinkNew:Neues Fenster
@@ -774,11 +774,11 @@ de.all.OpenFile:Öffne lokale Datei...
fr.all.OpenFile:Open local file...
it.all.OpenFile:Apri file locale...
nl.all.OpenFile:Open local file...
-en.all.About:About...
-de.all.About:Über...
-fr.all.About:About...
-it.all.About:Informazioni...
-nl.all.About:About...
+en.all.About:About
+de.all.About:Über
+fr.all.About:About
+it.all.About:Informazioni
+nl.all.About:About
en.all.PrintNS:Print...
de.all.PrintNS:Drucken...
fr.all.PrintNS:Print...
@@ -820,16 +820,16 @@ de.all.Browser:Browser
fr.all.Browser:Browser
it.all.Browser:Strumenti
nl.all.Browser:Browser
-en.all.HistGlobalNS:Show global history...
-de.all.HistGlobalNS:Zeige globale History...
-fr.all.HistGlobalNS:Show global history...
-it.all.HistGlobalNS:Mostra cronologia globale...
-nl.all.HistGlobalNS:Show global history...
-en.all.HistLocalNS:Show local history...
-de.all.HistLocalNS:Zeige lokale History...
-fr.all.HistLocalNS:Show local history...
-it.all.HistLocalNS:Mostra cronologia locale...
-nl.all.HistLocalNS:Show local history...
+en.all.HistGlobalNS:Show global history
+de.all.HistGlobalNS:Zeige globale History
+fr.all.HistGlobalNS:Show global history
+it.all.HistGlobalNS:Mostra cronologia globale
+nl.all.HistGlobalNS:Show global history
+en.all.HistLocalNS:Show local history
+de.all.HistLocalNS:Zeige lokale History
+fr.all.HistLocalNS:Show local history
+it.all.HistLocalNS:Mostra cronologia locale
+nl.all.HistLocalNS:Show local history
en.all.FindTextNS:Find text...
de.all.FindTextNS:Suchen...
fr.all.FindTextNS:Find text...
@@ -863,19 +863,19 @@ nl.all.ScaleNorm:Normal
# Hotlist menu
#
-en.all.HotlistShowNS:Show hotlist...
-de.all.HotlistShowNS:Zeige Hotlist...
-fr.all.HotlistShowNS:Show hotlist...
-it.all.HotlistShowNS:Mostra...
-nl.all.HotlistShowNS:Show hotlist...
+en.all.HotlistShowNS:Show hotlist
+de.all.HotlistShowNS:Zeige Hotlist
+fr.all.HotlistShowNS:Show hotlist
+it.all.HotlistShowNS:Mostra
+nl.all.HotlistShowNS:Show hotlist
# Settings menu
#
-en.all.SettingsEdit:Edit preferences...
-de.all.SettingsEdit:Voreinstellungen...
-fr.all.SettingsEdit:Edit preferences...
-it.all.SettingsEdit:Modifica...
-nl.all.SettingsEdit:Edit preferences...
+en.all.SettingsEdit:Edit preferences
+de.all.SettingsEdit:Voreinstellungen
+fr.all.SettingsEdit:Edit preferences
+it.all.SettingsEdit:Modifica
+nl.all.SettingsEdit:Edit preferences
en.all.Settings:Settings
de.all.Settings:Einstellungen
fr.all.Settings:Settings
@@ -965,7 +965,7 @@ nl.all.Frame:Frame
en.all.FrameNewWin:Show in new window
de.all.FrameNewWin:In neuem Fenster anzeigen
fr.all.FrameNewWin:Show in new window
-it.all.FrameNewWin:Apri frame in nuova finestra...
+it.all.FrameNewWin:Apri frame in nuova finestra
nl.all.FrameNewWin:Show in new window
en.all.FrameNewTab:Show in new tab
de.all.FrameNewTab:In neuem Tab anzeigen
@@ -984,7 +984,7 @@ fr.all.SelectFile:Select file...
it.all.SelectFile:Seleziona file...
nl.all.SelectFile:Select file...
en.all.ExternalApp:Open in external application
-de.all.ExternalApp:In externer Anwendung öffnen..
+de.all.ExternalApp:In externer Anwendung öffnen
fr.all.ExternalApp:Open in external application
it.all.ExternalApp:Apri con applicazione esterna
nl.all.ExternalApp:Open in external application