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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/skype
From:       Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date:       2009-03-20 21:09:59
Message-ID: 1237583399.391125.31415.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 942025 by coles:

Proof-reading.



 M  +3 -3      libskype/skypedbus/skypeconnection.cpp  
 M  +3 -3      ui/skypeeditaccountbase.ui  


--- trunk/KDE/kdenetwork/kopete/protocols/skype/libskype/skypedbus/skypeconnection.cpp \
#942024:942025 @@ -199,14 +199,14 @@
 				d->skypeProcess.waitForStarted();
 				kDebug() << k_funcinfo << "Skype process state:" << d->skypeProcess.state() << \
                "Skype process error:" << d->skypeProcess.error() << endl;
 				if ( d->skypeProcess.state() != QProcess::Running || d->skypeProcess.error() == \
                QProcess::FailedToStart ) {
-					emit error(i18n("Could not launch Skype\nYou need install original binary \
dynamic linked skype version 2.0 from http://www.skype.com")); +					emit \
error(i18n("Could not launch Skype.\nYou need to install the original dynamic linked \
Skype version 2.0 binary from http://www.skype.com"));  disconnectSkype(crLost);
 					emit connectionDone(seNoSkype, 0);
 					return;
 				}
 			} else {
 				if ( start.isEmpty() ){
-					emit error(i18n("Could not find Skype\nYou need install original binary dynamic \
linked skype version 2.0 from http://www.skype.com")); +					emit error(i18n("Could \
not find Skype.\nYou need to install the original dynamic linked Skype version 2.0 \
binary from http://www.skype.com"));  disconnectSkype(crLost);
 					emit connectionDone(seNoSkype, 0);
 					return;
@@ -314,7 +314,7 @@
 				d->startTimer->deleteLater();
 				d->startTimer = 0L;
 				if ( !started )
-					emit error(i18n("Could not find Skype\nYou need install original binary dynamic \
linked skype version 2.0 from http://www.skype.com")); +					emit error(i18n("Could \
not find Skype\nYou need to install the original dynamic linked Skype version 2.0 \
binary from http://www.skype.com"));  else
 					emit error(i18n("Please login to Skype first"));
 				disconnectSkype(crLost);
--- trunk/KDE/kdenetwork/kopete/protocols/skype/ui/skypeeditaccountbase.ui \
#942024:942025 @@ -100,7 +100,7 @@
             <property name="text" >
              <string>The Skype plugin serves as a bridge to an externally running \
copy of Skype. This has some consequences on how it functions: you need an instance \
of Skype to be running, and only one Skype account can be used.  
-You need install original binary dynamic linked skype version 2.0 from \
http://www.skype.com</string> +Note that you need to install the original dynamic \
linked Skype version 2.0 binary from http://www.skype.com</string>  </property>
             <property name="textFormat" >
              <enum>Qt::AutoText</enum>
@@ -247,7 +247,7 @@
          <item>
           <widget class="QLabel" name="textLabel2_4" >
            <property name="text" >
-            <string>Wait before try connect to Skype:</string>
+            <string>Wait before trying to connect to Skype:</string>
            </property>
            <property name="wordWrap" >
             <bool>false</bool>
@@ -306,7 +306,7 @@
          <property name="text" >
           <string>If you get error that Skype was not found, but in fact it is \
running, check the instructions at \
https://developer.skype.com/Docs/ApiDoc/Skype_API_on_Linux.  
-Only dynamic linked Skype version is supported</string>
+Note that only the dynamic linked Skype binary is supported.</string>
          </property>
          <property name="alignment" >
           <set>Qt::AlignVCenter</set>


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