de.po

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e71c83122d18121303886ea110748960cb703b38..7dbef4f18d01bd2cf7c62a139a0f855ab1e4c200 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1726,9 +1726,11 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
        try { ofs.reset(encoding); }
        catch (iconv_codecvt_facet_exception const & e) {
                lyxerr << "Caught iconv exception: " << e.what() << endl;
-               Alert::error(_("Iconv software exception Detected"), bformat(_("Please "
-                       "verify that the support software for your encoding (%1$s) is "
-                       "properly installed"), from_ascii(encoding)));
+               Alert::error(_("Iconv software exception Detected"),
+                       bformat(_("Please verify that the `iconv' support software is"
+                                         " properly installed and supports the selected encoding"
+                                         " (%1$s), or change the encoding in"
+                                         " Document>Settings>Language."), from_ascii(encoding)));
                return ExportError;
        }
        if (!openFileWrite(ofs, fname))
@@ -4456,12 +4458,15 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                        if (!put_in_tempdir) {
                                // Only show this alert if this is an export to a non-temporary
                                // file (not for previewing).
-                               docstring s = _("No information for exporting the format %1$s.");
+                               docstring s = bformat(_("No information for exporting the format %1$s."),
+                                                     theFormats().prettyName(format));
                                if (format == "pdf4")
-                                 s += _("\nHint: use non-TeX fonts or set input encoding to "
-                                                "'utf8' or 'ascii'");
-                               Alert::error(_("Couldn't export file"),
-                                                        bformat(s, theFormats().prettyName(format)));
+                                       s += "\n"
+                                         + bformat(_("Hint: use non-TeX fonts or set input encoding "
+                                                     " to '%1$s' or '%2$s'"),
+                                                   from_utf8(encodings.fromLyXName("utf8")->guiName()),
+                                                   from_utf8(encodings.fromLyXName("ascii")->guiName()));
+                               Alert::error(_("Couldn't export file"), s);
                        }
                        return ExportNoPathToFormat;
                }
@@ -5254,6 +5259,11 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
        // to resolve macros in it.
        parit.text()->setMacrocontextPosition(parit);
 
+       // Reset bibitem counter in master (#8499)
+       Buffer const * const master = masterBuffer();
+       if (master == this && !d->ignore_parent)
+               master->params().documentClass().counters().reset(from_ascii("bibitem"));
+
        depth_type maxdepth = 0;
        pit_type const lastpit = parit.lastpit();
        for ( ; parit.pit() <= lastpit ; ++parit.pit()) {