linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3095
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Mon 2012-10-29 20:11:35 +0100
message:
  Translation fixes, help update
modified:
  dcpp/DownloadManager.cpp
  help/faq_connection.html
  win32/QueueFrame.cpp
  win32/TransferView.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/DownloadManager.cpp'
--- dcpp/DownloadManager.cpp	2012-08-09 00:52:23 +0000
+++ dcpp/DownloadManager.cpp	2012-10-29 19:11:35 +0000
@@ -357,7 +357,7 @@
 		return;
 	}
 
-	string extra = param.empty() ? Util::emptyString : _(" - Queued: ") + param;
+	string extra = param.empty() ? Util::emptyString : str(F_(" - Queued: %1") % param);
 	failDownload(aSource, _("No slots available") + extra);
 }
 

=== modified file 'help/faq_connection.html'
--- help/faq_connection.html	2012-09-04 21:10:41 +0000
+++ help/faq_connection.html	2012-10-29 19:11:35 +0000
@@ -139,7 +139,7 @@
 In any case its best to consult the documentation of the device about what port mapping protocol does the router 
 support and how to enable it.</p>
 
-<p>Currently, DC++ includes two different UPnP implementations and support for NAT-PMP as well. If automatic port mapping
+<p>Currently, DC++ includes support for both UPnP and NAT-PMP. If automatic port mapping
 is enabled in the connectivity configuration DC++ will try to map the ports with all the available mapper interfaces until
 a successful attempt. To enable automatic port mapping
 
@@ -181,10 +181,11 @@
 		especially if you see 'Port mapping: Failed to get external IP' message in the <a href="window_system_log.html">
 		System Log</a> window or wrong IP addess shown if you use the /conn chat command. Don't forget to 
 		<a href="settings_connectivity_manual.html#noipoverride">disallow the automatic IP override</a> in these cases.</li>
+	<!--Readd this when DC++ gets WinUPnP support again
 	<li>While the preferred UPnP interface is MiniUPnP, in some cases you may find the legacy Windows UPnP mapper more 
 		successful (eg. if you have an older router model and it worked well with older versions of DC++). In any case it
 		worth a try if the other mappers are failed and you'll find troubleshooting tips for the <u>Windows UPnP only</u> in
-		<a href="http://www.dslreports.com/faq/11043"; target="_blank" class="external">this FAQ</a>.</li>
+		<a href="http://www.dslreports.com/faq/11043"; target="_blank" class="external">this FAQ</a>.</li>-->
 </ul>
 </p>
 

=== modified file 'win32/QueueFrame.cpp'
--- win32/QueueFrame.cpp	2012-10-19 10:40:17 +0000
+++ win32/QueueFrame.cpp	2012-10-29 19:11:35 +0000
@@ -389,7 +389,7 @@
 					} else if(j.isSet(QueueItem::Source::FLAG_BAD_TREE)) {
 						tmp += T_("Full tree does not match TTH root");
 					} else if(j.isSet(QueueItem::Source::FLAG_NO_TREE)) {
-						tmp += T_("Full tree does not match TTH root"); /// @todo change to "No full tree available"
+						tmp += T_("No full tree available");
 					} else if(j.isSet(QueueItem::Source::FLAG_SLOW_SOURCE)) {
 						tmp += T_("Source too slow");
 					} else if(j.isSet(QueueItem::Source::FLAG_NO_TTHF)) {

=== modified file 'win32/TransferView.cpp'
--- win32/TransferView.cpp	2012-10-04 19:31:21 +0000
+++ win32/TransferView.cpp	2012-10-29 19:11:35 +0000
@@ -728,7 +728,7 @@
 		if (dynamic_cast <Upload*> (t)) {
 			path = "<" + t->getPath() + ">";
 			WinUtil::reducePaths(path);
-			total = _(" of ") + Util::formatBytes(File::getSize(t->getPath()));
+			total = str(F_(" of %1") % Util::formatBytes(File::getSize(t->getPath())));
 		} else {
 			path = Util::getFileName(t->getPath());
 		}