Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some typos (patch from Henry)

Browse Source 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-17 18:02:52 +00:00
parent dd48f5f027
commit a3b844da6b
10 changed files with 1193 additions and 718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
plugins/FeedReader/lang/FeedReader_en.ts
View File

@ -9,87 +9,92 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="106"/>
<location filename="../gui/AddFeedDialog.ui" line="93"/>
<source>Authentication (not yet supported)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="112"/>
<location filename="../gui/AddFeedDialog.ui" line="99"/>
<source>Feed needs authentication</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="119"/>
<location filename="../gui/AddFeedDialog.ui" line="106"/>
<source>User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="126"/>
<location filename="../gui/AddFeedDialog.ui" line="113"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="222"/>
<location filename="../gui/AddFeedDialog.ui" line="166"/>
<source>Clear cache</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="216"/>
<source>Update interval</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="228"/>
<location filename="../gui/AddFeedDialog.ui" line="222"/>
<source>Use standard update interval</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="235"/>
<location filename="../gui/AddFeedDialog.ui" line="229"/>
<source>Interval in minutes (0 = manual)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="254"/>
<location filename="../gui/AddFeedDialog.ui" line="248"/>
<source>Last update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="267"/>
<location filename="../gui/AddFeedDialog.ui" line="261"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="388"/>
<location filename="../gui/AddFeedDialog.ui" line="382"/>
<source>Embed images</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="146"/>
<location filename="../gui/AddFeedDialog.ui" line="133"/>
<source>Storage time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="152"/>
<location filename="../gui/AddFeedDialog.ui" line="159"/>
<source>Use standard storage time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="159"/>
<location filename="../gui/AddFeedDialog.ui" line="139"/>
<source>Days (0 = off)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="182"/>
<location filename="../gui/AddFeedDialog.ui" line="176"/>
<source>Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="188"/>
<location filename="../gui/AddFeedDialog.ui" line="182"/>
<source>Use standard proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="195"/>
<location filename="../gui/AddFeedDialog.ui" line="189"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="205"/>
<location filename="../gui/AddFeedDialog.ui" line="199"/>
<source>:</source>
<translation type="unfinished"></translation>
</message>
@ -104,109 +109,94 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="96"/>
<location filename="../gui/AddFeedDialog.ui" line="83"/>
<source>Local Feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="328"/>
<location filename="../gui/AddFeedDialog.ui" line="322"/>
<source>Transformation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="336"/>
<location filename="../gui/AddFeedDialog.ui" line="330"/>
<source>Transformation type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="349"/>
<location filename="../gui/AddFeedDialog.ui" line="343"/>
<source>Preview &amp;&amp; Transformation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="361"/>
<location filename="../gui/AddFeedDialog.ui" line="355"/>
<source>Misc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="367"/>
<location filename="../gui/AddFeedDialog.ui" line="361"/>
<source>Activated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="374"/>
<location filename="../gui/AddFeedDialog.ui" line="368"/>
<source>Use name and description from feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="381"/>
<location filename="../gui/AddFeedDialog.ui" line="375"/>
<source>Update forum information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="395"/>
<location filename="../gui/AddFeedDialog.ui" line="389"/>
<source>Save complete web page (experimental for local feeds)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="292"/>
<location filename="../gui/AddFeedDialog.ui" line="286"/>
<source>Description:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="306"/>
<location filename="../gui/AddFeedDialog.ui" line="300"/>
<source>RSS-Feed-URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.ui" line="316"/>
<location filename="../gui/AddFeedDialog.ui" line="310"/>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="63"/>
<location filename="../gui/AddFeedDialog.cpp" line="75"/>
<source>Feed Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="96"/>
<source>Create a new anonymous public forum</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="212"/>
<location filename="../gui/AddFeedDialog.cpp" line="325"/>
<location filename="../gui/AddFeedDialog.cpp" line="340"/>
<location filename="../gui/AddFeedDialog.cpp" line="217"/>
<location filename="../gui/AddFeedDialog.cpp" line="332"/>
<location filename="../gui/AddFeedDialog.cpp" line="347"/>
<source>Edit feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="237"/>
<source>Not yet created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="243"/>
<source>Unknown forum</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="325"/>
<location filename="../gui/AddFeedDialog.cpp" line="332"/>
<source>Can&apos;t edit feed. Feed does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="335"/>
<location filename="../gui/AddFeedDialog.cpp" line="342"/>
<source>Create feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="335"/>
<location filename="../gui/AddFeedDialog.cpp" line="342"/>
<source>Cannot create feed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AddFeedDialog.cpp" line="340"/>
<location filename="../gui/AddFeedDialog.cpp" line="347"/>
<source>Cannot change feed.</source>
<translation type="unfinished"></translation>
</message>
@ -287,17 +277,17 @@
<context>
<name>FeedReaderDialog</name>
<message>
<location filename="../gui/FeedReaderDialog.ui" line="68"/>
<location filename="../gui/FeedReaderDialog.ui" line="73"/>
<source>Feeds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.ui" line="91"/>
<location filename="../gui/FeedReaderDialog.ui" line="96"/>
<source>Add new feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.ui" line="108"/>
<location filename="../gui/FeedReaderDialog.ui" line="113"/>
<source>Update feed</source>
<translation type="unfinished"></translation>
</message>
@ -307,104 +297,104 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="288"/>
<location filename="../gui/FeedReaderDialog.cpp" line="291"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="289"/>
<location filename="../gui/FeedReaderDialog.cpp" line="292"/>
<source>Feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="293"/>
<location filename="../gui/FeedReaderDialog.cpp" line="296"/>
<source>Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="301"/>
<location filename="../gui/FeedReaderDialog.cpp" line="304"/>
<source>Open in new tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="309"/>
<location filename="../gui/FeedReaderDialog.cpp" line="312"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="314"/>
<location filename="../gui/FeedReaderDialog.cpp" line="317"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="326"/>
<location filename="../gui/FeedReaderDialog.cpp" line="329"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="329"/>
<location filename="../gui/FeedReaderDialog.cpp" line="332"/>
<source>Activate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="329"/>
<location filename="../gui/FeedReaderDialog.cpp" line="332"/>
<source>Deactivate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="524"/>
<location filename="../gui/FeedReaderDialog.cpp" line="527"/>
<source>No name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="736"/>
<location filename="../gui/FeedReaderDialog.cpp" line="739"/>
<source>Add new folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="737"/>
<location filename="../gui/FeedReaderDialog.cpp" line="740"/>
<source>Please enter a name for the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="743"/>
<location filename="../gui/FeedReaderDialog.cpp" line="796"/>
<location filename="../gui/FeedReaderDialog.cpp" line="746"/>
<location filename="../gui/FeedReaderDialog.cpp" line="799"/>
<source>Create folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="743"/>
<location filename="../gui/FeedReaderDialog.cpp" line="796"/>
<location filename="../gui/FeedReaderDialog.cpp" line="746"/>
<location filename="../gui/FeedReaderDialog.cpp" line="799"/>
<source>Cannot create folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<location filename="../gui/FeedReaderDialog.cpp" line="772"/>
<source>Remove folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<location filename="../gui/FeedReaderDialog.cpp" line="772"/>
<source>Remove feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<location filename="../gui/FeedReaderDialog.cpp" line="772"/>
<source>Do you want to remove the folder %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<location filename="../gui/FeedReaderDialog.cpp" line="772"/>
<source>Do you want to remove the feed %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="789"/>
<location filename="../gui/FeedReaderDialog.cpp" line="792"/>
<source>Edit folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="790"/>
<location filename="../gui/FeedReaderDialog.cpp" line="793"/>
<source>Please enter a new name for the folder</source>
<translation type="unfinished"></translation>
</message>
@ -413,7 +403,7 @@
<name>FeedReaderFeedItem</name>
<message>
<location filename="../gui/FeedReaderFeedItem.ui" line="196"/>
<location filename="../gui/FeedReaderFeedItem.cpp" line="109"/>
<location filename="../gui/FeedReaderFeedItem.cpp" line="116"/>
<source>Expand</source>
<translation type="unfinished"></translation>
</message>
@ -438,7 +428,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderFeedItem.cpp" line="103"/>
<location filename="../gui/FeedReaderFeedItem.cpp" line="110"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
@ -605,12 +595,12 @@
<context>
<name>FeedReaderPlugin</name>
<message>
<location filename="../FeedReaderPlugin.cpp" line="160"/>
<location filename="../FeedReaderPlugin.cpp" line="153"/>
<source>This plugin provides a Feedreader.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../FeedReaderPlugin.cpp" line="165"/>
<location filename="../FeedReaderPlugin.cpp" line="158"/>
<source>FeedReader</source>
<translation type="unfinished"></translation>
</message>
@ -669,7 +659,7 @@
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="74"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="170"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="167"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
@ -724,62 +714,57 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="123"/>
<source>The forum is no anonymous forum</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="127"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="124"/>
<source>Can&apos;t read html</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="130"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="127"/>
<source>Internal XPath error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="133"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="130"/>
<source>Wrong XPath expression</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="136"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="133"/>
<source>Empty XPath result</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="139"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="136"/>
<source>XSLT format error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="142"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="139"/>
<source>XSLT transformation error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="145"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="142"/>
<source>Empty XSLT result</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="149"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="146"/>
<source>Unknown error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="163"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="160"/>
<source>No transformation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="165"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="162"/>
<source>XPath</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderStringDefs.cpp" line="167"/>
<location filename="../gui/FeedReaderStringDefs.cpp" line="164"/>
<source>XSLT</source>
<translation type="unfinished"></translation>
</message>

