[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs (silent)
From: Arto Hytönen <amthpublic () gmail ! com>
Date: 2007-08-26 19:51:57
Message-ID: 1188157917.199904.9994.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 704985 by amth:
SVN_SILENT malformed markup fixes + one stray include guard :-)
M +4 -4 kate/utils/katepluginmanager.h
M +1 -1 kdecore/io/kcmdwrapper.cpp
M +1 -1 kded/kbuildsycoca.cpp
M +3 -3 kdeprint/cups/kpimagepage.cpp
M +2 -2 kdeprint/cups/kptagspage.cpp
M +1 -1 kdeprint/kpposterpage.cpp
M +3 -3 kdeprint/management/kmwinfopage.cpp
M +1 -1 kdeui/dialogs/kaboutapplicationdialog.cpp
M +1 -1 kdeui/dialogs/kaboutkdedialog.cpp
M +3 -3 kdeui/shortcuts/kdedglobalaccel_adaptor.h
M +3 -3 khtml/khtml_part.cpp
--- trunk/KDE/kdelibs/kate/utils/katepluginmanager.h #704984:704985
@@ -21,8 +21,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __KATEPART_PLUGINMANAGER_H__
-#define __KATEPART_PLUGINMANAGER_H__
+#ifndef KATEPLUGINMANAGER_H
+#define KATEPLUGINMANAGER_H
#include <kservice.h>
#include <kconfigbase.h>
@@ -89,6 +89,6 @@
KatePluginList m_pluginList;
};
-#endif
+#endif // KATEPLUGINMANAGER_H
+
// kate: space-indent on; indent-width 2; replace-tabs on;
-
--- trunk/KDE/kdelibs/kdecore/io/kcmdwrapper.cpp #704984:704985
@@ -84,7 +84,7 @@
ZeroMemory( &pi, sizeof(pi) );
- if (CreateProcessW(Arglist[1], Command, NULL, NULL, TRUE, 0, NULL, NULL, &si, \
&pi) == 0) + if (CreateProcessW(Arglist[1], Command, NULL, NULL, true, 0, NULL, \
NULL, &si, &pi) == 0) ErrorExit(L"CreateProcessW");
CloseHandle(GetStdHandle(STD_INPUT_HANDLE));
--- trunk/KDE/kdelibs/kded/kbuildsycoca.cpp #704984:704985
@@ -746,7 +746,7 @@
QLabel progress( QString("<p><br><nobr> %1 </nobr><br>").arg( \
i18n("Reloading KDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | \
Qt::WStyle_DialogBorder | Qt::WStyle_Customize| Qt::WStyle_Title ); QString capt = \
i18n("KDE Configuration Manager"); if (!silent) {
- if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to \
reload KDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload"))) + if \
(KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload KDE \
configuration?"), capt, i18nc("Reload KDE configuration messagebox", "Reload"), \
i18n("Do Not Reload"))) return 0;
}
if (!silent || showprogress) {
--- trunk/KDE/kdelibs/kdeprint/cups/kpimagepage.cpp #704984:704985
@@ -165,8 +165,8 @@
" in relation to the page (not the image). A scaling of 100 percent will fill the \
page as completely" " as the image aspect ratio allows (doing auto-rotation of the \
image as needed)." " A scaling of more than 100 will print the image across \
multiple"
- " sheets. A scaling of 200 percent will print on up to 4 pages. </li>"
- " Scaling in % of page size defaults to 100 %."
+ " sheets. A scaling of 200 percent will print on up to 4 pages. "
+ " Scaling in % of page size defaults to 100 %.</li>"
" <li> <b>% of Natural Image Size:</b> The percent value slider moves from 1 to \
800. It specifies" " the printout size in relation"
" to the natural image size. A scaling of 100 percent will print the image at its \
natural size, while a" @@ -174,7 +174,7 @@
" the image larger than the page, multiple pages will be printed."
" Scaling in % of natural image size defaults to 100 %.</li>"
" </ul>"
- " <br>"
+ " <br />"
" <hr />"
" <p><em><b>Additional hint for power users:</b> This KDEPrint GUI element \
matches" " with the CUPS commandline job option parameter:</em> "
--- trunk/KDE/kdelibs/kdeprint/cups/kptagspage.cpp #704984:704985
@@ -50,13 +50,13 @@
" custom job options here. If in doubt, ask your system administrator.</p>"
" <p><b> </b></p>"
" <p><b>Operator Messages:</b> You may send additional messages to the \
operator(s) of your"
- " production printers (e.g. in your <em>Central Repro Department</em></p>)."
+ " production printers (e.g. in your <em>Central Repro Department</em>).</p>"
" <p>Messages can be read by the operator(s) (or yourself) by viewing"
" the <em>\"Job IPP Report\"</em> for the job.</p>"
" <b>Examples:</b><br />"
" <pre>"
" A standard CUPS job option:<br />"
- " <em>(Name) number-up</em> -- <em>(Value) 9</em> \
<br>" + " <em>(Name) number-up</em> -- <em>(Value) 9</em> \
<br />" " <br />"
" A job option for custom CUPS filters or backends:<br /> "
" <em>(Name) DANKA_watermark</em> -- <em>(Value) \
Company_Confidential</em> <br />"
--- trunk/KDE/kdelibs/kdeprint/kpposterpage.cpp #704984:704985
@@ -153,7 +153,7 @@
" \"2,3,7,9,3\" "
" <br /> "
" \"1-3,6,8-11\" "
- " </qt>" );
+ " </pre></qt>" );
setTitle( i18n( "Poster" ) );
--- trunk/KDE/kdelibs/kdeprint/management/kmwinfopage.cpp #704984:704985
@@ -32,12 +32,12 @@
m_nextpage = KMWizard::Backend;
QLabel *label = new QLabel(this);
- label->setText(i18n("<p>Welcome,</p><br>"
+ label->setText(i18n("<p>Welcome,</p><br />"
"<p>This wizard will help to install a new printer on your computer. "
"It will guide you through the various steps of the process of installing "
"and configuring a printer for your printing system. At each step, you "
- "can always go back using the <b>Back</b> button.</p><br>"
- "<p>We hope you'll enjoy this tool!</p><br>"
+ "can always go back using the <b>Back</b> button.</p><br />"
+ "<p>We hope you'll enjoy this tool!</p><br />"
"<p align=right><a href=\"http://printing.kde.org\"><i>"
"The KDE printing team</i></a>.</p>"));
label->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
--- trunk/KDE/kdelibs/kdeui/dialogs/kaboutapplicationdialog.cpp #704984:704985
@@ -80,7 +80,7 @@
else if (aboutData->programLogo().canConvert<QImage>())
titleWidget->setPixmap(QPixmap::fromImage(aboutData->programLogo().value<QImage>()), \
KTitleWidget::ImageLeft);
- titleWidget->setText(i18n("<font size=\"5\">%1</font><br /><b>Version %2</b><br \
/>Using KDE %3</html>", aboutData->programName(), + \
titleWidget->setText(i18n("<font size=\"5\">%1</font><br /><b>Version %2</b><br \
/>Using KDE %3", aboutData->programName(),
aboutData->version(), QString(KDE_VERSION_STRING)));
QTabWidget *tabWidget = new QTabWidget;
--- trunk/KDE/kdelibs/kdeui/dialogs/kaboutkdedialog.cpp #704984:704985
@@ -104,7 +104,7 @@
support->setOpenExternalLinks(true);
support->setTextInteractionFlags(Qt::TextBrowserInteraction);
support->setText(i18n(""
- "KDE is available free of charge, but making it is not free.<br><br>"
+ "KDE is available free of charge, but making it is not free.<br /><br />"
"Thus, the KDE team formed the KDE e.V., a non-profit organization"
" legally founded in Tuebingen, Germany. The KDE e.V. represents"
" the KDE project in legal and financial matters."
--- trunk/KDE/kdelibs/kdeui/shortcuts/kdedglobalaccel_adaptor.h #704984:704985
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KDEGLOBALACCELADAPTOR_H
-#define KDEGLOBALACCELADAPTOR_H
+#ifndef KDEGLOBALACCEL_ADAPTOR_H
+#define KDEGLOBALACCEL_ADAPTOR_H
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusMetaType>
@@ -75,4 +75,4 @@
void yourShortcutGotChanged(const QStringList &action, const QList<int> \
&newShortcut); };
-#endif //KDEGLOBALACCELADAPTOR_H
+#endif //KDEGLOBALACCEL_ADAPTOR_H
--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #704984:704985
@@ -3925,7 +3925,7 @@
}
if (!checkLinkSecurity(cURL,
- ki18n( "<qt>This untrusted page links to<br /><b>%1</b>.<br />Do you want to \
follow the link?" ), + ki18n( "<qt>This untrusted page links to<br /><b>%1</b>.<br \
/>Do you want to follow the link?</qt>" ), i18n( "Follow" )))
return false;
@@ -4821,7 +4821,7 @@
}
if (!checkLinkSecurity(u,
- ki18n( "<qt>The form will be submitted to <br /><b>%1</b><br />on your local \
filesystem.<br />Do you want to submit the form?" ), + ki18n( "<qt>The form will \
be submitted to <br /><b>%1</b><br />on your local filesystem.<br />Do you want to \
submit the form?</qt>" ), i18n( "Submit" )))
return;
@@ -6872,7 +6872,7 @@
else
{
KMessageBox::error( 0,
- i18n( "<qt>Access by untrusted page to<br /><b>%1</b><br /> denied.", \
Qt::escape(linkURL.prettyUrl())), + i18n( "<qt>Access by untrusted page to<br \
/><b>%1</b><br /> denied.</qt>", Qt::escape(linkURL.prettyUrl())), i18n( "Security \
Alert" )); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic