mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 17:20:55 +00:00
* InsetBranch.cpp:
- fix display of "child only" suffix. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30424 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
54cd5c9e61
commit
cfeab7476f
@ -95,7 +95,8 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
|
||||
docstring s = _("Branch: ") + params_.branch;
|
||||
Buffer const & realbuffer = *buffer().masterBuffer();
|
||||
BranchList const & branchlist = realbuffer.params().branchlist();
|
||||
if (!branchlist.find(params_.branch))
|
||||
if (!branchlist.find(params_.branch)
|
||||
&& buffer().params().branchlist().find(params_.branch))
|
||||
s = _("Branch (child only): ") + params_.branch;
|
||||
if (!params_.branch.empty()) {
|
||||
// FIXME UNICODE
|
||||
|
@ -175,6 +175,8 @@ What's new
|
||||
- Ensure that pasting into the preamble and the nomenclature dialog's
|
||||
description widget resets the font formatting (bug 3936).
|
||||
|
||||
- Fix wrong labeling as "child only" branch if branches were unknown.
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user