diff --git a/xpfe/bootstrap/nsMacVersion.r b/xpfe/bootstrap/nsMacVersion.r index 26ae891dba70..c0e4cba8acfc 100644 --- a/xpfe/bootstrap/nsMacVersion.r +++ b/xpfe/bootstrap/nsMacVersion.r @@ -24,46 +24,28 @@ #include "Types.r" -#define APPLICATION_NAME "Gecko" -#define TRADEMARK_NAME APPLICATION_NAME "ª " -#define VERSION_CORP_STR "www.mozilla.org" +// Version Numbers // -#define APPLICATION_LANGUAGE "en" - -#define VERSION_MAJOR_STR "" -#define VERSION_MINOR_STR "0.8" -#define VERSION_STRING VERSION_MAJOR_STR VERSION_MINOR_STR -#define VERSION_LANG "en" // e.g. en, ja, de, fr -#define VERSION_COUNTRY "_US" // e.g., _JP, _DE, _FR, _US -#define VERSION_LOCALE VERSION_LANG VERSION_COUNTRY #define VERSION_MAJOR 0 #define VERSION_MINOR 128 // =[0x80] This is really revision & fix in BCD #define VERSION_MICRO 0 // This is really the internal stage #define VERSION_KIND alpha -#define COPYRIGHT_STRING ", Mozilla Open Source" -//#define GETINFO_DESC TRADEMARK_NAME VERSION_STRING -#define GETINFO_DESC VERSION_CORP_STR +// Version Strings (Finder's Get Info dialog box) // -#define GETINFO_VERSION VERSION_STRING COPYRIGHT_STRING +#define VERSION_STRING "0.8+" +//#define VERSION_LANG "en" // e.g. en, ja, de, fr +//#define VERSION_COUNTRY "_US" // e.g., _JP, _DE, _FR, _US +//#define VERSION_LOCALE "[" VERSION_LANG "_" VERSION_COUNTRY "]" -#ifdef MOZ_LITE -#define USER_AGENT_PPC_STRING "(Macintosh; %s; PPC, Nav)" -#define USER_AGENT_68K_STRING "(Macintosh; %s; 68K, Nav)" -#else -#define USER_AGENT_PPC_STRING "(Macintosh; %s; PPC)" -#define USER_AGENT_68K_STRING "(Macintosh; %s; 68K)" -#endif +#define COPYRIGHT_STRING "© 1998-2001 The Mozilla Organization" +#define GETINFO_VERSION VERSION_STRING ", " COPYRIGHT_STRING +#define PACKAGE_NAME "Mozilla " VERSION_STRING -#define USER_AGENT_NAME "Mozilla" -#ifdef powerc -#define USER_AGENT_VERSION VERSION_STRING " [" VERSION_LOCALE "] " USER_AGENT_PPC_STRING -#else -#define USER_AGENT_VERSION VERSION_STRING " [" VERSION_LOCALE "] " USER_AGENT_68K_STRING -#endif +// Resources definition resource 'vers' (1, "Program") { VERSION_MAJOR, @@ -71,7 +53,7 @@ resource 'vers' (1, "Program") { VERSION_KIND, VERSION_MICRO, verUS, - USER_AGENT_VERSION, + VERSION_STRING, GETINFO_VERSION }; @@ -81,6 +63,6 @@ resource 'vers' (2, "Suite") { VERSION_KIND, VERSION_MICRO, verUS, - USER_AGENT_VERSION, - GETINFO_DESC + VERSION_STRING, + PACKAGE_NAME };