190
plugins/VOIP/lang/VOIP_en.ts
View File

@ -1,55 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="en_US">
<context>
<name>AudioChatWidgetHolder</name>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="27"/>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="95"/>
<source>Mute yourself</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="47"/>
<source>Start Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="69"/>
<source>Hangup Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="97"/>
<source>Unmute yourself</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="126"/>
<source>Hold Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="143"/>
<source>VoIP Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="143"/>
<source>Outgoing Call is started...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="151"/>
<source>Resume Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioChatWidgetHolder.cpp" line="175"/>
<source>Answer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioInput</name>
<message>
@ -139,80 +90,85 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="240"/>
<location filename="../gui/AudioInputConfig.ui" line="242"/>
<source>Audio Processing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="246"/>
<location filename="../gui/AudioInputConfig.ui" line="248"/>
<source>Noise Suppression</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="259"/>
<location filename="../gui/AudioInputConfig.ui" line="261"/>
<source>Noise suppression</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="262"/>
<location filename="../gui/AudioInputConfig.ui" line="264"/>
<source>&lt;b&gt;This sets the amount of noise suppression to apply.&lt;/b&gt;&lt;br /&gt;The higher this value, the more aggressively stationary noise will be suppressed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="294"/>
<location filename="../gui/AudioInputConfig.ui" line="296"/>
<source>Amplification</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="304"/>
<location filename="../gui/AudioInputConfig.ui" line="306"/>
<source>Maximum amplification of input sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="307"/>
<location filename="../gui/AudioInputConfig.ui" line="309"/>
<source>&lt;b&gt;Maximum amplification of input.&lt;/b&gt;&lt;br /&gt;RetroShare normalizes the input volume before compressing, and this sets how much it&apos;s allowed to amplify.&lt;br /&gt;The actual level is continually updated based on your current speech pattern, but it will never go above the level specified here.&lt;br /&gt;If the &lt;i&gt;Microphone loudness&lt;/i&gt; level of the audio statistics hover around 100%, you probably want to set this to 2.0 or so, but if, like most people, you are unable to reach 100%, set this to something much higher.&lt;br /&gt;Ideally, set it so &lt;i&gt;Microphone Loudness * Amplification Factor &gt;= 100&lt;/i&gt;, even when you&apos;re speaking really soft.&lt;br /&gt;&lt;br /&gt;Note that there is no harm in setting this to maximum, but RetroShare will start picking up other conversations if you leave it to auto-tune to that level.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="339"/>
<location filename="../gui/AudioInputConfig.ui" line="341"/>
<source>Echo Cancellation Processing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.ui" line="354"/>
<source>Video Processing</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioInputConfig</name>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="100"/>
<location filename="../gui/AudioInputConfig.cpp" line="115"/>
<source>Continuous</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="101"/>
<location filename="../gui/AudioInputConfig.cpp" line="116"/>
<source>Voice Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="102"/>
<location filename="../gui/AudioInputConfig.cpp" line="117"/>
<source>Push To Talk</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="204"/>
<location filename="../gui/AudioInputConfig.cpp" line="222"/>
<source>%1 s</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="212"/>
<location filename="../gui/AudioInputConfig.cpp" line="230"/>
<source>Off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.cpp" line="215"/>
<location filename="../gui/AudioInputConfig.cpp" line="233"/>
<source>-%1 dB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/AudioInputConfig.h" line="72"/>
<location filename="../gui/AudioInputConfig.h" line="76"/>
<source>VOIP</source>
<translation type="unfinished"></translation>
</message>
@ -504,42 +460,42 @@
<context>
<name>QObject</name>
<message>
<location filename="../VOIPPlugin.cpp" line="95"/>
<location filename="../VOIPPlugin.cpp" line="99"/>
<source>&lt;h3&gt;RetroShare VOIP plugin&lt;/h3&gt;&lt;br/&gt; * Contributors: Cyril Soler, Josselin Jacquard&lt;br/&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="96"/>
<location filename="../VOIPPlugin.cpp" line="100"/>
<source>&lt;br/&gt;The VOIP plugin adds VOIP to the private chat window of RetroShare. to use it, proceed as follows:&lt;UL&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="97"/>
<location filename="../VOIPPlugin.cpp" line="101"/>
<source>&lt;li&gt; setup microphone levels using the configuration panel&lt;/li&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="98"/>
<location filename="../VOIPPlugin.cpp" line="102"/>
<source>&lt;li&gt; check your microphone by looking at the VU-metters&lt;/li&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="99"/>
<location filename="../VOIPPlugin.cpp" line="103"/>
<source>&lt;li&gt; in the private chat, enable sound input/output by clicking on the two VOIP icons&lt;/li&gt;&lt;/ul&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="100"/>
<location filename="../VOIPPlugin.cpp" line="104"/>
<source>Your friend needs to run the plugin to talk/listen to you, or course.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="101"/>
<location filename="../VOIPPlugin.cpp" line="105"/>
<source>&lt;br/&gt;&lt;br/&gt;This is an experimental feature. Don&apos;t hesitate to send comments and suggestion to the RS dev team.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../VOIPPlugin.cpp" line="126"/>
<location filename="../VOIPPlugin.cpp" line="130"/>
<source>RTT Statistics</source>
<translation type="unfinished"></translation>
</message>
@ -569,15 +525,101 @@
<context>
<name>VOIP</name>
<message>
<location filename="../VOIPPlugin.cpp" line="163"/>
<location filename="../VOIPPlugin.cpp" line="164"/>
<source>This plugin provides voice communication between friends in RetroShare.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VOIPChatWidgetHolder</name>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="42"/>
<source>Mute</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="55"/>
<source>Start Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="72"/>
<source>Start Video Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="86"/>
<source>Hangup Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="143"/>
<source>Mute yourself</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="145"/>
<source>Unmute yourself</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="164"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="195"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="219"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="229"/>
<source>VoIP Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="164"/>
<source>Outgoing Call stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="177"/>
<source>Hold Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="195"/>
<source>Outgoing Call is started...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="203"/>
<source>Resume Call</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="216"/>
<source>Shut camera off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="219"/>
<source>you&apos;re now sending video...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="224"/>
<source>Activate camera</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="229"/>
<source>Video call stopped</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="263"/>
<source>Answer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VOIPPlugin</name>
<message>
<location filename="../VOIPPlugin.cpp" line="168"/>
<location filename="../VOIPPlugin.cpp" line="169"/>
<source>VOIP</source>
<translation type="unfinished"></translation>
</message>

