K 10 svn:author V 3 jtn K 8 svn:date V 27 2010-08-26T09:06:15.690780Z K 7 svn:log V 313 In Gtk2 client, make "Merge the message notebook and the map notebook" override "Split bottom notebook area" if both are set, since they don't work well together. Includes string changes to document this (renaming the latter to "Split message/chat notebook area" as that's now more accurate). See gna bug #16500 END