Mozilla/5.0 (OS/2; U; Warp 4.5; en-US; rv:1.7.2) Gecko/20040814 Firefox/0.9.1+ This is obvious, but I could not find another bug on this. So this is probably OS/2 only. Tools->Options opens the prefs panel, but instead of "Options" this panel is titled "Preferences". This should get renamed for consistency.

Hmm, the ifdef in browser/components/prefwindow/content/pref.xul only uses XP_WIN. If it was C++ I would use this mini patch to fix it: --- browser/components/prefwindow/content/pref.xul 7 Jun 2004 07:59:08 -0000 1.23.10.2 +++ browser/components/prefwindow/content/pref.xul 14 Aug 2004 14:30:12 -0000 @@ -7,7 +7,7 @@ <dialog id="prefDialog" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" -#ifdef XP_WIN +#if defined(XP_WIN) || defined(XP_OS2) title="&prefWindow.title;" #else title="&prefWindowUnix.title;" But this is in XUL code and so breaks the build. I didn't manage to find a similar case in any XUL file on LXR, so what is the best way to do it? There are probably other cases where this might be necessary...

*** This bug has been marked as a duplicate of 245862 ***

No Felix, this is _not_ a dupe of that bug. While I agree that under OS/2 it should also be called as Edit->Preferences like in many browsers before, this was discussed in the newsgroup and it was decided that Tools->Options is more consistent with OS/2's CUA91 (or CUA93?) document. CCing Mike to see if he has anything to say on this. Anyway, this is not what this bug is about, this is about the _title_ of the dialog and not the placement in the menus. Clarifying Summary.

better fix would be: #ifdef XP_UNIX title="&prefWindowUnix.title;" #else title="&prefWindow.title;"

Then what happens to MacOS? At the moment it seems to be called &prefWindowUnix.title; there, but with that fix it will be &prefWindow.title; or what am I missing?

XP_UNIX is defined for OS X, so it'll be fine

OK, made a proper patch from that. As expected, it works fine to fix this problem on OS/2.

Comment on attachment 156190 [details] [diff] [review] reverse ifdef, use XP_UNIX #ifdef XP_UNIX is true for MACOSX as well. See http://www.mozilla.org/build/mac.html at the bottom. So you need to do something like this: #ifdef XP_UNIX #ifndef XP_MACOSX (Preferences) #else (Options) #endif #else (Options) #endif

Comment on attachment 156190 [details] [diff] [review] reverse ifdef, use XP_UNIX Argh, just ignore my comment. Restoring review request.

Comment on attachment 156190 [details] [diff] [review] reverse ifdef, use XP_UNIX a=mkaply

Checked in br & trunk.

sorry for bugspam, long-overdue mass reassign of ancient QA contact bugs, filter on "beltznerLovesGoats" to get rid of this mass change