fixing to trunk

(bzr r12588.1.34)

1 files changed, 27 insertions, 13 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 121773b6d..50b35ca2f 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -254,6 +254,7 @@ void AboutBox::initStrings() {
 "Nicholas Bishop\n"
 "Joshua L. Blocher\n"
 "Hanno Böck\n"
+"Tomasz Boczkowski\n"
 "Henrik Bohre\n"
 "Boldewyn\n"
 "Daniel Borgmann\n"
@@ -270,6 +271,7 @@ void AboutBox::initStrings() {
 "Gail Carmichael\n"
 "Ed Catmur\n"
 "Chema Celorio\n"
+"Jabiertxo Arraiza Cenoz\n"
 "Johan Ceuppens\n"
 "Zbigniew Chyla\n"
 "Alexander Clausen\n"
@@ -311,6 +313,7 @@ void AboutBox::initStrings() {
 "Hannes Hochreiner\n"
 "Thomas Holder\n"
 "Joel Holdsworth\n"
+"Christoffer Holmstedt\n"
 "Alan Horkan\n"
 "Karl Ove Hufthammer\n"
 "Richard Hughes\n"
@@ -319,6 +322,7 @@ void AboutBox::initStrings() {
 "Thomas Ingham\n"
 "Jean-Olivier Irisson\n"
 "Bob Jamison\n"
+"Ted Janeczko\n"
 "jEsuSdA\n"
 "Fernando Lucchesi Bastos Jurema\n"
 "Lauris Kaplinski\n"
@@ -342,7 +346,9 @@ void AboutBox::initStrings() {
 "Aurel-Aimé Marmion\n"
 "Colin Marquardt\n"
 "Craig Marshall\n"
+"Ivan Masár\n"
 "Dmitry G. Mastrukov\n"
+"David Mathog\n"
 "Matiphas\n"
 "Michael Meeks\n"
 "Federico Mena\n"
@@ -360,8 +366,10 @@ void AboutBox::initStrings() {
 "Nick\n"
 "Andreas Nilsson\n"
 "Mitsuru Oka\n"
+"Vinícius dos Santos Oliveira\n"
 "Martin Owens\n"
 "Alvin Penner\n"
+"Matthew Petroff\n"
 "Jon Phillips\n"
 "Zdenko Podobny\n"
 "Alexandre Prokoudine\n"
@@ -398,6 +406,8 @@ void AboutBox::initStrings() {
 "Joakim Verona\n"
 "Lucas Vieites\n"
 "Daniel Wagenaar\n"
+"Liam P. White\n"
+"Sebastian Wüst\n"
 "Michael Wybrow\n"
 "Gellule Xg\n"
 "Daniel Yacob\n"
@@ -442,13 +452,13 @@ void AboutBox::initStrings() {
      */          
     gchar const *allTranslators =
 "3ARRANO.com <3arrano@3arrano.com>, 2005.\n"
-"Adib Taraben <theadib@googlemail.com>, 2004.\n"
+"Adib Taraben <theadib@gmail.com>, 2004-2014.\n"
 "Alan Monfort <alan.monfort@free.fr>, 2009-2010.\n"
 "Alastair McKinstry <mckinstry@computer.org>, 2000.\n"
 "Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2006.\n"
 "Alessio Frusciante <algol@firenze.linux.it>, 2002, 2003.\n"
 "Alexander Shopov <ash@contact.bg>, 2006.\n"
-"Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2005, 2010-2013.\n"
+"Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2005, 2010-2014.\n"
 "Alexey Remizov <alexey@remizov.pp.ru>, 2004.\n"
 "Ali Ghanavatian <ghanvatian.ali@gmail.com>, 2010.\n"
 "Álvaro Lopes <alvieboy@alvie.com>, 2001, 2002.\n"
@@ -482,6 +492,7 @@ void AboutBox::initStrings() {
 "Elias Norberg <elno0959 at student.su.se>, 2009.\n"
 "Equipe de Tradução Inkscape Brasil <www.inkscapebrasil.org>, 2007.\n"
 "Fatih Demir <kabalak@gtranslator.org>, 2000.\n"
+"Firas Hanife <FirasHanife@gmail.com>, 2014.\n"
 "Foppe Benedictus <foppe.benedictus@gmail.com>, 2007-2009.\n"
 "Francesc Dorca <f.dorca@filnet.es>, 2003. Traducció sodipodi.\n"
 "Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.\n"
@@ -492,9 +503,10 @@ void AboutBox::initStrings() {
 "Hleb Valoshka <375gnu@gmail.com>, 2008-2009.\n"
 "Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.\n"
 "Ilia Penev <lichopicho@gmail.com>, 2006.\n"
-"Ivan Masár <helix84@centrum.sk>, 2006-2010. \n"
+"Ivan Masár <helix84@centrum.sk>, 2006-2014. \n"
+"Ivan Řihošek <irihosek@seznam.cz>, 2014.\n"
 "Iñaki Larrañaga <dooteo@euskalgnu.org>, 2006.\n"
-"Jānis Eisaks <jancs@dv.lv>, 2012, 2013.\n"
+"Jānis Eisaks <jancs@dv.lv>, 2012-2014.\n"
 "Jeffrey Steve Borbón Sanabria <jeff_kerokid@yahoo.com>, 2005.\n"
 "Jesper Öqvist <jesper@llbit.se>, 2010, 2011.\n"
 "Joaquim Perez i Noguer <noguer@gmail.com>, 2008-2009.\n"
@@ -516,7 +528,7 @@ void AboutBox::initStrings() {
 "Kingsley Turner <kingsley@maddogsbreakfast.com.au>, 2006.\n"
 "Kitae <bluetux@gmail.com>, 2006.\n"
 "Kjartan Maraas <kmaraas@gnome.org>, 2000-2002.\n"
-"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2013.\n"
+"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2014.\n"
 "Lauris Kaplinski <lauris@ariman.ee>, 2000.\n"
 "Leandro Regueiro <leandro.regueiro@gmail.com>, 2006-2008, 2010.\n"
 "Liu Xiaoqin <liuxqsmile@gmail.com>, 2008.\n"
@@ -525,7 +537,7 @@ void AboutBox::initStrings() {
 "Mahesh subedi <submanesh@hotmail.com>, 2006.\n"
 "Martin Srebotnjak, <miles@filmsi.net>, 2005, 2010.\n"
 "Masatake YAMATO <jet@gyve.org>, 2002.\n"
-"Masato Hashimoto <cabezon.hashimoto@gmail.com>, 2009-2012.\n"
+"Masato Hashimoto <cabezon.hashimoto@gmail.com>, 2009-2014.\n"
 "Matiphas <matiphas _a_ free _point_ fr>, 2004-2006.\n"
 "Mattias Hultgren <mattias_hultgren@tele2.se>, 2005, 2006.\n"
 "Maxim Dziumanenko <mvd@mylinux.com.ua>, 2004.\n"
@@ -536,12 +548,12 @@ void AboutBox::initStrings() {
 "Muhammad Bashir Al-Noimi <mhdbnoimi@gmail.com>, 2008.\n"
 "Myckel Habets <myckel@sdf.lonestar.org>, 2008.\n"
 "Nguyen Dinh Trung <nguyendinhtrung141@gmail.com>, 2007, 2008.\n"
-"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2013.\n"
+"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2014.\n"
 "Pawan Chitrakar <pchitrakar@gmail.com>, 2006.\n"
 "Przemysław Loesch <p_loesch@poczta.onet.pl>, 2005.\n"
 "Quico Llach <quico@softcatala.org>, 2000. Traducció sodipodi.\n"
 "Raymond Ostertag <raymond@linuxgraphic.org>, 2002, 2003.\n"
-"Riku Leino <tsoots@gmail.com>, 2006.\n"
+"Riku Leino <tsoots@gmail.com>, 2006-2011.\n"
 "Rune Rønde Laursen <runerl@skjoldhoej.dk>, 2006.\n"
 "Ruud Steltenpool <svg@steltenpower.com>, 2006.\n"
 "Serdar Soytetir <sendirom@gmail.com>, 2005.\n"
@@ -557,9 +569,11 @@ void AboutBox::initStrings() {
 "Thiago Pimentel <thiago.merces@gmail.com>, 2006.\n"
 "Toshifumi Sato <sato@centrosystem.com>, 2005.\n"
 "Jon South <striker@lunar-linux.org>, 2006. \n"
-"Uwe Schöler <oss@oss-marketplace.com>, 2006-2013.\n"
+"Uwe Schöler <oss@oss-marketplace.com>, 2006-2014.\n"
 "Valek Filippov <frob@df.ru>, 2000, 2003.\n"
 "Victor Dachev <vdachev@gmail.com>, 2006.\n"
+"Victor Westmann <victor.westmann@gmail.com>, 2011, 2014.\n"
+"Ville Pätsi, 2013.\n"
 "Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2003.\n"
 "Vital Khilko <dojlid@mova.org>, 2003.\n"
 "Vitaly Lipatov <lav@altlinux.ru>, 2002, 2004.\n"
@@ -572,7 +586,7 @@ void AboutBox::initStrings() {
 "Yaron Shahrabani <sh.yaron@gmail.com>, 2009.\n"
 "Yukihiro Nakai <nakai@gnome.gr.jp>, 2000, 2003.\n"
 "Yuri Beznos <zhiz0id@gmail.com>, 2006.\n"
-"Yuri Chornoivan <yurchor@ukr.net>, 2007-2013.\n"
+"Yuri Chornoivan <yurchor@ukr.net>, 2007-2014.\n"
 "Yuri Syrota <rasta@renome.rovno.ua>, 2000.\n"
 "Yves Guillou <yvesguillou@users.sourceforge.net>, 2004.\n"
 "Zdenko Podobný <zdpo@mailbox.sk>, 2003, 2004."
@@ -941,13 +955,13 @@ void AboutBox::initStrings() {
 } // namespace UI
 } // namespace Inkscape
 
-/* 
+/*
   Local Variables:
   mode:c++
   c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0))
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
   indent-tabs-mode:nil
   fill-column:99
   End:
 */
-// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :