Convert the CREDITS file to utf8 and spell Ugras' name correctly.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15731 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/CREDITS b/lib/CREDITS
index f40ab5c99c9eb91332bb4bbd211ee056e2ff26c3..d1a6b915842bfeaf5e9fcdcd723ac56eaa8bc76b 100644 (file)
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -4,15 +4,15 @@
 @bAsger Alstrup
 @iE-mail: aalstrup@laerdal.dk
    General hacking of user interface stuff and those other bits and pieces
-@bPascal André
+@bPascal André
 @iE-mail: andre@via.ecp.fr
    External style definition files, linuxdoc sgml support and more ftp-site ftp.lyx.org
-@bJoão Luis Meloni Assirati
+@bJoão Luis Meloni Assirati
 @iE-mail: assirati@nonada.if.usp.br
    Added support for unix sockets and thence the 'inverse DVI' feature
-@bOzgur Ugras Baran
+@bÖzgür Uğraş Baran
 @iE-mail: ugras.baran@gmail.com
-   New commandparams structure
+   New commandparams structure, Nomenclature inset
 @bYves Bastide
 @iE-mail: yves.bastide@irisa.fr
    Bug fixes
@@ -28,7 +28,7 @@
 @bGraham Biswell
 @iE-mail: graham@gbiswell.com
    Small bugfixes that were very hard to find
-@bLars Gullik Bjønnes
+@bLars Gullik Bjønnes
 @iE-mail: larsbj@gullik.net
    Improvements to user interface (menus and keyhandling) including a configurable toolbar and a few other (not so) minor things, like rewriting most of the LyX kernel. Also current source maintainer
 @bAlfredo Braunstein
@@ -43,16 +43,16 @@
 @bFrancesc Burrull i Mestres
 @iE-mail: fburrull@mat.upc.es
    Catalan translation
-@bHumberto Nicolás Castejón
+@bHumberto Nicolás Castejón
 @iE-mail: beconico@gmail.com
    Spanish translation of the Windows installer
-@bMatej Cepl
+@bMatěj Cepl
 @iE-mail: matej@ceplovi.cz
    Improvements to the czech keymaps
 @bAlbert Chin
 @iE-mail: lyx-devel@mlists.thewrittenword.com
    Bug fixes
-@bJean-Pierre Chrétien
+@bJean-Pierre Chrétien
 @iE-mail: chretien@cert.fr
    French translation of the Windows installer
 @bClaudio Coco
@@ -73,7 +73,7 @@
 @bRonald Florence
 @iE-mail: ron@18james.com
    Maintainer of the OS X port(s)
-@bJosé Ramom Flores d'as Seixas
+@bJosé Ramom Flores d'as Seixas
 @iE-mail: fa2ramon@usc.es
    Galician documentation and localization
 @bJohn Michael Floyd
@@ -150,10 +150,10 @@
 @bPeter Kremer
 @iE-mail: kremer@bme-tel.ttt.bme.hu
    Hungarian translation and bind file for menu shortcuts
-@bPeter Kümmel
+@bPeter Kümmel
 @iE-mail: syntheticpp@gmx.net
    Qt4 coding, CMake build system, bug fixing, testing, clean ups, and profiling
-@bBernd Kümmerlen
+@bBernd Kümmerlen
 @iE-mail: bkuemmer@gmx.net
    Initial version of the koma-script textclasses
 @bFelix Kurth
@@ -181,10 +181,10 @@
 @bLing Li
 @iE-mail: ling@caltech.edu
    Added native support for \makebox to mathed. Several bug fixes, both to the source code and to the llncs layout file
-@bTomasz Luczak
+@bTomasz Łuczak
 @iE-mail: tlu@technodat.com.pl
    Polish translation and mw* layouts files
-@bJosé Matos
+@bJosé Matos
 @iE-mail: jamatos@fc.up.pt
    linuxdoc sgml support
 @bRoman Maurer
@@ -193,7 +193,7 @@
 @bTino Meinen
 @iE-mail: a.t.meinen@chello.nl
    Dutch translation coordinator
-@bIñaki Larrañaga Murgoitio
+@bIñaki Larrañaga Murgoitio
 @iE-mail: dooteo@euskalgnu.org
    Basque documentation and localization
 @bDaniel Naber
@@ -229,10 +229,10 @@
 @bNeoklis Polyzotis
 @iE-mail: alkis@soe.ucsc.edu
    Keymap work
-@bAndré Pönitz
+@bAndré Pönitz
 @iE-mail: andre.poenitz@mathematik.tu-chemnitz.de
    mathed rewrite to use STL file io with streams --export and --import command line options
-@bKornelia Pönitz
+@bKornelia Pönitz
 @iE-mail: kornelia.poenitz@mathematik.tu-chemnitz.de
    heavy mathed testing; provided siamltex document class
 @bBernhard Psaier
@@ -261,20 +261,20 @@
 @bMichael Ressler
 @iE-mail: mike.ressler@alum.mit.edu
    documentation maintainer, AASTeX support
