← Back to branch summary

~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to pidgin/gtknotify.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-04-11 03:27:22 UTC
  • mfrom: (2.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110411032722-farsw08i6ouj5dnd
Tags: 1:2.7.11-1ubuntu1
https://launchpad.net/bugs/757146
* Merge from Debian unstable (LP: #757146), remaining changes:
  + debian/control:
    - Add libtool and liblaunchpad-integration-dev build depends
    - Bump standards version
    - Relax binary depends on pidgin versions
    - Add pidgin-libnotify as Recommends for pidgin binary
    - Fix description of pidgin binary
    - Don't have libpurple-bin depend on libpurple0
  + debian/libpurple0.symbols: add epoch to appropriate symbols
  + Add debian/patches:
    - 02_lpi.patch
    - 04_let_crasher_for_apport.patch
    - 05_default_to_irc_ubuntu_com.patch
    - 10_docklet_default_off.patch
    - 11_buddy_list_really_show.patch
    - 13_sounds_and_timers.patch
    - 60_1024x600_gtkpounce.c.patch
    - 60_1024x600_gtkprefs.c.patch
  + debian/prefs.xml: add notification prefs
  + debian/rules:
    - Add translation domain to desktop file with gettext
    - Add the launcher for pidgin

* Add configure check for launchpad integration attached to the gtk check since 
  upstream dropped the startup notification check which is where this check was 
  previously
  - update debian/patches/02_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtknotify.c
1592
1592
                gtk_widget_set_sensitive(button, FALSE);
1593
1593
                spec_dialog->edit_button = button;
1594
1594
 
1595
 
                button = gtk_dialog_add_button(GTK_DIALOG(dialog),
1596
 
                                                _("Dismiss"), GTK_RESPONSE_NO);
 
1595
                /* Translators: Make sure you translate "Dismiss" differently than
 
1596
                   "close"!  This string is used in the "You have pounced" dialog
 
1597
                   that appears when one of your Buddy Pounces is triggered.  In
 
1598
                   this context "Dismiss" means "I acknowledge that I've seen that
 
1599
                   this pounce was triggered--remove it from this list."  Translating
 
1600
                   it as "Remove" is acceptable if you can't think of a more precise
 
1601
                   word. */
 
1602
                button = gtk_dialog_add_button(GTK_DIALOG(dialog), _("Dismiss"),
 
1603
                                GTK_RESPONSE_NO);
1597
1604
                gtk_widget_set_sensitive(button, FALSE);
1598
1605
                spec_dialog->dismiss_button = button;
1599
1606