← Back to branch summary

~ubuntu-branches/ubuntu/edgy/psi/edgy

« back to all changes in this revision

Viewing changes to src/options/opt_iconset.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2005-09-14 16:33:49 UTC
  • mfrom: (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20050914163349-3zacov4afysz5cw5
Tags: 0.9.3-2ubuntu1
* Sync with debian
* Applied patch to psi.desktop to start psi without gpg-agent use (known
  issue)
* Updated README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_iconset.cpp
445
445
        QWhatsThis::add(d->ck_useEmoticons,
446
446
                tr("<P>Emoticons are short sequences of characters that are used to convey an emotion or idea.</P>"
447
447
                "<P>Enable this option if you want Psi to replace common emoticons with a graphical image.</P>"
448
 
                "<P>For example, <B>:-)</B> would be relaced by <icon name=\"psi/smile\"></P>"));
 
448
                "<P>For example, <B>:-)</B> would be replaced by <icon name=\"psi/smile\"></P>"));
449
449
 
450
450
        // TODO: add QWhatsThis
451
451
 
607
607
//----------------------------------------------------------------------------
608
608
 
609
609
OptionsTabIconsetRoster::OptionsTabIconsetRoster(QObject *parent)
610
 
: OptionsTab(parent, "iconset_roster", "", tr("Roster Iconsets"), tr("Select iconsets for your roster"), "psi/www")
 
610
: OptionsTab(parent, "iconset_roster", "", tr("Roster Iconsets"), tr("Select iconsets for your roster"), "psi/roster")
611
611
{
612
612
        w = 0;
613
613
        thread = 0;