From 451ee220f4b05ffb55f65330adbae6922a1d26d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sat, 23 Jun 2012 01:06:57 +0200
Subject: [PATCH] generate_contributions.py: - add Nickolay Shashkin - update
 maintainer status - add other new contributers whose code was in the meantime
 applied to branch

---
 lib/CREDITS                   | 16 ++++++++++++++--
 lib/generate_contributions.py | 36 +++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/lib/CREDITS b/lib/CREDITS
index 0338b6db58..b1f4073b46 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -177,7 +177,7 @@
    Norwegian documentation and localization
 @bRichard Heck
 @iE-mail: rgheck () comcast ! net
-   Bug fixes, layout modules, BibTeX code, XHTML export
+   Bug fixes, layout modules, BibTeX code, XHTML export. Current stable branch maintainer.
 @bBennett Helm
 @iE-mail: bennett.helm () fandm ! edu
    Maintainer of the OSX ports, taking over from Ronald Florence
@@ -225,15 +225,24 @@
 @bAndreas Klostermann
 @iE-mail: andreas_klostermann () web ! de
    Gtk reference insertion dialog
+@bTimo Kluck
+@iE-mail: tkluck () gmail ! com
+   Dutch translation, icon fixes
 @bKostantino
 @iE-mail: ciclope10 () alice ! it
    Italian localization of the interface
+@bScott Kostyshak
+@iE-mail: skostysh@princeton.edu
+   Small UI fixes
 @bMichael Koziarski
 @iE-mail: koziarski () gmail ! com
    Gnome port
 @bPeter Kremer
 @iE-mail: kremer () bme-tel ! ttt ! bme ! hu
    Hungarian translation and bind file for menu shortcuts
+@bMarcus Kriele
+@iE-mail: mkriele () me ! com
+   Fixing various sv* layouts
 @bValeriy Kruchko
 @iE-mail: lerkru () gmail ! com
    Russian translation of the user interface
@@ -438,6 +447,9 @@
 @bEulogio Serradilla Rodríguez
 @iE-mail: eulogio.sr () terra ! es
    contribution to the spanish internationalization
+@bNickolay Shashkin
+@iE-mail: mecareful () gmail ! com
+   bugfixes
 @bMiyata Shigeru
 @iE-mail: miyata () kusm ! kyoto-u ! ac ! jp
    OS/2 port
@@ -458,7 +470,7 @@
    vertical spaces
 @bJürgen Spitzmüller
 @iE-mail: juergen.sp () t-online ! de
-   Qt frontend, bugfixes. Current stable branch maintainer.
+   Qt frontend, bugfixes. Former stable branch maintainer.
 @bJohn Spray
 @iE-mail: jcs116 () york ! ac ! uk
    Gtk frontend
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index b08790f9f2..6358b5ea8a 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -783,7 +783,7 @@ contributers = [
                  "GPL Statement",
                  "m=117501689204059",
                  "27 March 2007",
-                 u"Bug fixes, layout modules, BibTeX code, XHTML export"),
+                 u"Bug fixes, layout modules, BibTeX code, XHTML export. Current stable branch maintainer."),
 
      contributer(u"Bennett Helm",
                  "bennett.helm () fandm ! edu",
@@ -913,6 +913,14 @@ contributers = [
                  "11 March 2005",
                  u"Gtk reference insertion dialog"),
 
+     contributer(u"Timo Kluck",
+                 "tkluck () gmail ! com",
+                 "GPL",
+                 "license statement",
+                 "m=132334049317495",
+                 "8 December 2011",
+                 u"Dutch translation, icon fixes"),
+
      contributer(u"Kostantino",
                  "ciclope10 () alice ! it",
                  "GPL",
@@ -921,6 +929,14 @@ contributers = [
                  "9 August 2006",
                  u"Italian localization of the interface"),
 
+     contributer(u"Scott Kostyshak",
+                 "skostysh@princeton.edu",
+                 "GPL",
+                 "GPL Statement",
+                 "m=133076234031944",
+                 "3 March 2012",
+                 u"Small UI fixes"),
+
      contributer(u"Michael Koziarski",
                  "koziarski () gmail ! com",
                  "GPL",
@@ -937,6 +953,14 @@ contributers = [
                  "",
                  u"Hungarian translation and bind file for menu shortcuts"),
 
+     contributer(u'Marcus Kriele',
+                 "mkriele () me ! com",
+                 "GPL",
+                 "License permission",
+                 "m=130384781027177",
+                 "26 April 2011",
+                 u"Fixing various sv* layouts"),
+
      contributer(u'Valeriy Kruchko',
                  "lerkru () gmail ! com",
                  "GPL",
@@ -1481,6 +1505,14 @@ contributers = [
                  "23 February 2005",
                  u"contribution to the spanish internationalization"),
 
+     contributer(u"Nickolay Shashkin",
+                 "mecareful () gmail ! com",
+                 "GPL",
+                 "GPL statement",
+                 "m=134026564400578",
+                 "21 June 2012",
+                 u"bugfixes"),
+
      contributer(u"Miyata Shigeru",
                  "miyata () kusm ! kyoto-u ! ac ! jp",
                  "",
@@ -1535,7 +1567,7 @@ contributers = [
                  "Re: The LyX licence",
                  "m=110907530127164",
                  "22 February 2005",
-                 u"Qt frontend, bugfixes. Current stable branch maintainer."),
+                 u"Qt frontend, bugfixes. Former stable branch maintainer."),
 
      contributer(u"John Spray",
                  "jcs116 () york ! ac ! uk",