-@bChristian Ridderström
+@bChristian Ridderström
 @iE-mail: christian.ridderstrom@home.se
    The driving force behind, and maintainer of, the LyX wiki wiki.
    Swedish translation of the Windows installer
 @bRan Rutenberg
 @iE-mail: ran.rutenberg@gmail.com
    Hebrew translation
-@bSzõke Sándor
+@bSzõke Sándor
 @iE-mail: alex@lyx.hu
    Hungarian translation
 @bJanus Sandsgaard
 @iE-mail: janus@janus.dk
    Danish translation of the Windows installer
-@bEulogio Serradilla Rodríguez
+@bEulogio Serradilla Rodríguez
 @iE-mail: eulogio.sr@terra.es
    contribution to the spanish internationalization
 @bHubert Schreier
@@ -295,7 +295,7 @@
 @bAndre Spiegel
 @iE-mail: spiegel@gnu.org
    vertical spaces
-@bJürgen Spitzmüller
+@bJürgen Spitzmüller
 @iE-mail: juergen.sp@t-online.de
    Qt frontend, bugfixes
 @bJohn Spray
@@ -304,13 +304,13 @@
 @bBen Stanley
 @iE-mail: ben.stanley@exemail.com.au
    fix bugs with error insets placement
-@bUwe Stöhr
+@bUwe Stöhr
 @iE-mail: uwestoehr@web.de
    German translation of the Windows installer
-@bDavid Suárez de Lis
+@bDavid Suárez de Lis
 @iE-mail: excalibor@iname.com
    maintaining es.po since v1.0.0 and other small i18n issues small fixes
-@bPeter Sütterlin
+@bPeter Sütterlin
 @iE-mail: p.suetterlin@astro.uu.nl
    aapaper support, german documentation translation, bug reports
 @bKayvan Aghaiepour Sylvan
@@ -337,13 +337,13 @@
 @bMartin Vermeer
 @iE-mail: martin.vermeer@hut.fi
    support for optional argument in sections/captions svjour/svjog, egs and llncs document classes. Lot of bug hunting (and fixing!)
-@bJürgen Vigna
+@bJürgen Vigna
 @iE-mail: jug@lyx.org
    complete rewrite of the tabular, text inset; fax- and Ascii-Export support; iletter and dinbrief support
 @bPauli Virtanen
 @iE-mail: pauli.virtanen@hut.fi
    Finnish localization of the interface
-@bHerbert Voß
+@bHerbert Voß
 @iE-mail: herbert.voss@alumni.tu-berlin.de
    The one who answers all questions on lyx-users mailing list and maintains www.lyx.org/help/ Big insetgraphics and bibliography cleanups
 @bAndreas Vox

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index c61fe616fa7c081ec7a798ed526533c2166899da..7f9fa23155c9a0c5ef8462480f0e16942d5497cd 100755 (executable)
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -286,12 +286,7 @@ def main(argv, contributers):
      if len(argv) != 4:
           error(usage(argv[0]))
 
-     txt_credits_data = unicode(as_txt_credits(contributers)) \
-                        .encode("latin1", "xmlcharrefreplace")
-     # This is a fudge to give a 'reasonable' spelling of Matej's name.
-     txt_credits_data = txt_credits_data.replace('ě', 'e')
-     # This is a fudge to give a 'reasonable' spelling of Tomasz' name.
-     txt_credits_data = txt_credits_data.replace('Ł', 'L')
+     txt_credits_data = unicode(as_txt_credits(contributers)).encode("utf-8")
      txt_credits = open(argv[1], "w")
      txt_credits.write(txt_credits_data)
 
@@ -342,13 +337,13 @@ contributers = [
                  "23 February 2005",
                  u"Added support for unix sockets and thence the 'inverse DVI' feature"),
 
-     contributer(u"Ozgur Ugras Baran",
+     contributer(u"Özgür Uğraş Baran",
                  "ugras.baran () gmail ! com",
                  "GPL",
                  "Re: [patch] new InsetCommandParams",
                  "m=116124030512963",
                  "19 October 2006",
-                 u"New commandparams structure"),
+                 u"New commandparams structure, Nomenclature inset"),
 
      contributer(u"Yves Bastide",
                  "yves.bastide () irisa ! fr",

diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C
index ecfe9e3b18a1b0d61fe4237acc5d94cc9e4dfe8a..667d316a627493bde0c50f21d76b1fcc4a868fb2 100644 (file)
--- a/src/frontends/qt4/QAbout.C
+++ b/src/frontends/qt4/QAbout.C
@@ -105,16 +105,7 @@ void QAbout::build_dialog()
        }
 #endif
 
-       // Try and grab the latin1 codec
-       QTextCodec * const codec =
-               QTextCodec::codecForName("ISO8859-1");
-       if (!codec)
-               lyxerr << "Unable to find ISO8859-1 codec" << std::endl;
-
-       QString const qtext = codec ?
-               codec->toUnicode(out.str().c_str()) :
-               toqstr(out.str());
-       dialog_->creditsTB->setHtml(qtext);
+       dialog_->creditsTB->setHtml(toqstr(out.str()));
 
        // try to resize to a good size
        dialog_->copyrightTB->hide();