Enabled new translation and changed some existing translation in FileTransferInfoWidget.

Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-12-27 18:51:16 +00:00
parent c54b564436
commit dd3ddfb912
3 changed files with 65 additions and 55 deletions

View File

@ -119,7 +119,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
y += text_height ; y += text_height ;
painter->drawText(0,y,tr("Chunk map:")) ; painter->drawText(0,y,tr("Chunk map") + ":") ;
y += block_sep ; y += block_sep ;
// draw the chunk map // draw the chunk map
@ -159,7 +159,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
y += block_sep ; y += block_sep ;
y += text_height ; y += text_height ;
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawText(0,y,tr("Active chunks:")) ; painter->drawText(0,y,tr("Active chunks") + ":") ;
y += block_sep ; y += block_sep ;
for(uint i=0;i<info.active_chunks.size();++i) for(uint i=0;i<info.active_chunks.size();++i)
@ -210,7 +210,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
y += block_sep ; y += block_sep ;
y += text_height ; y += text_height ;
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawText(0,y,tr("Availability map (")+QString::number(info.compressed_peer_availability_maps.size())+ tr(" active sources")+")") ; painter->drawText(0,y,(info.compressed_peer_availability_maps.size() == 1 ? tr("Availability map (%1 active source)") : tr("Availability map (%1 active sources)")).arg(info.compressed_peer_availability_maps.size())) ;
y += block_sep ; y += block_sep ;
// Note (for non geeks): the !! operator transforms anything positive into 1 and 0 into 0. // Note (for non geeks): the !! operator transforms anything positive into 1 and 0 into 0.
@ -238,27 +238,27 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
// //
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
y += text_height ; painter->drawText(0,y,tr("File info:")) ; y += text_height ; painter->drawText(0,y,tr("File info") + ":") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("File hash: ")) ; painter->drawText(tab_size,y,QString::fromStdString(nfo.hash)) ; y += text_height ; painter->drawText(20,y,tr("File hash") + ":") ; painter->drawText(tab_size,y,QString::fromStdString(nfo.hash)) ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("File size: ")) ; painter->drawText(tab_size,y,QString::number(info.file_size) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.file_size) + ")") ; y += text_height ; painter->drawText(20,y,tr("File size") + ":") ; painter->drawText(tab_size,y,QString::number(info.file_size) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.file_size) + ")") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Chunk size: ")) ; painter->drawText(tab_size,y,QString::number(info.chunk_size) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.chunk_size) + ")") ; y += text_height ; painter->drawText(20,y,tr("Chunk size") + ":") ; painter->drawText(tab_size,y,QString::number(info.chunk_size) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.chunk_size) + ")") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Number of chunks: ")) ; painter->drawText(tab_size,y,QString::number(info.chunks.size())) ; y += text_height ; painter->drawText(20,y,tr("Number of chunks") + ":") ; painter->drawText(tab_size,y,QString::number(info.chunks.size())) ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Transfered: ")) ; painter->drawText(tab_size,y,QString::number(nfo.transfered) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(nfo.transfered) + ")") ; y += text_height ; painter->drawText(20,y,tr("Transfered") + ":") ; painter->drawText(tab_size,y,QString::number(nfo.transfered) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(nfo.transfered) + ")") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Remaining: ")) ; painter->drawText(tab_size,y,QString::number(info.file_size - nfo.transfered) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.file_size - nfo.transfered) + ")") ; y += text_height ; painter->drawText(20,y,tr("Remaining") + ":") ; painter->drawText(tab_size,y,QString::number(info.file_size - nfo.transfered) + " " + tr("bytes") + " " + "(" + misc::friendlyUnit(info.file_size - nfo.transfered) + ")") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Number of sources: ")) ; painter->drawText(tab_size,y,QString::number(info.compressed_peer_availability_maps.size())) ; y += text_height ; painter->drawText(20,y,tr("Number of sources") + ":") ; painter->drawText(tab_size,y,QString::number(info.compressed_peer_availability_maps.size())) ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Chunk strategy: ")) ; painter->drawText(tab_size,y,(info.strategy==FileChunksInfo::CHUNK_STRATEGY_RANDOM)?"Random":"Streaming") ; y += text_height ; painter->drawText(20,y,tr("Chunk strategy") + ":") ; painter->drawText(tab_size,y,(info.strategy==FileChunksInfo::CHUNK_STRATEGY_RANDOM)?"Random":"Streaming") ;
y += block_sep ; y += block_sep ;
y += text_height ; painter->drawText(20,y,tr("Transfer type: ")) ; y += text_height ; painter->drawText(20,y,tr("Transfer type") + ":") ;
if(info.flags & RS_FILE_HINTS_NETWORK_WIDE) painter->drawText(tab_size,y,"Anonymous F2F") ; if(info.flags & RS_FILE_HINTS_NETWORK_WIDE) painter->drawText(tab_size,y,tr("Anonymous F2F")) ;
if(info.flags & RS_FILE_HINTS_ASSUME_AVAILABILITY) painter->drawText(tab_size,y,"Direct friend transfer / Availability assumed") ; if(info.flags & RS_FILE_HINTS_ASSUME_AVAILABILITY) painter->drawText(tab_size,y,tr("Direct friend transfer / Availability assumed")) ;
y += text_height ; y += text_height ;
y += block_sep ; y += block_sep ;

