From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Wed, 6 Oct 2010 10:01:55 +0000 (+0200)
Subject: Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=509d0a52be26670b08684d8d06d314ba30fb7346;p=mdictionary

Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
	src/plugins/stardict/StarDialog.cpp
---

509d0a52be26670b08684d8d06d314ba30fb7346
diff --cc src/plugins/stardict/StarDialog.cpp
index 46a349f,13168da..6f18d02
--- a/src/plugins/stardict/StarDialog.cpp
+++ b/src/plugins/stardict/StarDialog.cpp
@@@ -80,14 -80,14 +80,17 @@@ void StarDialog::initializeUI() 
          setWindowTitle(tr("StarDict Settings"));
  
          infoLabel->setText(tr("Plugin: ") + plugin->type().toUpper() +"\n" +
--                           tr("Book name: ") + plugin->settings()->value("bookname") + "\n" +
--                           tr("Version: ") + plugin->settings()->value("version") + "\n" +
--                           tr("Word count: ") + plugin->settings()->value("wordcount") + "\n" +
--                           tr("Author: ") + plugin->settings()->value("author") + "\n" +
--                           tr("E-mail: ") + plugin->settings()->value("email") + "\n" +
--                           tr("Website: ") + plugin->settings()->value("website") + "\n" +
--                           tr("Description: ") + plugin->settings()->value("description") + "\n" +
--                           tr("Date: ") + plugin->settings()->value("date"));
++                tr("Book name: ") + plugin->settings()->value("bookname") 
++                        + "\n" +
++                tr("Version: ") + plugin->settings()->value("version") + "\n" +
++                tr("Word count: ") + plugin->settings()->value("wordcount") 
++                        + "\n" +
++                tr("Author: ") + plugin->settings()->value("author") + "\n" +
++                tr("E-mail: ") + plugin->settings()->value("email") + "\n" +
++                tr("Website: ") + plugin->settings()->value("website") + "\n" +
++                tr("Description: ") + plugin->settings()->value("description") 
++                        + "\n" +
++               tr("Date: ") + plugin->settings()->value("date"));
          mainVerticalLayout->addWidget(infoLabel);
      }