netsurf: branch master updated. release/3.0-321-g0a0e786

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0a0e7867b97a530686b4b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0a0e7867b97a530686b4bc4... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0a0e7867b97a530686b4bc428... The branch, master has been updated via 0a0e7867b97a530686b4bc428dada5268e68e513 (commit) via 0f79676d85bcdd5e5ff1192444bb9c38205728e8 (commit) via a479e8d18a464280fdf85aebd7cbf74a3fba301f (commit) from 618ef549838363f337a2162f34c0fa60c6e1899f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0a0e7867b97a530686b... commit 0a0e7867b97a530686b4bc428dada5268e68e513 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix enable/disable of tab close option diff --git a/amiga/menu.h b/amiga/menu.h index 47c848e..dea99c5 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -113,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) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0f79676d85bcdd5e5ff... commit 0f79676d85bcdd5e5ff1192444bb9c38205728e8 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Re-arrange menu to better conform to the Style Guide diff --git a/amiga/menu.c b/amiga/menu.c index 3e9ac97..ef1338c 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 e96fcf0..47c848e 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2008,2009,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * 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, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a479e8d18a464280fdf... commit a479e8d18a464280fdf85aebd7cbf74a3fba301f Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Remove some ellipsis abuse - should only be used if the item is going to pop up a window or requester for more info before the requested operation is carried out. (have only modified the Amiga strings) diff --git a/resources/FatMessages b/resources/FatMessages index 20f7a2f..4e7c0b0 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 ----------------------------------------------------------------------- Summary of changes: amiga/menu.c | 9 ++++--- amiga/menu.h | 9 ++++--- resources/FatMessages | 56 ++++++++++++++++++++++++------------------------ 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/amiga/menu.c b/amiga/menu.c index 3e9ac97..ef1338c 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 e96fcf0..dea99c5 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2008,2009,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * 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 20f7a2f..4e7c0b0 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 -- NetSurf Browser