View File

@ -3194,38 +3194,38 @@ p, li { white-space: pre-wrap; }
<name>FileTransferInfoWidget</name> <name>FileTransferInfoWidget</name>
<message> <message>
<location filename="../gui/FileTransferInfoWidget.cpp" line="+122"/> <location filename="../gui/FileTransferInfoWidget.cpp" line="+122"/>
<source>Chunk map:</source> <source>Chunk map</source>
<translation>Block map:</translation> <translation>Block map</translation>
</message> </message>
<message> <message>
<location line="+40"/> <location line="+40"/>
<source>Active chunks:</source> <source>Active chunks</source>
<translation>Aktive Blöcke:</translation> <translation>Aktive Blöcke</translation>
</message> </message>
<message> <message>
<location line="+51"/> <location line="+51"/>
<source>Availability map (</source> <source>Availability map (%1 active sources)</source>
<translation>Verfügbarkeits map</translation> <translation>Verfügbarkeitsmappe (%1 aktive Quellen)</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source> active sources</source> <source>Availability map (%1 active source)</source>
<translation>aktive Quellen</translation> <translation>Verfügbarkeitsmappe (%1 aktive Quelle)</translation>
</message> </message>
<message> <message>
<location line="+28"/> <location line="+28"/>
<source>File info:</source> <source>File info</source>
<translation>Datei Info:</translation> <translation>Datei Info</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>File hash: </source> <source>File hash</source>
<translation>Datei Prüfsumme:</translation> <translation>Datei Prüfsumme</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>File size: </source> <source>File size</source>
<translation>Datei Größe:</translation> <translation>Datei Größe</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
@ -3237,38 +3237,48 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-6"/> <location line="-6"/>
<source>Chunk size: </source> <source>Chunk size</source>
<translation>Block Größe:</translation> <translation>Block Größe</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Number of chunks: </source> <source>Number of chunks</source>
<translation>Anzahl der Blöcke:</translation> <translation>Anzahl der Blöcke</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Transfered: </source> <source>Transfered</source>
<translation>Übertragen:</translation> <translation>Übertragen</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Remaining: </source> <source>Remaining</source>
<translation>Verbleibend:</translation> <translation>Verbleibend</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Number of sources: </source> <source>Number of sources</source>
<translation>Anzahl der Quellen:</translation> <translation>Anzahl der Quellen</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Chunk strategy: </source> <source>Chunk strategy</source>
<translation>Block Strategie:</translation> <translation>Block Strategie</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Transfer type: </source> <source>Transfer type</source>
<translation>Transfer Typ:</translation> <translation>Transfer Typ</translation>
</message>
<message>
<location line="+1"/>
<source>Anonymous F2F</source>
<translation>Anonym F2F</translation>
</message>
<message>
<location line="+1"/>
<source>Direct friend transfer / Availability assumed</source>
<translation>Direkte Freund-Übertragung / Verfügbarkeit angenommen</translation>
</message> </message>
</context> </context>
<context> <context>
@ -4302,7 +4312,7 @@ Fill in your GPG password when asked, to sign your new key.</source>
<translation>Zurücksetzen</translation> <translation>Zurücksetzen</translation>
</message> </message>
<message> <message>
<location filename="../gui/common/GroupTreeWidget.cpp" line="+185"/> <location filename="../gui/common/GroupTreeWidget.cpp" line="+187"/>
<source>Private Key Available</source> <source>Private Key Available</source>
<translation>Privater Schlüssel verfügbar</translation> <translation>Privater Schlüssel verfügbar</translation>
</message> </message>
@ -7227,7 +7237,7 @@ p, li { white-space: pre-wrap; }
<translation>Chat</translation> <translation>Chat</translation>
</message> </message>
<message> <message>
<location line="+703"/> <location line="+702"/>
<source>Save Certificate</source> <source>Save Certificate</source>
<translation>Zertifikat speichern</translation> <translation>Zertifikat speichern</translation>
</message> </message>
@ -7242,7 +7252,7 @@ p, li { white-space: pre-wrap; }
<translation>Status</translation> <translation>Status</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-690"/> <location filename="../gui/PeersDialog.cpp" line="-689"/>
<source>Connect To Friend</source> <source>Connect To Friend</source>
<translation>Verbinde zum Freund</translation> <translation>Verbinde zum Freund</translation>
</message> </message>
@ -7342,13 +7352,13 @@ p, li { white-space: pre-wrap; }
<translation>Aus allen Gruppen entfernen</translation> <translation>Aus allen Gruppen entfernen</translation>
</message> </message>
<message> <message>
<location line="+518"/> <location line="+516"/>
<location line="+2"/> <location line="+2"/>
<source>Available</source> <source>Available</source>
<translation>Verfügbar</translation> <translation>Verfügbar</translation>
</message> </message>
<message> <message>
<location line="+431"/> <location line="+432"/>
<location line="+2"/> <location line="+2"/>
<source>New group chat</source> <source>New group chat</source>
<translation>Neuer Gruppenchat</translation> <translation>Neuer Gruppenchat</translation>
@ -7500,7 +7510,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-150"/> <location line="-150"/>
<location filename="../gui/PeersDialog.cpp" line="-1500"/> <location filename="../gui/PeersDialog.cpp" line="-1499"/>
<source>Add Friend</source> <source>Add Friend</source>
<translation>Freund hinzufügen</translation> <translation>Freund hinzufügen</translation>
</message> </message>
@ -7555,12 +7565,12 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-40"/> <location filename="../gui/PeersDialog.cpp" line="-40"/>
<location line="+871"/> <location line="+870"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="-832"/> <location line="-831"/>
<source>Message Group</source> <source>Message Group</source>
<translation>Gruppe anschreiben</translation> <translation>Gruppe anschreiben</translation>
</message> </message>
@ -7575,7 +7585,7 @@ p, li { white-space: pre-wrap; }
<translation>Gruppe entfernen</translation> <translation>Gruppe entfernen</translation>
</message> </message>
<message> <message>
<location line="+824"/> <location line="+823"/>
<source>Do you want to remove this Friend?</source> <source>Do you want to remove this Friend?</source>
<translation>Willst du diesen Freund entfernen?</translation> <translation>Willst du diesen Freund entfernen?</translation>
</message> </message>
@ -7613,12 +7623,12 @@ p, li { white-space: pre-wrap; }
<translation>Status Spalte ausblenden</translation> <translation>Status Spalte ausblenden</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-1845"/> <location filename="../gui/PeersDialog.cpp" line="-1844"/>
<source>Friends Storm</source> <source>Friends Storm</source>
<translation>Aktivitäten</translation> <translation>Aktivitäten</translation>
</message> </message>
<message> <message>
<location line="+1204"/> <location line="+1203"/>
<source>is typing...</source> <source>is typing...</source>
<translation>tippt...</translation> <translation>tippt...</translation>
</message> </message>
@ -7638,7 +7648,7 @@ p, li { white-space: pre-wrap; }
<translation>Freunde</translation> <translation>Freunde</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-887"/> <location filename="../gui/PeersDialog.cpp" line="-886"/>
<location line="+80"/> <location line="+80"/>
<source>Paste Friend Link</source> <source>Paste Friend Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>