wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize our naming: Okular.

Browse Source 
CCMAIL: okular-devel@kde.org

svn path=/trunk/KDE/kdegraphics/okular/; revision=763904
remotes/origin/KDE/4.1
Pino Toscano 18 years ago
parent c6f91f4e51
commit a0a3c239e2
10 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      aboutdata.h
  2. 4
      core/document.cpp
  3. 2
      generators/dvi/dviFile.cpp
  4. 6
      generators/dvi/fontpool.cpp
  5. 12
      generators/dvi/psgs.cpp
  6. 4
      generators/dvi/util.cpp
  7. 6
      part.cpp
  8. 2
      shell/main.cpp
  9. 2
      shell/shell.cpp
  10. 2
      ui/annotationwidgets.cpp

4
aboutdata.h
Unescape View File

@ -19,7 +19,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
"okular",
ki18n(iname), //I18N_NOOP("okular"),
"0.6.80",
ki18n("okular, a universal document viewer"),
ki18n("Okular, a universal document viewer"),
KAboutData::License_GPL,
ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n"
"(C) 2004-2005 Enrico Ros\n"
@ -33,7 +33,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
about.addAuthor(ki18n("Pino Toscano"), ki18n("Current maintainer"), "pino@kde.org");
about.addAuthor(ki18n("Tobias Koenig"), ki18n("Lots of framework work, ODT and FictionBook backends"), "tokoe@kde.org");
about.addAuthor(ki18n("Albert Astals Cid"), ki18n("Former maintainer"), "aacid@kde.org");
about.addAuthor(ki18n("Piotr Szymanski"), ki18n("Created okular from KPDF codebase"), "djurban@pld-dc.org");
about.addAuthor(ki18n("Piotr Szymanski"), ki18n("Created Okular from KPDF codebase"), "djurban@pld-dc.org");
about.addAuthor(ki18n("Enrico Ros"), ki18n("KPDF developer"), "eros.kde@email.it");
return about;

4
core/document.cpp
Unescape View File

@ -2329,7 +2329,7 @@ void Document::processAction( const Action * action )
{
// this case is a link pointing to an executable with a parameter
// that also is an executable, possibly a hand-crafted pdf
KMessageBox::information( widget(), i18n("The document is trying to execute an external application and for your safety okular does not allow that.") );
KMessageBox::information( widget(), i18n("The document is trying to execute an external application and for your safety Okular does not allow that.") );
return;
}
}
@ -2337,7 +2337,7 @@ void Document::processAction( const Action * action )
{
// this case is a link pointing to an executable with no parameters
// core developers find unacceptable executing it even after asking the user
KMessageBox::information( widget(), i18n("The document is trying to execute an external application and for your safety okular does not allow that.") );
KMessageBox::information( widget(), i18n("The document is trying to execute an external application and for your safety Okular does not allow that.") );
return;
}
}

2
generators/dvi/dviFile.cpp
Unescape View File

@ -410,7 +410,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms
*converrorms = i18n("<qt><p>The PDF-file %1 could not be converted to PostScript. Some graphic elements in your "
"document will therefore not be displayed.</p>"
"<p><b>Possible reason:</b> The file %1 might be broken, or might not be a PDF-file at all. "
"This is the output of the <strong>pdf2ps</strong> program that okular used:</p>"
"This is the output of the <strong>pdf2ps</strong> program that Okular used:</p>"
"<p><strong>%2</strong></p></qt>", PDFFilename, output);
}
return QString();

6
generators/dvi/fontpool.cpp
Unescape View File

@ -39,7 +39,7 @@ fontPool::fontPool()
i18n("Okular is currently generating bitmap fonts..."),
i18n("Aborts the font generation. Don't do this."),
i18n("Okular is currently generating bitmap fonts which are needed to display your document. "
"For this, okular uses a number of external programs, such as MetaFont. You can find "
"For this, Okular uses a number of external programs, such as MetaFont. You can find "
"the output of these programs later in the document info dialog."),
i18n("Okular is generating fonts. Please wait."),
0)
@ -360,7 +360,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
KMessageBox::detailedError(0,
QString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg),
details,
i18n("Problem locating fonts - okular"));
i18n("Problem locating fonts"));
// This makes sure the we don't try to run kpsewhich again
markFontsAsLocated();
@ -381,7 +381,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
KMessageBox::sorry(0,
QString("<qt><p>The font generation by <b>kpsewhich</b> was aborted (exit code %1, error %2). As a result, "
"some font files could not be located, and your document might be unreadable.</p></qt>").arg(kpsewhich_exit_code).arg(kpsewhich_.errorString()),
i18n("Font generation aborted - okular") );
i18n("Font generation aborted") );
// This makes sure the we don't try to run kpsewhich again
if (makePK == false)

12
generators/dvi/psgs.cpp
Unescape View File

