← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/advancedrename/parser/options/directorynameoption.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/advancedrename/parser/options/directorynameoption.cpp
37
37
{
38
38
 
39
39
DirectoryNameOption::DirectoryNameOption()
40
 
                   : Option(i18nc("renaming option for directory related information",
41
 
                                  "Directory"),
42
 
                            i18n("Add the directory name"), SmallIcon("folder"))
 
40
    : Option(i18nc("renaming option for directory related information",
 
41
                   "Directory"),
 
42
             i18n("Add the directory name"), SmallIcon("folder"))
43
43
{
44
44
    addToken("[dir]",  i18n("Directory name"));
45
45
    addToken("[dir.]", i18n("Name of the parent directory, additional '.' characters move up "