4
retroshare-gui/src/gui/PluginManager.cpp
View File

@ -283,7 +283,7 @@ PluginManager::removePlugin(QString pluginName)
QFile fl(fn);
if (!fl.remove())
{
QString em = tr("Error: failed to revove file %1"
QString em = tr("Error: failed to remove file %1"
"(uninstalling plugin '%2')")
.arg(fn).arg(pluginName);
emit errorAppeared( em);
@ -335,7 +335,7 @@ PluginManager::installPlugin(QString fileName)
} //
else
{
QString em = tr("Error: can't copy %1 as %2")
QString em = tr("Error: can't copy %1 to %2")
.arg(fileName, newFileName) ;
emit errorAppeared( em );
}

12
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -103,7 +103,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
connect(ui->actionSearchWithoutLimit, SIGNAL(triggered()), this, SLOT(toogle_SeachWithoutLimit()));
connect(ui->searchButton, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuSearchButton(QPoint)));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctrl+M</i>"));
connect(ui->sendButton, SIGNAL(clicked()), this, SLOT(sendChat()));
connect(ui->addFileButton, SIGNAL(clicked()), this , SLOT(addExtraFile()));
@ -870,7 +870,7 @@ void ChatWidget::updateLenOfChatTextEdit()
}
ui->sendButton->setEnabled(!msgToLarge);
text = tr("%1This message counts %2 characters.").arg(msgToLarge ? tr("Warning: ") : "").arg(msg.length());
text = tr("%1This message consists of %2 characters.").arg(msgToLarge ? tr("Warning: ") : "").arg(msg.length());
ui->sendButton->setToolTip(text);
ui->chatTextEdit->setToolTip(msgToLarge?text:"");
}
@ -1060,10 +1060,10 @@ bool ChatWidget::findText(const QString& qsStringToFind, bool bBackWard, bool bF
if (bFound)
{
qpBackGround.setColor(QPalette::Base,QColor(0,200,0));
ui->leSearch->setToolTip(QString::number(uiFoundCount)+tr(" founded items."));
ui->leSearch->setToolTip(QString::number(uiFoundCount)+tr(" items found."));
} else {
qpBackGround.setColor(QPalette::Base,QColor(200,0,0));
ui->leSearch->setToolTip(tr("No items founded."));
ui->leSearch->setToolTip(tr("No items found."));
}
ui->leSearch->setPalette(qpBackGround);
@ -1099,7 +1099,7 @@ void ChatWidget::on_markButton_clicked(bool bValue)
if (ui->textBrowser->textCursor().selectedText().length()>0)
{
qtcMark=ui->textBrowser->textCursor();
ui->markButton->setToolTip(tr("<b>Return to marked text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Return to marked text</b><br><i>Ctrl+M</i>"));
} else { bValue=false;}
} else {
@ -1107,7 +1107,7 @@ void ChatWidget::on_markButton_clicked(bool bValue)
{
ui->textBrowser->setTextCursor(qtcMark);
qtcMark=QTextCursor(ui->textBrowser->document());
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctrl+M</i>"));
}
}

