Merging from old trunk:

r648646 | goutte | 2007-03-31 23:40:43 +0200 (Sat, 31 Mar 2007) | 2 lines

SVN_SILENT: xgettext does not like to have unbalanced quotes in a #warning


svn path=/trunk/KDE/kdebase/workspace/; revision=659573

kcmkwin/kwinrules/ruleswidget.cpp

@@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window )
 void RulesWidget::shortcutEditClicked()
     {
 #ifdef __GNUC__
-#warning KShortcutDialog is gone, and it's a good opportunity to clean up here
+#warning KShortcutDialog is gone, and it is a good opportunity to clean up here
 #endif
 #if 0
     EditShortcutDialog dlg( topLevelWidget());