@ -261,23 +261,23 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
// TODO: show a requestor of some sort.
KMessageBox::detailedError(0,
i18n("<qt>The version of Ghostview that is installed on this computer does not contain "
"any of the Ghostview device drivers that are known to okular. PostScript "
"support has therefore been turned off in okular.</qt>"),
i18n("<qt><p>The Ghostview program, which okular uses internally to display the "
"any of the Ghostview device drivers that are known to Okular. PostScript "
"support has therefore been turned off in Okular.</qt>"),
i18n("<qt><p>The Ghostview program, which Okular uses internally to display the "
"PostScript graphics that is included in this DVI file, is generally able to "
"write its output in a variety of formats. The sub-programs that Ghostview uses "
"for these tasks are called 'device drivers'; there is one device driver for "
"each format that Ghostview is able to write. Different versions of Ghostview "
"often have different sets of device drivers available. It seems that the "
"version of Ghostview that is installed on this computer does not contain "
"<strong>any</strong> of the device drivers that are known to okular.</p>"
"<strong>any</strong> of the device drivers that are known to Okular.</p>"
"<p>It seems unlikely that a regular installation of Ghostview would not contain "
"these drivers. This error may therefore point to a serious misconfiguration of "
"the Ghostview installation on your computer.</p>"
"<p>If you want to fix the problems with Ghostview, you can use the command "
"<strong>gs --help</strong> to display the list of device drivers contained in "
"Ghostview. Among others, okular can use the 'png256', 'jpeg' and 'pnm' "
"drivers. Note that okular needs to be restarted to re-enable PostScript support."
"Ghostview. Among others, Okular can use the 'png256', 'jpeg' and 'pnm' "
"drivers. Note that Okular needs to be restarted to re-enable PostScript support."
"</p></qt>"));
else {
kDebug(kvs::dvi) << QString("Okular will now try to use the '%1' device driver.").arg(*gsDevice);

4
generators/dvi/util.cpp
Unescape View File

@ -77,11 +77,11 @@ void oops(const QString& message)
i18n("Fatal error.\n\n") +
message +
i18n("\n\n\
This probably means that either you found a bug in okular,\n\
This probably means that either you found a bug in Okular,\n\
or that the DVI file, or auxiliary files (such as font files, \n\
or virtual font files) were really badly broken.\n\
Okular will abort after this message. If you believe that you \n\
found a bug, or that okular should behave better in this situation\n\
found a bug, or that Okular should behave better in this situation\n\
please report the problem."));
exit(1);
}

6
part.cpp
Unescape View File

@ -85,7 +85,7 @@
#include "core/fileprinter.h"
K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Part >(); )
K_EXPORT_PLUGIN( okularPartFactory( okularAboutData( "okular", I18N_NOOP( "okular" ) ) ) )
K_EXPORT_PLUGIN( okularPartFactory( okularAboutData( "okular", I18N_NOOP( "Okular" ) ) ) )
static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject *parent = 0 )
{
@ -363,7 +363,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
QAction * prefs = KStandardAction::preferences( this, SLOT( slotPreferences() ), ac);
if ( parent && ( parent->objectName() == QLatin1String( "okular::Shell" ) ) )
{
prefs->setText( i18n( "Configure okular..." ) );
prefs->setText( i18n( "Configure Okular..." ) );
}
else
{
@ -694,7 +694,7 @@ bool Part::slotImportPSFile()
if ( app.isEmpty() )
{
// TODO point the user to their distro packages?
KMessageBox::error( widget(), i18n( "The program \"ps2pdf\" was not found, so okular can not import PS files using it." ), i18n("ps2pdf not found") );
KMessageBox::error( widget(), i18n( "The program \"ps2pdf\" was not found, so Okular can not import PS files using it." ), i18n("ps2pdf not found") );
return false;
}

2
shell/main.cpp
Unescape View File

@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
KAboutData about = okularAboutData( "okular", I18N_NOOP( "okular" ) );
KAboutData about = okularAboutData( "okular", I18N_NOOP( "Okular" ) );
KCmdLineArgs::init(argc, argv, &about);

2
shell/shell.cpp
Unescape View File

@ -86,7 +86,7 @@ void Shell::init()
{
// if we couldn't find our Part, we exit since the Shell by
// itself can't do anything useful
KMessageBox::error(this, i18n("Unable to find okular part."));
KMessageBox::error(this, i18n("Unable to find the Okular component."));
m_part = 0;
return;
}

2
ui/annotationwidgets.cpp
Unescape View File

@ -239,7 +239,7 @@ QWidget * StampAnnotationWidget::widget()
m_pixmapSelector->setEditable( true );
// FIXME!!! use the standard names instead (when we'll have the artwork)
m_pixmapSelector->addItem( i18n( "okular" ), "graphics-viewer-document" );
m_pixmapSelector->addItem( i18n( "Okular" ), "graphics-viewer-document" );
m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmarks" );
m_pixmapSelector->addItem( i18n( "KDE" ), "kde" );
m_pixmapSelector->addItem( i18n( "Information" ), "help-about" );

Write Preview
Loading…
Cancel
Save