linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #05225
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2825: [help] fixes
------------------------------------------------------------
revno: 2825
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Mon 2012-01-16 21:01:29 +0100
message:
[help] fixes
modified:
dcpp/CryptoManager.cpp
help/settings_connectivity_manual.html
help/settings_logs.html
help/window_system_log.html
--
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/CryptoManager.cpp'
--- dcpp/CryptoManager.cpp 2012-01-13 20:55:20 +0000
+++ dcpp/CryptoManager.cpp 2012-01-16 20:01:29 +0000
@@ -268,7 +268,7 @@
SSL_CTX_load_verify_locations(serverContext, i->c_str(), NULL) != SSL_SUCCESS ||
SSL_CTX_load_verify_locations(serverVerContext, i->c_str(), NULL) != SSL_SUCCESS
) {
- LogManager::getInstance()->message("Failed to load trusted certificate from " + *i);
+ LogManager::getInstance()->message(str(F_("Failed to load trusted certificate from %1%") % Util::addBrackets(*i)));
}
}
=== modified file 'help/settings_connectivity_manual.html'
--- help/settings_connectivity_manual.html 2011-11-29 17:27:23 +0000
+++ help/settings_connectivity_manual.html 2012-01-16 20:01:29 +0000
@@ -40,9 +40,9 @@
</dd>
<dt>Manual port forwarding (I have configured my router by myself)</dt>
<dd cshelp="IDH_SETTINGS_CONNECTIVITY_FIREWALL_NAT">Select this mode if you are behind a router and
- have set up the TCP, UDP and TLS port forwarding by yourself. You may need to specify the
- external IP address of your router in the field below as well (although in most cases, hubs you
- connect to - especially ADC ones - will fill it on your behalf). Use this mode only if the
+ have set up the forwarding of the Transfer (TCP), Encrypted transfer (TCP) and Search (UDP) ports by yourself.
+ You may need to specify the external IP address of your router in the field below as well (although in most
+ cases, hubs you connect to - especially ADC ones - will fill it on your behalf). Use this mode only if the
previous ones are not options for you. For more information, refer to the
<a href="faq_portforward.html">Manual port forwarding guide</a>.</dd>
</dl>
=== modified file 'help/settings_logs.html'
--- help/settings_logs.html 2011-03-10 20:27:58 +0000
+++ help/settings_logs.html 2012-01-16 20:01:29 +0000
@@ -46,103 +46,103 @@
<td style="font-weight: bold;">Uploaded segments log</td>
</tr>
<tr>
- <td class="cl">%[target]</td>
+ <td class="cl"><untranslated>%[target]</untranslated></td>
<td>Local target path and filename</td>
<td>Local target path and filename</td>
<td>N/A</td>
</tr>
<tr>
- <td class="cl">%[source]</td>
+ <td class="cl"><untranslated>%[source]</untranslated></td>
<td>N/A</td>
<td>N/A</td>
<td>Local path of the file the chunk uploaded from</td>
</tr>
<tr>
- <td class="cl">%[userNI]</td>
+ <td class="cl"><untranslated>%[userNI]</untranslated></td>
<td>User's nickname</td>
<td>User nicknames</td>
<td>User's nickname</td>
</tr>
<tr>
- <td class="cl">%[userCID]</td>
+ <td class="cl"><untranslated>%[userCID]</untranslated></td>
<td>User's CID</td>
<td>User CIDs</td>
<td>User's CID</td>
</tr>
<tr>
- <td class="cl">%[userI4]</td>
+ <td class="cl"><untranslated>%[userI4]</untranslated></td>
<td>User's IPv4 address</td>
<td>User IPv4 addresses (available for ADC users only)</td>
<td>User's IPv4 address</td>
</tr>
<tr>
- <td class="cl">%[hubNI]</td>
+ <td class="cl"><untranslated>%[hubNI]</untranslated></td>
<td>Hub name</td>
<td>Hub names</td>
<td>Hub name</td>
</tr>
<tr>
- <td class="cl">%[hubURL]</td>
+ <td class="cl"><untranslated>%[hubURL]</untranslated></td>
<td>Hub's URL or IP address</td>
<td>Hub URLs or IP addresses</td>
<td>Hub's URL or IP address</td>
</tr>
<tr>
- <td class="cl">%[fileSI]</td>
+ <td class="cl"><untranslated>%[fileSI]</untranslated></td>
<td>Chunk size</td>
<td>Total file size</td>
<td>Chunk size</td>
</tr>
<tr>
- <td class="cl">%[fileSIshort]</td>
+ <td class="cl"><untranslated>%[fileSIshort]</untranslated></td>
<td>Chunk size, shortened and including units</td>
<td>Total file size, shortened and including units</td>
<td>Chunk size, shortened and including units</td>
</tr>
<tr>
- <td class="cl">%[fileSIsession]</td>
+ <td class="cl"><untranslated>%[fileSIsession]</untranslated></td>
<td>N/A</td>
<td>File size transferred in the current session</td>
<td>N/A</td>
</tr>
<tr>
- <td class="cl">%[fileSIsessionshort]</td>
+ <td class="cl"><untranslated>%[fileSIsessionshort]</untranslated></td>
<td>N/A</td>
<td>File size transferred in the current session, shortened and including units</td>
<td>N/A</td>
</tr>
<tr>
- <td class="cl">%[fileSIactual]</td>
+ <td class="cl"><untranslated>%[fileSIactual]</untranslated></td>
<td>Actual transferred bytes, affected by compression</td>
<td>Actual transferred bytes (in the current session), affected by compression</td>
<td>Actual transferred bytes, affected by compression</td>
</tr>
<tr>
- <td class="cl">%[fileSIactualshort]</td>
+ <td class="cl"><untranslated>%[fileSIactualshort]</untranslated></td>
<td>Actual transferred bytes, short and including units</td>
<td>Actual transferred bytes (in the current session), short and including units</td>
<td>Actual transferred bytes, short and including units</td>
</tr>
<tr>
- <td class="cl">%[speed]</td>
+ <td class="cl"><untranslated>%[speed]</untranslated></td>
<td>Average speed of the transfer</td>
<td>Average speed of the transfer (in the current session)</td>
<td>Average speed of the transfer</td>
</tr>
<tr>
- <td class="cl">%[time]</td>
+ <td class="cl"><untranslated>%[time]</untranslated></td>
<td>Actual chunk transfer time</td>
<td>Actual file transfer time in the current session</td>
<td>Actual chunk transfer time</td>
</tr>
<tr>
- <td class="cl">%[fileTR]</td>
+ <td class="cl"><untranslated>%[fileTR]</untranslated></td>
<td>TTH of the target file the chunk downloaded to</td>
<td>TTH of the target file</td>
<td>TTH of the target file the chunk uploaded from</td>
</tr>
<tr>
- <td class="cl">%[sfv]</td>
+ <td class="cl"><untranslated>%[sfv]</untranslated></td>
<td>N/A</td>
<td>Whether the file was successfully checked against a SFV file (0 = no, 1 = yes)</td>
<td>N/A</td>
@@ -225,13 +225,14 @@
they will be replaced with underscores.</div>
<div>Ex: Main chat: %[hubaddr]\%Y-%m.log - would result in this: example.no-ip.org\2004-12.log
(if you are in the hub example.no-ip.org and it is december 2004)</div>
- <p style="font-weight: bold">Default:</p>
+ <p style="font-weight: bold">Default file name formats:</p>
<ul>
<li>Hub chat: %[hubURL].log</li>
<li>Hub status: %[hubURL]_status.log</li>
<li>Private message: %[userNI].%[userCID].log</li>
- <li>Download: Downloads.log</li>
- <li>Upload: Uploads.log</li>
+ <li>Finished downloads: Finished_downloads.log</li>
+ <li>Downloaded segments: Downloads.log</li>
+ <li>Uploaded segments: Uploads.log</li>
<li>System: system.log</li>
</ul>
</dd>
=== modified file 'help/window_system_log.html'
--- help/window_system_log.html 2011-11-29 17:27:23 +0000
+++ help/window_system_log.html 2012-01-16 20:01:29 +0000
@@ -63,18 +63,14 @@
<dd>These errors mean that DC++ was unable to register the appropriate link handler(s) in Windows, per the <a href="settings_advanced.html#registrymagnet">Register with Windows to handle magnet: URI links</a> and <a href="settings_advanced.html#registrydchubadc">Register with Windows to handle dchub://, adc:// and adcs:// URL links</a> settings. The most common reason of an unsuccesful registration is that the user account under which DC++ is running does not have appropriate rights for (write) access the required parts of the Windows Registry.</dd>
<dt>Port mapping: Failed to get external IP</dt>
<dd>This error message can appear when DC++ tries to map ports for incoming connections via NAT-PMP / UPnP and means that although port mappings were successful, DC++ couldn't get the external IP address from the gateway (router) device. If this message persists, it may be because of broken NAT-PMP / UPnP support of the device. This is not very important, since DC++ can still gather the external IP from connected hubs <a href="settings_connectivity_manual.html#noipoverride">if it is allowed to do so</a>.</dd>
- <dt>Port mapping: Failed to create port mappings</dt>
- <dd>This error message can appear when DC++ tries to map ports for incoming connections via NAT-PMP / UPnP. It means that no compatible device could be found or that the device in question is not responding. This message can occur during <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a>, when DC++ is trying to discover a possible NAT-PMP / UPnP device for setting up active mode. This message is a real problem only if you selected the 'Let DC++ configure my router (NAT-PMP / UPnP)' option manually in <a href="settings_connectivity_manual.html#connection">Incoming connection settings</a>. In this case, refer to the <a href="faq_mapping.html">port mapping FAQ</a> for more information.</dd>
- <dt>Port mapping: Failed to remove port mappings</dt>
- <dd>This message can appear mostly at shutdown of DC++ and means that port mappings created before couldn't be successfully removed. If this message persists the most probable reason is broken NAT-PMP / UPnP support of the (router) device.</dd>
<dt>Port mapping: Another port mapping attempt is in progress...</dt>
<dd>This means that an <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> attempt was started too soon (the previous operation has not been finished). Try restarting DC++ if this message persists. If restart DC++ does not help the most probable reason is broken NAT-PMP / UPnP support of your (router) device.</dd>
<dt>Port mapping: Failed to initalize the [interface identification] interface</dt>
<dd>DC++ failed to initalize one of its NAT-PMP or UPnP interfaces and will try to use the next one in the row.</dd>
<dt>Port mapping: Failed to map the [Transfer/Encrypted transfer/Search] port ([port number] [TCP/UDP]) with the [interface identification] interface</dt>
- <dd>The currently used port mapping interface failed to map the shown port. DC++ will try to use the next automatic port mapper interface in the row.</dd>
+ <dd>The currently used port mapping interface failed to map the shown port. This error message can appear when DC++ tries to map ports for incoming connections via NAT-PMP / UPnP. It means that no compatible device could be found or that the device in question is not responding. DC++ will try to use the next automatic port mapper interface in the row. This message can occur during <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a>, when DC++ is trying to discover a possible NAT-PMP / UPnP device for setting up active mode. This message is a real problem only if you selected the 'Let DC++ configure my router (NAT-PMP / UPnP)' option manually in <a href="settings_connectivity_manual.html#connection">Incoming connection settings</a>. In this case, refer to the <a href="faq_mapping.html">port mapping FAQ</a> for more information.</dd>
<dt>Port mapping: Failed to remove port mappings from the [router name] device with the [interface identification] interface</dt>
- <dd>DC++ has failed to remove the existing port forwarding rules from the router made by <a href="faq_mapping.html">NAT-PMP or UPnP</a>.</dd>
+ <dd>DC++ has failed to remove the existing port forwarding rules from the router made by <a href="faq_mapping.html">NAT-PMP or UPnP</a>. This message can appear at shutdown or during an <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> attempt and it means that existing port mappings created earlier couldn't be removed successfully. If this message persists the most probable reason is broken NAT-PMP / UPnP support of the (router) device.</dd>
<dt>Connectivity: Unable to open TCP/UDP/TLS port(s); connectivity settings must be configured manually</dt>
<dd>You can get this message only when <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> is enabled and DC++ failed to open port(s) before trying to determine the available conncetion types. Possible reasons include the choosen port(s) are already occupied by another application or <a href="faq_unblock.html">DC++ is blocked by a software firewall</a>.</dd>
<dt>Not listening for connections - please restart DC++</dt>
@@ -119,8 +115,8 @@
<dd>There were problems opening a downloaded filelist, its corrupted or its size is <a href="settings_expert.html#maxlistsize">bigger than the maximum size allowed to open</a>.</dd>
<dt>Unable to send file [path]: [error message]</dt>
<dd>There was a problem preparing file [path] upon an upload request by a peer.</dd>
- <dt>Invalid ADL Search regular expression: [regex]</dt>
- <dd>There was a problem applying an existing enabled ADLSearch filter with [regex] to a file list.</dd>
+ <dt>Invalid regular expression: [regex]</dt>
+ <dd>There was a problem applying a regular experssion [regex] specified in one of the filter functions.</dd>
<!-- This can be reused when the message will go to the log again...
<dt>Someone is trying to use your client to spam [ip address], please urge hub owner to fix this</dt>