2
retroshare-gui/src/gui/chat/ChatWidget.ui
View File

@ -816,7 +816,7 @@ border-image: url(:/images/closepressed.png)
<string>Don't stop to color after X items found (need more CPU)</string>
</property>
<property name="toolTip">
<string>WARNING: Could take long time on big history.</string>
<string>WARNING: Could take a long time on big history.</string>
</property>
</action>
<action name="actionChooseColor">

2
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View File

@ -594,7 +594,7 @@ void RsCollectionDialog::changeFileName()
QMessageBox mb;
mb.setText(tr("Save Collection File."));
mb.setInformativeText(tr("File already exist.")+"\n"+tr("What do you want to do?"));
mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);

2
retroshare-gui/src/gui/common/RsCollectionDialog.ui
View File

@ -147,7 +147,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Change the file were collection will be saved.&lt;/p&gt;&lt;p&gt;If you select an existing file, you could merge it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Change the file where collection will be saved.&lt;/p&gt;&lt;p&gt;If you select an existing file, you could merge it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>...</string>

2
retroshare-gui/src/gui/common/RsCollectionFile.cpp
View File

@ -374,7 +374,7 @@ bool RsCollectionFile::openNewColl(QWidget *parent)
QMessageBox mb;
mb.setText(tr("Save Collection File."));
mb.setInformativeText(tr("File already exist.")+"\n"+tr("What do you want to do?"));
mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);

2
retroshare-gui/src/gui/settings/ChatPage.ui
View File

@ -385,7 +385,7 @@
<item>
<widget class="QLabel" name="lSearch_MaxLimitColor">
<property name="text">
<string>Number of found text coloring</string>
<string>Maximum count for coloring matching text</string>
</property>
</widget>
</item>

1514
retroshare-gui/src/lang/retroshare_en.ts
View File

File diff suppressed because it is too large Load Diff