linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2418
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Fri 2011-02-11 22:36:28 +0100
message:
  Various small fixes
modified:
  dcpp/QueueManager.cpp
  help/settings_expert.html
  win32/ProxyPage.cpp
  win32/SearchFrame.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2011-01-02 17:12:02 +0000
+++ dcpp/QueueManager.cpp	2011-02-11 21:36:28 +0000
@@ -1729,7 +1729,7 @@
 			File::deleteFile(qi->getTempTarget());
 			qi->resetDownloaded();
 			dcdebug("QueueManager: CRC32 mismatch for %s\n", qi->getTarget().c_str());
-			LogManager::getInstance()->message(_("CRC32 inconsistency (SFV-Check)") + ' ' + Util::addBrackets(qi->getTarget()));
+			LogManager::getInstance()->message(str(F_("CRC32 inconsistency (SFV-Check): %1%") % Util::addBrackets(qi->getTarget()))); 
 
 			setPriority(qi->getTarget(), QueueItem::PAUSED);
 

=== modified file 'help/settings_expert.html'
--- help/settings_expert.html	2010-11-25 18:35:55 +0000
+++ help/settings_expert.html	2011-02-11 21:36:28 +0000
@@ -28,7 +28,7 @@
 will open, in mebibytes. This setting helps protect against
 malformed file lists that require large amounts of memory to decode.
 You may need to reduce or increase the value of this setting
-based on personal experience. (default: 512 MiB)</dd>
+based on personal experience. (default: 256 MiB)</dd>
   <dt>Bind address</dt>
   <dd cshelp="IDH_SETTINGS_ADVANCED3_BIND_ADDRESS">This setting allows you to bind DC++ to a particular IP address on your
   machine. Most users do not need to change the default value, 0.0.0.0. However, if you have more than one network interface

=== modified file 'win32/ProxyPage.cpp'
--- win32/ProxyPage.cpp	2011-01-02 17:12:02 +0000
+++ win32/ProxyPage.cpp	2011-02-11 21:36:28 +0000
@@ -53,7 +53,6 @@
 			directOut->setHelpId(IDH_SETTINGS_PROXY_DIRECT_OUT);
 
 			socks5 = outChoice->addChild(RadioButton::Seed(T_("SOCKS5")));
-			cur->setWidget(socks5, 1, 0);
 			socks5->setHelpId(IDH_SETTINGS_PROXY_SOCKS5);
 		}
 

=== modified file 'win32/SearchFrame.cpp'
--- win32/SearchFrame.cpp	2011-01-30 13:28:11 +0000
+++ win32/SearchFrame.cpp	2011-02-11 21:36:28 +0000
@@ -688,6 +688,7 @@
 	while((i = results->getNext(-1, LVNI_SELECTED)) != -1) {
 		results->erase(i);
 	}
+	status->setText(STATUS_COUNT, str(TFN_("%1% item", "%1% items", results->size()) % results->size()));
 }
 
 struct UserCollector {