← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pidgin/karmic

« back to all changes in this revision

Viewing changes to pidgin/gtkdialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-02-23 18:30:20 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090223183020-jmne1l61866atkd8
Tags: 1:2.5.4-2ubuntu1
https://launchpad.net/bugs/316636
* Merge from debian, remaining changes: (LP: #316636)
  - debian/control:
    + Add Build-Deps on liblaunchpad-integration-dev, intltool,
    network-manager-dev
    + Add epoch in dependencies
    + Drop the libpurple0 dependency on libpurple-bin
  - debian/libpurple0.symbols: add epoch to symbol
  - debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
    debian/pidgin.preinst: add epoch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
    the notify plugin and enable the standard logging options by default
  - debian/rules:
    + remove --disable-nm as nm has been fixed in Ubuntu
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::
  - debian/patches:
    + 02_lpi.patch for LP integration
    + 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com.patch to set the default IRC
      server to irc.ubuntu.com
    + 70_autoconf.patch
    + fix-icons-backport-from-2.5.5mtn.diff:
      Fix to see buddy icons for new Windows Live users.
      The patch will be included in pidgin-2.5.5 

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkdialogs.c
100
100
 
101
101
/* Order: Alphabetical by Last Name */
102
102
static const struct developer patch_writers[] = {
 
103
        {"Paul Aurich", NULL, NULL },
103
104
        {"Marcus 'malu' Lundblad", NULL, NULL},
104
105
        {"Dennis 'EvilDennisR' Ristuccia",      N_("Senior Contributor/QA"),    NULL},
105
106
        {"Peter 'Fmoo' Ruibal",         NULL,   NULL},
198
199
        {N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
199
200
        {N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
200
201
        {"Mongolian",               "mn", "gooyo", NULL},
201
 
        {N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
 
202
        {N_("Bokmål Norwegian"),    "nb", "Hans Fredrik Nordhaug", "hans@nordhaug.priv.no"},
202
203
        {N_("Nepali"),              "ne", "Shyam Krishna Bal", "shyamkrishna_bal@yahoo.com"},
203
204
        {N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
204
205
        {N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "nynorsk@strilen.net"},
205
206
        {N_("Occitan"),             "oc", "Yannig Marchegay", "yannig@marchegay.org"},
206
207
        {N_("Punjabi"),             "pa", "Amanpreet Singh Alam", "aalam@users.sf.net"},
207
 
        {N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
208
 
        {N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
209
 
        {N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
 
208
        {N_("Polish"),              "pl", "Piotr Makowski", "pmakowski@aviary.pl"},
210
209
        {N_("Portuguese"),          "pt", "Duarte Henriques", "duarte_henriques@myrealbox.com"},
211
210
        {N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
212
211
        {N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
213
212
        {N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
214
 
        {N_("Russian"),             "ru", "Dmitry Beloglazov", "dmaa@users.sf.net"},
 
213
        {N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
215
214
        {N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
216
215
        {N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
217
216
        {N_("Slovenian"),           "sl", "Martin Srebotnjak", "miles@filmsi.net"},
271
270
        {N_("Macedonian"),          "mk", "Tomislav Markovski", NULL},
272
271
        {N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
273
272
        {N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
 
273
        {N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
 
274
        {N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
 
275
        {N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
 
276
        {N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
274
277
        {N_("Polish"),              "pl", "Przemysław Sułek", NULL},
275
278
        {N_("Portuguese-Brazil"),   "pt_BR", "Maurício de Lemos Rodrigues Collares Neto", "mauricioc@gmail.com"},
 
279
        {N_("Russian"),             "ru", "Dmitry Beloglazov", "dmaa@users.sf.net"},
276
280
        {N_("Russian"),             "ru", "Alexandre Prokoudine", NULL},
277
281
        {N_("Russian"),             "ru", "Sergey Volozhanin", NULL},
278
282
        {N_("Slovak"),              "sk", "Daniel Režný", NULL},