Merge branch 'master' into biblatex2

lib/CREDITS

@@ -67,6 +67,9 @@
 @bAlfredo Braunstein
 @iE-mail: abraunst () lyx ! org
    A (pseudo) threaded graphics loader queue, lots of fixes, etc.
+@bMartin A. Brown
+@iE-mail: martin () linux-ip ! net
+   Docbook fixes
 @bChristian Buescher
 @iE-mail: christian.buescher () uni-bielefeld ! de
    User-definable keys, lyxserver and more

lib/generate_contributions.py

@@ -511,6 +511,14 @@ contributors = [
                  "24 February 2005",
                  u"A (pseudo) threaded graphics loader queue, lots of fixes, etc."),
 
+     contributor(u"Martin A. Brown",
+                 "martin () linux-ip ! net",
+                 "GPL",
+                 "Re: public identifier for DocBook XML export",
+                 "m=148391461928571",
+                 "8 January 2017",
+                 u"Docbook fixes"),
+
      contributor(u"Christian Buescher",
                  "christian.buescher () uni-bielefeld ! de",
                  "",

src/frontends/qt4/GuiBibtex.cpp

@@ -110,6 +110,10 @@ GuiBibtex::GuiBibtex(GuiView & lv)
 	connect(add_->closePB, SIGNAL(clicked()),
 		add_, SLOT(reject()));
 
+	add_->bibLW->setToolTip(formatToolTip(qt_("This list consists of all databases that are indexed by LaTeX and thus are found without a file path. "
+				    "This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. "
+				    "If you want to reuse your own database, this is the place you should store it.")));
+
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
 	bc().setOK(okPB);
 	bc().setCancel(closePB);

src/frontends/qt4/ui/BibtexAddUi.ui

@@ -38,7 +38,7 @@
      <item row="1" column="0" colspan="2">
       <widget class="QListWidget" name="bibLW">
        <property name="toolTip">
-        <string>This list consists of all databases that are indexed by LaTeX and thus are found without a file path. This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. If you want to reuse your own database, this is the place you should store it.</string>
+        <string/>
        </property>
        <property name="selectionMode">
         <enum>QAbstractItemView::ExtendedSelection</enum>