← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_17_abort_string.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2009-08-05 00:05:39 UTC
  • Revision ID: james.westby@ubuntu.com-20090805000539-s74c7bhamc80ec9r
Tags: 4:4.3.0-0ubuntu2
Really, this patch doesn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_17_abort_string.diff
 
1
# Ubuntu: https://bugs.launchpad.net/bugs/389751
 
2
# Description: replace "abort" with user-friendly language
 
3
Index: apps/kfind/kfinddlg.cpp
 
4
===================================================================
 
5
--- a/apps/kfind/kfinddlg.cpp   (revision 990623)
 
6
+++ b/apps/kfind/kfinddlg.cpp   (working copy)
 
7
@@ -194,7 +194,7 @@
 
8
   if (errorCode == 0)
 
9
     setStatusMsg( i18nc("the application is currently idle, there is no active search", "Idle.") );
 
10
   else if (errorCode == KIO::ERR_USER_CANCELED)
 
11
-    setStatusMsg(i18n("Aborted."));
 
12
+    setStatusMsg(i18n("Canceled."));
 
13
   else if (errorCode == KIO::ERR_MALFORMED_URL)
 
14
   {
 
15
      setStatusMsg(i18n("Error."));
 
16
Index: apps/kfind/kfindpart.cpp
 
17
===================================================================
 
18
--- a/pps/kfind/kfindpart.cpp   (revision 990623)
 
19
+++ b/apps/kfind/kfindpart.cpp  (working copy)
 
20
@@ -154,7 +154,7 @@
 
21
     //setStatusMsg(i18n("Ready."));
 
22
   else if (errorCode == KIO::ERR_USER_CANCELED)
 
23
     emit canceled();
 
24
-    //setStatusMsg(i18n("Aborted."));
 
25
+    //setStatusMsg(i18n("Canceled."));
 
26
   else
 
27
     emit canceled(); // TODO ?
 
28
     //setStatusMsg(i18n("Error."));
 
29
Index: apps/kfind/kfind.cpp
 
30
===================================================================
 
31
--- a/apps/kfind/kfind.cpp      (revision 990623)
 
32
+++ b/apps/kfind/kfind.cpp      (working copy)
 
33
@@ -68,7 +68,7 @@
 
34
   mSearch = new KPushButton( KStandardGuiItem::find(), mButtonBox );
 
35
   mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
 
36
   connect( mSearch, SIGNAL(clicked()), this, SLOT( startSearch() ) );
 
37
-  mStop = new KPushButton( KStandardGuiItem::stop(), mButtonBox );
 
38
+  mStop = new KPushButton( KStandardGuiItem::cancel(), mButtonBox );
 
39
   connect( mStop, SIGNAL(clicked()), this, SLOT( stopSearch() ) );
 
40
   mSave = new KPushButton( KStandardGuiItem::saveAs(), mButtonBox );
 
41
   connect( mSave, SIGNAL(clicked()), this, SLOT( saveResults() ) );