← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to core/utilities/setup/setuplighttable.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/utilities/setup/setuplighttable.cpp
97
97
 
98
98
    d->autoLoadOnRightPanel = new QCheckBox(i18n("Selecting a thumbbar item loads the image to the right panel"),
99
99
                                            interfaceOptionsGroup);
100
 
    d->autoLoadOnRightPanel->setWhatsThis( i18n("Set this option to automatically load an image "
101
 
                                                "into the right panel when the corresponding item is selected on the thumbbar."));
 
100
    d->autoLoadOnRightPanel->setWhatsThis(i18n("Set this option to automatically load an image "
 
101
                                               "into the right panel when the corresponding item is selected on the thumbbar."));
102
102
 
103
103
    d->loadFullImageSize = new QCheckBox(i18n("Load full-sized image"), interfaceOptionsGroup);
104
 
    d->loadFullImageSize->setWhatsThis( i18n("<p>Set this option to load images at their full size "
105
 
                                             "for preview, rather than at a reduced size. As this option "
106
 
                                             "will make it take longer to load images, only use it if you have "
107
 
                                             "a fast computer.</p>"
108
 
                                             "<p><b>Note:</b> for Raw images, a half size version of the Raw data "
109
 
                                             "is used instead of the embedded JPEG preview.</p>"));
 
104
    d->loadFullImageSize->setWhatsThis(i18n("<p>Set this option to load images at their full size "
 
105
                                            "for preview, rather than at a reduced size. As this option "
 
106
                                            "will make it take longer to load images, only use it if you have "
 
107
                                            "a fast computer.</p>"
 
108
                                            "<p><b>Note:</b> for Raw images, a half size version of the Raw data "
 
109
                                            "is used instead of the embedded JPEG preview.</p>"));
110
110
 
111
111
    d->hideToolBar  = new QCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup);
112
112