diff --git a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp index 0cbc22455..d1645c0e4 100644 --- a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp +++ b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp @@ -119,7 +119,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info painter->setPen(QColor::fromRgb(0,0,0)) ; y += text_height ; - painter->drawText(0,y,tr("Chunk map:")) ; + painter->drawText(0,y,tr("Chunk map") + ":") ; y += block_sep ; // draw the chunk map @@ -159,7 +159,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info y += block_sep ; y += text_height ; painter->setPen(QColor::fromRgb(0,0,0)) ; - painter->drawText(0,y,tr("Active chunks:")) ; + painter->drawText(0,y,tr("Active chunks") + ":") ; y += block_sep ; for(uint i=0;isetPen(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 ; // 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)) ; - y += text_height ; painter->drawText(0,y,tr("File info:")) ; + y += text_height ; painter->drawText(0,y,tr("File info") + ":") ; 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 += 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 += 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 += 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 += 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 += 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 += 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 += 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 += 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_ASSUME_AVAILABILITY) painter->drawText(tab_size,y,"Direct friend transfer / Availability assumed") ; + y += text_height ; painter->drawText(20,y,tr("Transfer type") + ":") ; + 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,tr("Direct friend transfer / Availability assumed")) ; y += text_height ; y += block_sep ; diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 832422182..70b139cc3 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 698ebf309..b196a0fee 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -3194,38 +3194,38 @@ p, li { white-space: pre-wrap; } FileTransferInfoWidget - Chunk map: - Block map: + Chunk map + Block map - Active chunks: - Aktive Blöcke: + Active chunks + Aktive Blöcke - Availability map ( - Verfügbarkeits map + Availability map (%1 active sources) + Verfügbarkeitsmappe (%1 aktive Quellen) - active sources - aktive Quellen + Availability map (%1 active source) + Verfügbarkeitsmappe (%1 aktive Quelle) - File info: - Datei Info: + File info + Datei Info - File hash: - Datei Prüfsumme: + File hash + Datei Prüfsumme - File size: - Datei Größe: + File size + Datei Größe @@ -3237,38 +3237,48 @@ p, li { white-space: pre-wrap; } - Chunk size: - Block Größe: + Chunk size + Block Größe - Number of chunks: - Anzahl der Blöcke: + Number of chunks + Anzahl der Blöcke - Transfered: - Übertragen: + Transfered + Übertragen - Remaining: - Verbleibend: + Remaining + Verbleibend - Number of sources: - Anzahl der Quellen: + Number of sources + Anzahl der Quellen - Chunk strategy: - Block Strategie: + Chunk strategy + Block Strategie - Transfer type: - Transfer Typ: + Transfer type + Transfer Typ + + + + Anonymous F2F + Anonym F2F + + + + Direct friend transfer / Availability assumed + Direkte Freund-Übertragung / Verfügbarkeit angenommen @@ -4302,7 +4312,7 @@ Fill in your GPG password when asked, to sign your new key. Zurücksetzen - + Private Key Available Privater Schlüssel verfügbar @@ -7227,7 +7237,7 @@ p, li { white-space: pre-wrap; } Chat - + Save Certificate Zertifikat speichern @@ -7242,7 +7252,7 @@ p, li { white-space: pre-wrap; } Status - + Connect To Friend Verbinde zum Freund @@ -7342,13 +7352,13 @@ p, li { white-space: pre-wrap; } Aus allen Gruppen entfernen - + Available Verfügbar - + New group chat Neuer Gruppenchat @@ -7500,7 +7510,7 @@ p, li { white-space: pre-wrap; } - + Add Friend Freund hinzufügen @@ -7555,12 +7565,12 @@ p, li { white-space: pre-wrap; } - + RetroShare - + Message Group Gruppe anschreiben @@ -7575,7 +7585,7 @@ p, li { white-space: pre-wrap; } Gruppe entfernen - + Do you want to remove this Friend? Willst du diesen Freund entfernen? @@ -7613,12 +7623,12 @@ p, li { white-space: pre-wrap; } Status Spalte ausblenden - + Friends Storm Aktivitäten - + is typing... tippt... @@ -7638,7 +7648,7 @@ p, li { white-space: pre-wrap; } Freunde - + Paste Friend Link RetroShare Link einfügen