From cfeab7476f1263f8638c0e89ea0033d23f09d7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Thu, 9 Jul 2009 11:49:16 +0000 Subject: [PATCH] * 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 --- src/insets/InsetBranch.cpp | 3 ++- status.16x | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index a9b4aa342a..aa0eb41bf9 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -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 diff --git a/status.16x b/status.16x index 150151ed6f..73316a3e27 100644 --- a/status.16x +++ b/status.16x @@ -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