[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdesktop (silent)
From:       Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date:       2004-09-01 11:36:04
Message-ID: 20040901113604.15CE21D62 () office ! kde ! org
[Download RAW message or body]

CVS commit by coles: 



CVS_SILENT

Corrected typos.


  M +1 -1      desktop.cc   1.300
  M +2 -2      init.cc   1.29
  M +2 -2      lock/lockdlg.cc   1.53


--- kdebase/kdesktop/desktop.cc  #1.299:1.300
@@ -759,5 +759,5 @@ void KDesktop::logout( KApplication::Shu
         KMessageBox::error( this, i18n("Could not logout properly.\nThe session \
                manager cannot "
                                         "be contacted. You can try to force a \
                shutdown by pressing "
-                                        "Ctrl+Alt+Backspace. Note, however, that \
your current session " +                                        "Ctrl+Alt+Backspace; \
                note, however, that your current session "
                                         "will not be saved with a forced shutdown." \
) );  }

--- kdebase/kdesktop/init.cc  #1.28:1.29
@@ -62,5 +62,5 @@ bool testDir( const QString &_name )
     bool ok = ::mkdir( path, S_IRWXU ) == 0;
     if ( !ok && errno == EEXIST ) {
-        int ret = KMessageBox::warningYesNo( 0, i18n("%1 is a file, but KDE needs it \
to be a directory. Move it to %2.orig and create directory?").arg(m).arg(m) ); +      \
int ret = KMessageBox::warningYesNo( 0, i18n("%1 is a file, but KDE needs it to be a \
directory; move it to %2.orig and create directory?").arg(m).arg(m) );  if ( ret == \
KMessageBox::Yes ) {  if ( ::rename( path, path + ".orig" ) == 0 ) {
@@ -76,5 +76,5 @@ bool testDir( const QString &_name )
     if ( !ok )
     {
-        KMessageBox::sorry( 0, i18n( "Couldn't create directory %1. Check for \
permissions or reconfigure the desktop to use another path." ).arg( m ) ); +        \
KMessageBox::sorry( 0, i18n( "Could not create directory %1; check for permissions or \
reconfigure the desktop to use another path." ).arg( m ) );  return false;
     }

--- kdebase/kdesktop/lock/lockdlg.cc  #1.52:1.53
@@ -423,6 +423,6 @@ void PasswordDlg::cantCheck()
     greet->failed();
     static_cast< LockProcess* >(parent())->msgBox( QMessageBox::Critical,
-        i18n("Cannot unlock the session because the authentication system failed to \
                work.\n"
-             "You must kill kdesktop_lock (pid %1) manually.").arg(getpid()) );
+        i18n("Cannot unlock the session because the authentication system failed to \
work;\n" +             "you must kill kdesktop_lock (pid %1) \
manually.").arg(getpid()) );  greet->revive();
 }


[prev in list] [next in list] [prev in thread] [next in thread]