SVN commit 947620 by coles:

Proof-reading - elimating use of exclamation points, and spaces before
punctuation.

A string such as:

"Torrent file cannot be found !"

...should be written as:

"Torrent file cannot be found."

...for two reasons:

 i) Exclamation points (!) are to be avoided (not least because some users feel
      the program is angry with them)

ii) Periods, commas, semi-colons etc. do not have a space written before them.


Bien cordialement,

Andrew


CCMAIL: kde-i18n-doc@kde.org
CCMAIL: joris.guisson@gmail.com



 M  +1 -1      ktorrent/fileselectdlg.cpp  
 M  +1 -1      ktupnptest/upnptestwidget.ui  
 M  +1 -1      libbtcore/bcodec/bdecoder.cpp  
 M  +8 -8      libbtcore/torrent/torrent.cpp  
 M  +2 -2      libktupnp/upnprouter.cpp  
 M  +2 -2      plugins/bwscheduler/schedule.cpp  
 M  +1 -1      plugins/bwscheduler/scheduleeditor.cpp  


--- trunk/extragear/network/ktorrent/ktorrent/fileselectdlg.cpp #947619:947620
@@ -366,7 +366,7 @@
 		lblRequired->setText(bt::BytesToString(bytes_to_download));
 
 		if (bytes_to_download > bytes_free)
-			lblStatus->setText("<font color=\"#ff0000\">" + i18n("%1 short!", bt::BytesToString(-1*(long long)(bytes_free - bytes_to_download))));
+			lblStatus->setText("<font color=\"#ff0000\">" + i18nc("We are %1 bytes short of what we need", "%1 short", bt::BytesToString(-1*(long long)(bytes_free - bytes_to_download))));
 		else
 			lblStatus->setText(bt::BytesToString(bytes_free - bytes_to_download));
 	}
--- trunk/extragear/network/ktorrent/ktupnptest/upnptestwidget.ui #947619:947620
@@ -36,7 +36,7 @@
           <enum>QFrame::Panel</enum>
          </property>
          <property name="text" >
-          <string>No routers found !</string>
+          <string>No routers found.</string>
          </property>
         </widget>
        </item>
--- trunk/extragear/network/ktorrent/libbtcore/bcodec/bdecoder.cpp #947619:947620
@@ -199,7 +199,7 @@
 		// move pos to the first part of the string
 		pos++;
 		if (pos + len > (Uint32)data.size())
-			throw Error(i18n("Torrent is incomplete!"));
+			throw Error(i18n("Torrent is incomplete."));
 			
 		QByteArray arr(data.constData() + pos,len);
 		pos += len;
--- trunk/extragear/network/ktorrent/libbtcore/torrent/torrent.cpp #947619:947620
@@ -76,7 +76,7 @@
 			node = decoder.decode();
 			BDictNode* dict = dynamic_cast<BDictNode*>(node);
 			if (!dict)
-				throw Error(i18n("Corrupted torrent!"));
+				throw Error(i18n("Corrupted torrent."));
 
 			// see if we can find an encoding node
 			if (dict->getValue("encoding"))
@@ -143,7 +143,7 @@
 	void Torrent::loadInfo(BDictNode* dict)
 	{
 		if (!dict)
-			throw Error(i18n("Corrupted torrent!"));
+			throw Error(i18n("Corrupted torrent."));
 		
 		piece_length = dict->getInt64("piece length");
 		BListNode* files = dict->getList("files");
@@ -170,14 +170,14 @@
 		if (num_chunks != (Uint32)hash_pieces.count())
 		{
 			Out(SYS_GEN|LOG_DEBUG) << "File sizes and number of hashes do not match for " << name_suggestion << endl;
-			throw Error(i18n("Corrupted torrent!"));
+			throw Error(i18n("Corrupted torrent."));
 		}
 	}
 	
 	void Torrent::loadFiles(BListNode* node)
 	{
 		if (!node)
-			throw Error(i18n("Corrupted torrent!"));
+			throw Error(i18n("Corrupted torrent."));
 		
 		Uint32 idx = 0;
 		BListNode* fl = node;
@@ -185,11 +185,11 @@
 		{
 			BDictNode* d = fl->getDict(i);
 			if (!d)
-				throw Error(i18n("Corrupted torrent!"));
+				throw Error(i18n("Corrupted torrent."));
 			
 			BListNode* ln = d->getList("path");
 			if (!ln)
-				throw Error(i18n("Corrupted torrent!"));
+				throw Error(i18n("Corrupted torrent."));
 
 			QString path;
 			QList<QByteArray> unencoded_path;
@@ -208,7 +208,7 @@
 				continue;
 
 			if (!checkPathForDirectoryTraversal(path))
-				throw Error(i18n("Corrupted torrent!"));
+				throw Error(i18n("Corrupted torrent."));
 
 			Uint64 s = d->getInt64("length");
 			TorrentFile file(this,idx,path,file_length,s,piece_length);
@@ -279,7 +279,7 @@
 		{
 			BListNode* c = node->getList(i);
 			if (!c || c->getNumChildren() != 2)
-				throw Error(i18n("Corrupted torrent!"));
+				throw Error(i18n("Corrupted torrent."));
 			
 			// first child is the IP, second the port
 			// add the DHT node
--- trunk/extragear/network/ktorrent/libktupnp/upnprouter.cpp #947619:947620
@@ -431,7 +431,7 @@
 		// first find the right service
 		QList<UPnPService>::iterator i = findPortForwardingService();
 		if (i == services.end())
-			throw Error(i18n("Cannot find port forwarding service in the device's description!"));
+			throw Error(i18n("Cannot find port forwarding service in the device's description."));
 		
 		UPnPService & s = *i;
 		QString action = "GetExternalIPAddress";
@@ -444,7 +444,7 @@
 		// first find the right service
 		QList<UPnPService>::iterator i = findPortForwardingService();
 		if (i == services.end())
-			throw Error(i18n("Cannot find port forwarding service in the device's description!"));
+			throw Error(i18n("Cannot find port forwarding service in the device's description."));
 		
 		// add all the arguments for the command
 		QList<SOAP::Arg> args;
--- trunk/extragear/network/ktorrent/plugins/bwscheduler/schedule.cpp #947619:947620
@@ -131,13 +131,13 @@
 		{
 			delete node;
 			Out(SYS_SCD|LOG_NOTICE) << "Decoding " << file << " failed : " << err.toString() << endl;
-			throw bt::Error(i18n("The file %1 is corrupted or not a proper KTorrent schedule file !"));
+			throw bt::Error(i18n("The file %1 is corrupted or not a proper KTorrent schedule file."));
 		}
 		
 		if (!node)
 		{
 			Out(SYS_SCD|LOG_NOTICE) << "Decoding " << file << " failed !" << endl;
-			throw bt::Error(i18n("The file %1 is corrupted or not a proper KTorrent schedule file !"));
+			throw bt::Error(i18n("The file %1 is corrupted or not a proper KTorrent schedule file."));
 		}
 		
 		if (node->getType() == BNode::LIST)
--- trunk/extragear/network/ktorrent/plugins/bwscheduler/scheduleeditor.cpp #947619:947620
@@ -161,7 +161,7 @@
 			if (schedule->conflicts(item))
 			{
 				*item = tmp; // restore old values
-				KMessageBox::error(this,i18n("This item conflicts with another item in the schedule, we cannot change it !"));
+				KMessageBox::error(this,i18n("This item conflicts with another item in the schedule, we cannot change it."));
 			}
 			else
 			{