From bff9db34d942822cec3323a1419d637204abc6cb Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 19 May 2005 18:53:09 +0000 Subject: [PATCH] more text cleanups from Michael git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9958 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.C | 2 +- src/ChangeLog | 4 ++++ src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/ControlLog.C | 6 +++--- src/frontends/gtk/ChangeLog | 5 +++++ src/frontends/gtk/Dialogs.C | 2 +- src/frontends/gtk/GTexinfo.C | 2 +- src/frontends/qt2/ChangeLog | 8 ++++++++ src/frontends/qt2/Dialogs.C | 4 ++-- src/frontends/qt2/QTexinfo.C | 2 +- src/frontends/qt2/ui/QBibtexAddDialogBase.ui | 4 ++-- src/frontends/qt2/ui/QCitationFindDialogBase.ui | 6 +++--- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/Dialogs.C | 2 +- src/frontends/xforms/FormTexinfo.C | 2 +- 15 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/BufferView.C b/src/BufferView.C index 918d7a3e33..9b33d6567b 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -241,7 +241,7 @@ void BufferView::scroll(int lines) void BufferView::showErrorList(string const & action) const { if (getErrorList().size()) { - string const title = bformat(_("LyX: %1$s errors (%2$s)"), + string const title = bformat(_("%1$s Errors (%2$s)"), action, buffer()->fileName()); owner()->getDialogs().show("errorlist", title); pimpl_->errorlist_.clear(); diff --git a/src/ChangeLog b/src/ChangeLog index 13b68c0ed7..c32662748f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-05-14 Michael Schmitt + + * BufferView.C: fix dialog title + 2005-05-18 Georg Baum * lyx_main.C (priv_exec): fix logic error with help from Angus diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index ffd2cc4c7a..d6db819e7d 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2005-05-14 Michael Schmitt + + * ControlLog.C: fix dialog title + 2005-05-13 Angus Leeming * helper_funcs.C (browseFile, browseDir): remove the loop that tested diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C index 4f849af0b8..148bd7f9b9 100644 --- a/src/frontends/controllers/ControlLog.C +++ b/src/frontends/controllers/ControlLog.C @@ -71,13 +71,13 @@ string const ControlLog::title() const string t; switch (type_) { case LatexLog: - t = _("LyX: LaTeX Log"); + t = _("LaTeX Log"); break; case LiterateLog: - t = _("LyX: Literate Programming Build Log"); + t = _("Literate Programming Build Log"); break; case Lyx2lyxLog: - t = _("LyX: lyx2lyx error Log"); + t = _("lyx2lyx Error Log"); break; case VCLog: t = _("Version Control Log"); diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index 38f52c1237..c071866d90 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,8 @@ +2005-05-14 Michael Schmitt + + * Dialogs.C: dialog title "Index" => "Index Entry" + * GTexinfo.C: dialog title "LaTeX Information" => "TeX Information" + 2005-04-25 Angus Leeming * GChanges.C: diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C index 34e09dc27d..7887c04e83 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -264,7 +264,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name) dialog->bc().view(new GBC(dialog->bc())); dialog->setController(new ControlCommand(*dialog, name)); dialog->setView(new GText(*dialog, - _("Index"), _("Keyword:|#K"))); + _("Index Entry"), _("Keyword:|#K"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "label") { dialog->bc().view(new GBC(dialog->bc())); diff --git a/src/frontends/gtk/GTexinfo.C b/src/frontends/gtk/GTexinfo.C index 206807ae15..1062f4807b 100644 --- a/src/frontends/gtk/GTexinfo.C +++ b/src/frontends/gtk/GTexinfo.C @@ -34,7 +34,7 @@ namespace frontend { GTexinfo::GTexinfo(Dialog & parent) - : GViewCB(parent, _("LaTeX Information"), false), + : GViewCB(parent, _("TeX Information"), false), activeStyle(ControlTexinfo::cls) {} diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 49605f2340..687f639c9d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,11 @@ +2005-05-14 Michael Schmitt + + * Dialogs.C: add missing ":" to text messages + * QTexinfo.C: dialog title "LaTeX Information" => "TeX Information" + * ui/QBibtexAddDialogBase.ui: fix label & tooltip + * ui/QCitationFindDialogBase.ui: change text "citation key/entry" => + "bibliography key/entry" + 2005-05-19 Angus Leeming * qscreen.[Ch]: cache and reuse pixmaps to show the flashing cursor. diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index 387b89c9c3..88e4c09c94 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -230,13 +230,13 @@ Dialogs::DialogPtr Dialogs::build(string const & name) dialog->setController(new ControlCommand(*dialog, name)); dialog->setView(new QIndex(*dialog, _("Index Entry"), - qt_("&Keyword"))); + qt_("&Keyword:"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "label") { dialog->setController(new ControlCommand(*dialog, name)); dialog->setView(new QIndex(*dialog, _("Label"), - qt_("&Label"))); + qt_("&Label:"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "log") { dialog->setController(new ControlLog(*dialog)); diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index d1a2b1cd5d..6ffd783f2f 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -31,7 +31,7 @@ namespace frontend { typedef QController > base_class; QTexinfo::QTexinfo(Dialog & parent) - : base_class(parent, _("LaTeX Information")), + : base_class(parent, _("TeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls) { } diff --git a/src/frontends/qt2/ui/QBibtexAddDialogBase.ui b/src/frontends/qt2/ui/QBibtexAddDialogBase.ui index 9aed5a6b05..d75be56818 100644 --- a/src/frontends/qt2/ui/QBibtexAddDialogBase.ui +++ b/src/frontends/qt2/ui/QBibtexAddDialogBase.ui @@ -75,7 +75,7 @@ toolTip - Search the available citations + Enter BibTeX database name @@ -104,7 +104,7 @@ toolTip - Available citation keys + Available BibTeX databases diff --git a/src/frontends/qt2/ui/QCitationFindDialogBase.ui b/src/frontends/qt2/ui/QCitationFindDialogBase.ui index 07df2948e3..6434f286af 100644 --- a/src/frontends/qt2/ui/QCitationFindDialogBase.ui +++ b/src/frontends/qt2/ui/QCitationFindDialogBase.ui @@ -82,7 +82,7 @@ toolTip - Available citation keys + Available bibliography keys @@ -114,7 +114,7 @@ toolTip - Citation entry + Bibliography entry @@ -224,7 +224,7 @@ toolTip - Search the available citations + Browse the available bibliography entries diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index ffaa2a1894..e4eb1b2842 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2005-05-12 Michael Schmitt + + * Dialogs.C: change dialog title "Index" => "Index Entry" + * FormTexinfo.C: change dialog title "LaTeX Information" => "TeX Information" + 2005-05-13 Angus Leeming * checkedwidgets.[Ch] (CheckedPath): new class that determines diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C index 2a5d851adb..8ff574e81f 100644 --- a/src/frontends/xforms/Dialogs.C +++ b/src/frontends/xforms/Dialogs.C @@ -243,7 +243,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name) } else if (name == "index") { dialog->setController(new ControlCommand(*dialog, name)); dialog->setView(new FormText(*dialog, - _("Index"), _("Keyword:|#K"))); + _("Index Entry"), _("Keyword:|#K"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "label") { dialog->setController(new ControlCommand(*dialog, name)); diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C index b82b198c6c..037dda5971 100644 --- a/src/frontends/xforms/FormTexinfo.C +++ b/src/frontends/xforms/FormTexinfo.C @@ -32,7 +32,7 @@ namespace frontend { typedef FormController > base_class; FormTexinfo::FormTexinfo(Dialog & parent) - : base_class(parent, _("LaTeX Information")), + : base_class(parent, _("TeX Information")), activeStyle(ControlTexinfo::cls) {} -- 2.39.2