Hello!
I harmonized the titles of the xforms and qt dialogs. (This will ease the life of the translators.) In addition, I fixed a few messages that I have already fixed in the 1.3 branch some weeks ago.
If nobody objects, please commit the patch. More patches (regarding text messages) will follow soon...
Michael
Index: xforms/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.982
diff -u -p -r1.982 ChangeLog
--- xforms/ChangeLog 2005/04/26 10:30:23 1.982
+++ xforms/ChangeLog 2005/05/04 21:37:02
@@ -1,3 +1,11 @@
+2005-05-04 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * forms/form_preferences.fd: fix capitalization
+ * Form*.C: Change dialog titles - harmonize with Qt frontend and
+ menu entries; fix capitalization; change "citation reference"
+ to "citation"
+ * FormTexinfo.C: correct tooltip
+
2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
* FormLog.h:
Index: xforms/FormBibitem.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormBibitem.C,v
retrieving revision 1.33
diff -u -p -r1.33 FormBibitem.C
--- xforms/FormBibitem.C 2004/05/19 15:11:35 1.33
+++ xforms/FormBibitem.C 2005/05/04 21:37:02
@@ -35,7 +35,7 @@ namespace frontend {
typedef FormController<ControlCommand, FormView<FD_bibitem> > base_class;
FormBibitem::FormBibitem(Dialog & parent)
- : base_class(parent, _("Bibliography Entry"))
+ : base_class(parent, _("Bibliography Entry Settings"))
{}
Index: xforms/FormBibtex.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormBibtex.C,v
retrieving revision 1.68
diff -u -p -r1.68 FormBibtex.C
--- xforms/FormBibtex.C 2004/11/25 11:08:31 1.68
+++ xforms/FormBibtex.C 2005/05/04 21:37:03
@@ -48,7 +48,7 @@ namespace frontend {
typedef FormController<ControlBibtex, FormView<FD_bibtex> > base_class;
FormBibtex::FormBibtex(Dialog & parent)
- : base_class(parent, _("BibTeX Database"))
+ : base_class(parent, _("BibTeX Bibliography"))
{}
Index: xforms/FormBox.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormBox.C,v
retrieving revision 1.8
diff -u -p -r1.8 FormBox.C
--- xforms/FormBox.C 2005/01/06 16:39:33 1.8
+++ xforms/FormBox.C 2005/05/04 21:37:03
@@ -44,7 +44,7 @@ namespace frontend {
typedef FormController<ControlBox, FormView<FD_box> > base_class;
FormBox::FormBox(Dialog & parent)
- : base_class(parent, _("Box"))
+ : base_class(parent, _("Box Settings"))
{}
Index: xforms/FormBranch.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormBranch.C,v
retrieving revision 1.7
diff -u -p -r1.7 FormBranch.C
--- xforms/FormBranch.C 2004/05/19 15:11:35 1.7
+++ xforms/FormBranch.C 2005/05/04 21:37:03
@@ -32,7 +32,7 @@ namespace frontend {
typedef FormController<ControlBranch, FormView<FD_branch> > base_class;
FormBranch::FormBranch(Dialog & parent)
- : base_class(parent, _("Branch"))
+ : base_class(parent, _("Branch Settings"))
{}
Index: xforms/FormCitation.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormCitation.C,v
retrieving revision 1.106
diff -u -p -r1.106 FormCitation.C
--- xforms/FormCitation.C 2004/10/05 10:11:40 1.106
+++ xforms/FormCitation.C 2005/05/04 21:37:04
@@ -172,10 +172,10 @@ void FormCitation::build()
fl_set_input_return(dialog_->input_search, FL_RETURN_END);
//set up the tooltip mechanism
- string str = _("Add the selected entry to the current citation
reference.");
+ string str = _("Add citation of the selected bibliography entry.");
tooltips().init(dialog_->button_add, str);
- str = _("Delete the selected entry from the current citation
reference.");
+ str = _("Delete citation of the selected bibliography entry.");
tooltips().init(dialog_->button_del, str);
str = _("Move the selected entry upwards (in the current list).");
@@ -191,14 +191,14 @@ void FormCitation::build()
setPrehandler(dialog_->browser_cite);
#endif
- str = _("All entries in the database you have loaded (via
\"Insert->Lists&TOC->BibTex Reference\"). Move the ones you want to cite with
the arrow buttons into the left browser window.");
+ str = _("All entries in the database you have loaded (via
\"Insert->Lists&TOC->BibTeX Bibliography\"). Move the ones you want to cite
with the arrow buttons into the left browser window.");
tooltips().init(dialog_->browser_bib, str);
#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
// Work-around xforms' bug; enable tooltips for browser widgets.
setPrehandler(dialog_->browser_bib);
#endif
- str = _("Information about the selected entry");
+ str = _("Information about the selected bibliography entry");
tooltips().init(dialog_->browser_info, str);
#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
// Work-around xforms' bug; enable tooltips for browser widgets.
@@ -208,16 +208,16 @@ void FormCitation::build()
str = _("Here you may select how the citation label should look inside
the text (Natbib).");
tooltips().init(dialog_->choice_style, str);
- str = _("Activate if you want to print all authors in a reference with
more than three authors, and not \"<First Author> et al.\" (Natbib).");
+ str = _("Activate if you want to print all authors in a citation with
more than three authors, and not \"<First Author> et al.\" (Natbib).");
tooltips().init(dialog_->check_full_author_list, str);
str = _("Activate if you want to print the first character of the
author name as uppercase (\"Van Gogh\", not \"van Gogh\"). Useful at the
beginning of sentences (Natbib).");
tooltips().init(dialog_->check_force_uppercase, str);
- str = _("Optional text which appears before the citation reference,
e.g. \"see <Ref>\"");
+ str = _("Optional text which appears before the citation, e.g. \"see
<Ref>\"");
tooltips().init(dialog_->input_before, str);
- str = _("Optional text which appears after the citation reference, e.g.
\"pp. 12\"");
+ str = _("Optional text which appears after the citation, e.g. \"pp.
12\"");
tooltips().init(dialog_->input_after, str);
str = _("Search your database (all fields will be searched).");
Index: xforms/FormERT.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormERT.C,v
retrieving revision 1.19
diff -u -p -r1.19 FormERT.C
--- xforms/FormERT.C 2004/05/19 15:11:35 1.19
+++ xforms/FormERT.C 2005/05/04 21:37:04
@@ -24,7 +24,7 @@ namespace frontend {
typedef FormController<ControlERT, FormView<FD_ert> > base_class;
FormERT::FormERT(Dialog & parent)
- : base_class(parent, _("TeX Settings"))
+ : base_class(parent, _("TeX Code Settings"))
{}
Index: xforms/FormLog.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormLog.C,v
retrieving revision 1.26
diff -u -p -r1.26 FormLog.C
--- xforms/FormLog.C 2004/07/24 10:55:23 1.26
+++ xforms/FormLog.C 2005/05/04 21:37:04
@@ -22,7 +22,7 @@ namespace lyx {
namespace frontend {
FormLog::FormLog(Dialog & parent)
- : FormController<ControlLog, FormBrowser>(parent, "")
+ : FormController<ControlLog, FormBrowser>(parent, _("LaTeX Log"))
{}
Index: xforms/FormNote.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormNote.C,v
retrieving revision 1.14
diff -u -p -r1.14 FormNote.C
--- xforms/FormNote.C 2004/05/19 15:11:35 1.14
+++ xforms/FormNote.C 2005/05/04 21:37:04
@@ -29,7 +29,7 @@ namespace frontend {
typedef FormController<ControlNote, FormView<FD_note> > base_class;
FormNote::FormNote(Dialog & parent)
- : base_class(parent, _("LyX: Note Settings"))
+ : base_class(parent, _("Note Settings"))
{}
Index: xforms/FormRef.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormRef.C,v
retrieving revision 1.79
diff -u -p -r1.79 FormRef.C
--- xforms/FormRef.C 2005/02/21 10:30:11 1.79
+++ xforms/FormRef.C 2005/05/04 21:37:05
@@ -80,7 +80,7 @@ void FormRef::build()
tooltips().init(dialog_->button_go, str);
str = _("Update the list of labels.");
tooltips().init(dialog_->button_update, str);
- str = _("Select format style of the reference.");
+ str = _("Select format style of the cross-reference.");
tooltips().init(dialog_->choice_format, str);
}
Index: xforms/FormSendto.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormSendto.C,v
retrieving revision 1.29
diff -u -p -r1.29 FormSendto.C
--- xforms/FormSendto.C 2004/05/19 15:11:36 1.29
+++ xforms/FormSendto.C 2005/05/04 21:37:05
@@ -36,7 +36,7 @@ namespace frontend {
typedef FormController<ControlSendto, FormView<FD_sendto> > base_class;
FormSendto::FormSendto(Dialog & parent)
- : base_class(parent, _("Send document to command"))
+ : base_class(parent, _("Send Document to Command"))
{}
Index: xforms/FormSpellchecker.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormSpellchecker.C,v
retrieving revision 1.44
diff -u -p -r1.44 FormSpellchecker.C
--- xforms/FormSpellchecker.C 2005/01/06 16:39:34 1.44
+++ xforms/FormSpellchecker.C 2005/05/04 21:37:05
@@ -31,7 +31,7 @@ namespace frontend {
typedef FormController<ControlSpellchecker, FormView<FD_spellchecker> >
base_class;
FormSpellchecker::FormSpellchecker(Dialog & parent)
- : base_class(parent, _("Spell-check document"))
+ : base_class(parent, _("Spellchecker"))
{}
Index: xforms/FormTexinfo.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormTexinfo.C,v
retrieving revision 1.36
diff -u -p -r1.36 FormTexinfo.C
--- xforms/FormTexinfo.C 2004/05/19 15:11:36 1.36
+++ xforms/FormTexinfo.C 2005/05/04 21:37:05
@@ -57,7 +57,7 @@ void FormTexinfo::build() {
str = _("Show full path or only file name.");
tooltips().init(dialog_->check_fullpath, str);
- str = _("Runs the script \"TexFiles.sh\" to build new file lists.");
+ str = _("Runs the script \"TexFiles.sh\" to rebuild the file lists.");
tooltips().init(dialog_->button_rescan, str);
str = _("Double click to view contents of file.");
Index: xforms/FormVSpace.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormVSpace.C,v
retrieving revision 1.9
diff -u -p -r1.9 FormVSpace.C
--- xforms/FormVSpace.C 2005/01/06 16:39:34 1.9
+++ xforms/FormVSpace.C 2005/05/04 21:37:06
@@ -163,7 +163,7 @@ void setWidgetsFromVSpace(VSpace const &
typedef FormController<ControlVSpace, FormView<FD_vspace> > base_class;
FormVSpace::FormVSpace(Dialog & parent)
- : base_class(parent, _("VSpace Settings"))
+ : base_class(parent, _("Vertical Space Settings"))
{}
Index: xforms/forms/form_preferences.fd
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/form_preferences.fd,v
retrieving revision 1.72
diff -u -p -r1.72 form_preferences.fd
--- xforms/forms/form_preferences.fd 2005/01/16 21:01:40 1.72
+++ xforms/forms/form_preferences.fd 2005/05/04 21:37:09
@@ -3095,7 +3095,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Bibtex:|#B
+label: BibTeX:|#B
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
