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

List:       kde-commits
Subject:    playground/sysadmin/shaman
From:       Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date:       2009-11-23 17:09:14
Message-ID: 1258996154.324997.7327.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1053227 by coles:

Proof-reading:

- Favourite -> Favorite.  KDE standardises on US English, but once the \
language files have been updated overnight with the new strings, I'll \
                translate it to Favourite in en_GB.
- Avoid exclamation marks, unless in a game or similar.  In short, it looks \
like shouting.



 M  +2 -2      libshaman/backends/aqpm/AqpmPlugin.cpp  
 M  +1 -1      plugins/packagesview/PackagesViewDockWidget.cpp  
 M  +1 -1      plugins/packagesview/PackagesViewDockWidget.ui  
 M  +1 -1      plugins/packagesview/PackagesViewWidget.ui  
 M  +9 -9      shaman/src/processqueue/ProcessQueueDialog.cpp  


--- trunk/playground/sysadmin/shaman/libshaman/backends/aqpm/AqpmPlugin.cpp \
#1053226:1053227 @@ -308,10 +308,10 @@
             addTransactionMessage(i18n("Generating %1 with %2...", \
args["From"].toString(), args["To"].toString()));  break;
         case Aqpm::Globals::DeltaPatchDone:
-            addTransactionMessage(i18n("Success!"));
+            addTransactionMessage(i18n("Success."));
             break;
         case Aqpm::Globals::DeltaPatchFailed:
-            addTransactionMessage(i18n("Failed!"));
+            addTransactionMessage(i18n("Failed."));
             break;
         case Aqpm::Globals::ScriptletInfo:
             addTransactionMessage(QString("%1").arg(args["Text"].toString().remove('\n')));
                
--- trunk/playground/sysadmin/shaman/plugins/packagesview/PackagesViewDockWidget.cpp \
#1053226:1053227 @@ -76,7 +76,7 @@
     else if (sender == favouritesButton)
     {
         m_proxyModel->setSourceModel(m_favouriteSearchModel);
-        setWindowTitle(i18n("Favourite Searches"));
+        setWindowTitle(i18n("Favorite Searches"));
         repositoriesButton->setChecked(false);
         packageGroupsButton->setChecked(false);
         favouritesButton->setChecked(true);
--- trunk/playground/sysadmin/shaman/plugins/packagesview/PackagesViewDockWidget.ui \
#1053226:1053227 @@ -65,7 +65,7 @@
     <item row="4" column="0" colspan="2" >
      <widget class="QPushButton" name="favouritesButton" >
       <property name="text" >
-       <string>Favourite Searches</string>
+       <string>Favorite Searches</string>
       </property>
       <property name="checkable" >
        <bool>true</bool>
--- trunk/playground/sysadmin/shaman/plugins/packagesview/PackagesViewWidget.ui \
#1053226:1053227 @@ -83,7 +83,7 @@
       </size>
      </property>
      <property name="toolTip" >
-      <string>Add favourite Search</string>
+      <string>Add favorite Search</string>
      </property>
      <property name="whatsThis" >
       <string/>
--- trunk/playground/sysadmin/shaman/shaman/src/processqueue/ProcessQueueDialog.cpp \
#1053226:1053227 @@ -209,39 +209,39 @@
 {
     switch (code) {
         case TransactionInterface::DownloadFailedError:
-            KMessageBox::detailedError(this, i18n("There has been an error \
while downloading packages!"), +            \
KMessageBox::detailedError(this, i18n("There has been an error while \
                downloading packages."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::ProcessingFailedError:
-            KMessageBox::detailedError(this, i18n("There has been an error \
while processing the queue!"), +            \
KMessageBox::detailedError(this, i18n("There has been an error while \
                processing the queue."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::CleanupFailedError:
-            KMessageBox::detailedError(this, i18n("There has been an error \
while cleaning up!"), +            KMessageBox::detailedError(this, \
i18n("There has been an error while cleaning up."),  details, i18n("Cleanup \
failed"));  break;
         case TransactionInterface::FileConflictError:
-            KMessageBox::detailedError(this, i18n("A file conflict was \
detected in the current queue!"), +            \
KMessageBox::detailedError(this, i18n("A file conflict was detected in the \
                current queue."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::DependencyConflictError:
-            KMessageBox::detailedError(this, i18n("A dependency conflict \
was detected in the current queue!"), +            \
KMessageBox::detailedError(this, i18n("A dependency conflict was detected \
                in the current queue."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::DependenciesUnsatisfiedError:
-            KMessageBox::detailedError(this, i18n("A dependency could not \
to be found!"), +            KMessageBox::detailedError(this, i18n("A \
                dependency could not to be found."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::BackendError:
-            KMessageBox::detailedError(this, i18n("There has been an error \
in the backend!"), +            KMessageBox::detailedError(this, \
                i18n("There has been an error in the backend."),
                                        details, i18n("Queue processing \
failed"));  break;
         case TransactionInterface::HookError:
-            KMessageBox::detailedError(this, i18n("A hook requested to \
abort the transaction"), +            KMessageBox::detailedError(this, \
                i18n("A hook requested to abort the transaction."),
                                        details, i18n("Queue processing \
failed"));  break;
         default:
-            KMessageBox::detailedError(this, i18n("There has been an error \
while performing the transaction!"), +            \
KMessageBox::detailedError(this, i18n("There has been an error while \
                performing the transaction."),
                                        details, i18n("Queue processing \
failed"));  break;
     }


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