diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f3530a63..168e65eb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES okular_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okularpart ) +install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okular ) kde4_install_icons( ${ICON_INSTALL_DIR} ) diff --git a/aboutdata.h b/aboutdata.h index abf882613..e753cf3a4 100644 --- a/aboutdata.h +++ b/aboutdata.h @@ -16,7 +16,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname ) { KAboutData about( name, //"okular", - 0, // catalog name also "okular" + "okular", ki18n(iname), //I18N_NOOP("okular"), "0.5.91", ki18n("okular, a universal document viewer"), diff --git a/part.cpp b/part.cpp index c3e2b435e..4f6af85e6 100644 --- a/part.cpp +++ b/part.cpp @@ -77,7 +77,7 @@ #include "core/page.h" K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Part >(); ) -K_EXPORT_PLUGIN( okularPartFactory( "okularpart" ) ) +K_EXPORT_PLUGIN( okularPartFactory( okularAboutData( "okular", I18N_NOOP( "okular" ) ) ) ) static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject *parent = 0 ) { @@ -137,9 +137,6 @@ m_cliPresentation(false), m_generatorGuiClient(0) connect(this, SIGNAL(completed()), this, SLOT(setWindowTitleFromDocument())); connect(this, SIGNAL(canceled(const QString &)), this, SLOT(loadCancelled(const QString &))); - // load catalog for translation - KGlobal::locale()->insertCatalog("okular"); - // create browser extension (for printing when embedded into browser) m_bExtension = new BrowserExtension(this);