Beautified RsCollectionDialog.

Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4670 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/ForumsDialog.cpp

@@ -1193,7 +1193,7 @@ void ForumsDialog::nextUnreadMessage()
             ui.threadTreeWidget->setCurrentItem(currentItem);
             return;
         }
-    } while( currentItem = ui.threadTreeWidget->itemBelow(currentItem) );
+    } while( (currentItem = ui.threadTreeWidget->itemBelow(currentItem)) != NULL );
 }
 
 // TODO

retroshare-gui/src/gui/ForumsDialog.ui

@@ -728,11 +728,7 @@ p, li { white-space: pre-wrap; }
              </font>
             </property>
             <property name="text">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+             <string>Forum:</string>
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Forum:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
           </item>
@@ -849,12 +845,15 @@ background: white;
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
             <property name="text">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+             <string>Thread:</string>
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Thread:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
           </item>
@@ -998,17 +997,11 @@ background: white;}</string>
           </item>
           <item row="0" column="5">
            <widget class="QPushButton" name="nextUnreadButton">
-            <property name="minimumSize">
+            <property name="sizePolicy">
-             <size>
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-              <width>80</width>
+              <horstretch>0</horstretch>
-              <height>24</height>
+              <verstretch>0</verstretch>
-             </size>
+             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>24</height>
-             </size>
             </property>
             <property name="text">
              <string>Next unread</string>
@@ -1222,12 +1215,15 @@ border-image: url(:/images/closepressed.png)
          <layout class="QHBoxLayout" name="progressBarLayOut">
           <item>
            <widget class="QLabel" name="progLayOutTxt">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
             <property name="text">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+             <string>Loading</string>
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;LOADING&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
           </item>

retroshare-gui/src/gui/ShareManager.cpp

@@ -182,7 +182,7 @@ void ShareManager::load()
                 QHBoxLayout* layout = new QHBoxLayout(widget);
                 layout->addWidget(cb, 0, Qt::AlignCenter);
                 layout->setSpacing(0);
-                layout->setContentsMargins(0, 0, 0, 0);
+                layout->setContentsMargins(10, 0, 0, 0); // to be centered
                 widget->setLayout(layout);
 
                 listWidget->setCellWidget(row, col + COLUMN_NETWORKWIDE, widget);

retroshare-gui/src/gui/SharedFilesDialog.cpp

@@ -54,6 +54,7 @@
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_OPENFOLDER        ":/images/folderopen.png"
 #define IMAGE_OPENFILE		 ":/images/fileopen.png"
+#define IMAGE_COLLECTION     ":/images/mimetypes/rscollection-16.png"
 
 // Define to avoid using the search in treeview, because it is really slow for now.
 //
@@ -229,7 +230,7 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
   addlinkCloudAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Add Links to Cloud" ), this );
   connect( addlinkCloudAct , SIGNAL( triggered() ), this, SLOT( addLinkToCloud(  ) ) );
 #endif
-  createcollectionfileAct = new QAction(QIcon(IMAGE_OPENFILE), tr("Create collection file"), this);
+  createcollectionfileAct = new QAction(QIcon(IMAGE_COLLECTION), tr("Create collection file"), this);
   connect(createcollectionfileAct, SIGNAL(triggered()), this, SLOT(createCollectionFile()));
   openfileAct = new QAction(QIcon(IMAGE_OPENFILE), tr("Open File"), this);
   connect(openfileAct, SIGNAL(triggered()), this, SLOT(openfile()));

retroshare-gui/src/gui/common/RsCollectionDialog.cpp

@@ -24,6 +24,7 @@
 #include <QCheckBox>
 #include <QMessageBox>
 #include <QDir>
+#include <QKeyEvent>
 #include "RsCollectionDialog.h"
 #include "RsCollectionFile.h"
 
@@ -32,7 +33,8 @@ RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const s
 {
 	setupUi(this) ;
 
-	setWindowTitle(CollectionFileName) ;
+	setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_filename).baseName()));
+
 	// 1 - add all elements to the list.
 
 	int row = 0;
@@ -43,6 +45,11 @@ RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const s
 	_fileEntriesTW->setHorizontalHeaderItem(2,new QTableWidgetItem(tr("Size"))) ;
 	_fileEntriesTW->setHorizontalHeaderItem(3,new QTableWidgetItem(tr("Hash"))) ;
 
+	QHeaderView *header = _fileEntriesTW->horizontalHeader();
+	header->setResizeMode(0, QHeaderView::Fixed);
+
+	header->setHighlightSections(false);
+
 	_cboxes.clear() ;
 	_cboxes.resize(dlinfos.size(),NULL) ;
 	uint64_t total_size ;
@@ -52,14 +59,22 @@ RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const s
 	{
 		_fileEntriesTW->insertRow(row) ;
 
-		QCheckBox *cb = new QCheckBox ;
+		QWidget *widget = new QWidget;
+
+		QCheckBox *cb = new QCheckBox(widget);
 		cb->setChecked(true) ;
 
+		QHBoxLayout *layout = new QHBoxLayout(widget);
+		layout->addWidget(cb, 0, Qt::AlignCenter);
+		layout->setSpacing(0);
+		layout->setContentsMargins(10, 0, 0, 0); // to be centered
+		widget->setLayout(layout);
+
 		connect(cb,SIGNAL(toggled(bool)),this,SLOT(updateSizes())) ;
 
 		_cboxes[i] = cb ;
 
-		_fileEntriesTW->setCellWidget(row,0,cb) ;
+		_fileEntriesTW->setCellWidget(row,0,widget) ;
 		_fileEntriesTW->setItem(row,1,new QTableWidgetItem(dlinfos[i].path + "/" + dlinfos[i].name)) ;
 		_fileEntriesTW->setItem(row,2,new QTableWidgetItem(QString::number(dlinfos[i].size))) ;
 		_fileEntriesTW->setItem(row,3,new QTableWidgetItem(dlinfos[i].hash)) ;
@@ -81,6 +96,33 @@ RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const s
 	connect(_deselectAll_PB,SIGNAL(clicked()),this,SLOT(deselectAll())) ;
 	connect(_cancel_PB,SIGNAL(clicked()),this,SLOT(cancel())) ;
 	connect(_download_PB,SIGNAL(clicked()),this,SLOT(download())) ;
+
+	_fileEntriesTW->installEventFilter(this);
+}
+
+bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
+{
+	if (obj == _fileEntriesTW) {
+		if (event->type() == QEvent::KeyPress) {
+			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+			if (keyEvent && keyEvent->key() == Qt::Key_Space) {
+				// Space pressed
+				QModelIndex currentIndex = _fileEntriesTW->currentIndex();
+				QModelIndex index = _fileEntriesTW->model()->index(currentIndex.row(), 0, currentIndex.parent());
+				QWidget *widget = dynamic_cast<QWidget*>(_fileEntriesTW->indexWidget(index));
+				if (widget) {
+					QCheckBox *cb = dynamic_cast<QCheckBox*>(widget->children().front());
+					if (cb) {
+						cb->toggle();
+					}
+				}
+
+				return true; // eat event
+			}
+		}
+	}
+	// pass the event on to the parent class
+	return QDialog::eventFilter(obj, event);
 }
 
 void RsCollectionDialog::updateSizes()
@@ -102,14 +144,14 @@ void RsCollectionDialog::selectAll() const
 {
 	std::cerr << "Selecting all !" << std::endl;
 	for(int i=0;i<_dlinfos.size();++i)
-		dynamic_cast<QCheckBox*>(_fileEntriesTW->cellWidget(i,0))->setChecked(true) ;
+		_cboxes[i]->setChecked(true) ;
 }
 
 void RsCollectionDialog::deselectAll() const
 {
 	std::cerr << "Deselecting all !" << std::endl;
 	for(int i=0;i<_dlinfos.size();++i)
-		dynamic_cast<QCheckBox*>(_fileEntriesTW->cellWidget(i,0))->setChecked(false) ;
+		_cboxes[i]->setChecked(false) ;
 }
 
 void RsCollectionDialog::cancel() 
@@ -143,5 +185,3 @@ void RsCollectionDialog::download()
 
 	close();
 }
-
-

retroshare-gui/src/gui/common/RsCollectionDialog.h

@@ -26,7 +26,7 @@
 
 class QCheckBox ;
 
-class RsCollectionDialog: public QDialog, public Ui::rsCollectionDialog
+class RsCollectionDialog: public QDialog, public Ui::RsCollectionDialog
 {
 	Q_OBJECT
 
@@ -40,6 +40,9 @@ class RsCollectionDialog: public QDialog, public Ui::rsCollectionDialog
 		void cancel() ;
 		void updateSizes() ;
 
+	protected:
+		bool eventFilter(QObject *obj, QEvent *ev);
+
 	private:
 		const std::vector<RsCollectionFile::DLinfo>& _dlinfos ;
 		std::vector<QCheckBox*> _cboxes ;

retroshare-gui/src/gui/common/RsCollectionDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>rsCollectionDialog</class>
+ <class>RsCollectionDialog</class>
- <widget class="QDialog" name="rsCollectionDialog">
+ <widget class="QDialog" name="RsCollectionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,14 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Collection</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../images.qrc">
+    <normaloff>:/images/mimetypes/rscollection-16.png</normaloff>:/images/mimetypes/rscollection-16.png</iconset>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
@@ -55,21 +62,21 @@
        <item>
         <widget class="QLabel" name="_filename_TL">
          <property name="text">
-          <string>TextLabel</string>
+          <string notr="true">TextLabel</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="_totalSize_TL">
          <property name="text">
-          <string>TextLabel</string>
+          <string notr="true">TextLabel</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="_selectedFiles_TL">
          <property name="text">
-          <string>TextLabel</string>
+          <string notr="true">TextLabel</string>
          </property>
         </widget>
        </item>
@@ -92,6 +99,12 @@
    </item>
    <item>
     <widget class="QTableWidget" name="_fileEntriesTW">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
      <property name="gridStyle">
       <enum>Qt::DotLine</enum>
      </property>
@@ -104,8 +117,8 @@
      <attribute name="verticalHeaderVisible">
       <bool>false</bool>
      </attribute>
-     <attribute name="verticalHeaderStretchLastSection">
+     <attribute name="verticalHeaderDefaultSectionSize">
-      <bool>false</bool>
+      <number>22</number>
      </attribute>
     </widget>
    </item>
@@ -156,6 +169,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../images.qrc"/>
+ </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/common/RsUrlHandler.cpp

@@ -39,10 +39,7 @@ bool RsUrlHandler::openUrl(const QUrl& url)
 			QMessageBox::warning(NULL,QObject::tr("Treatment of collection file has failed."),QObject::tr("The collection file ") + url.toLocalFile() + QObject::tr(" could not be openned. Reported error is: ") + QString::fromStdString(e.what())) ;
 			return false ;
 		}
+		return true;
 	}
-	else
+	return QDesktopServices::openUrl(url) ;
-		return QDesktopServices::openUrl(url) ;
 }
-
-
-

retroshare-gui/src/lang/retroshare_de.ts

@@ -3942,30 +3942,34 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-weight:600;&quot;&gt;Foren&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+610"/>
+        <location line="+259"/>
+        <source>Thread:</source>
+        <translation>Thema:</translation>
+    </message>
+    <message>
+        <location line="+344"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Starte ein neues Thema im ausgewählten Forum</translation>
     </message>
     <message>
-        <location line="-581"/>
+        <location line="-574"/>
         <source>Display</source>
         <translation>Anzeige</translation>
     </message>
     <message>
-        <location line="+105"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Forum:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Forum:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+148"/>
         <source>Last Post</source>
         <translation>Letzter Beitrag</translation>
     </message>
@@ -3981,42 +3985,46 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+39"/>
-        <location line="+309"/>
+        <location line="+306"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-323"/>
+        <location line="-320"/>
-        <location line="+328"/>
+        <location line="+325"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-309"/>
+        <location line="-403"/>
-        <location line="+314"/>
+        <source>Forum:</source>
+        <translation>Forum:</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <location line="+311"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location line="-309"/>
+        <location line="-306"/>
         <source>Signed</source>
         <translation>Unterzeichnet</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Thread:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Thema:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+70"/>
         <source>Previous Thread</source>
         <translation>Vorheriger Beitrag</translation>
     </message>
@@ -4031,7 +4039,7 @@ p, li { white-space: pre-wrap; }
         <translation>Alle Dateien runterladen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+17"/>
         <source>Next unread</source>
         <translation>Nächste ungelesene</translation>
     </message>
@@ -4041,21 +4049,17 @@ p, li { white-space: pre-wrap; }
         <translation>Auf Beitrag antworten</translation>
     </message>
     <message>
-        <location line="-510"/>
+        <location line="+65"/>
+        <source>Loading</source>
+        <translation>Lade</translation>
+    </message>
+    <message>
+        <location line="-568"/>
         <source>Create Forum</source>
         <translation>Forum erstellen</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+620"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;LOADING&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+56"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -4071,7 +4075,7 @@ p, li { white-space: pre-wrap; }
         <translation>Erstelle neues Thema</translation>
     </message>
     <message>
-        <location filename="../gui/ForumsDialog.ui" line="-224"/>
+        <location filename="../gui/ForumsDialog.ui" line="-227"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -10046,7 +10050,7 @@ Lockdatei:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/RsCollectionDialog.cpp" line="+137"/>
+        <location filename="../gui/common/RsCollectionDialog.cpp" line="+136"/>
         <source>Unable to make path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10469,12 +10473,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+701"/>
         <source>Create selection file</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle Kollektion</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Collection files</source>
-        <translation type="unfinished"></translation>
+        <translation>Kollektion</translation>
     </message>
 </context>
 <context>
@@ -10482,17 +10486,57 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/RsCollectionDialog.cpp" line="-95"/>
         <source>File</source>
-        <translation type="unfinished">Datei</translation>
+        <translation>Datei</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Size</source>
-        <translation type="unfinished">Grösse</translation>
+        <translation>Grösse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hash</source>
-        <translation type="unfinished">Prüfsumme</translation>
+        <translation>Prüfsumme</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/RsCollectionDialog.ui" line="+14"/>
+        <source>Collection</source>
+        <translation>Kollektion</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>File name :</source>
+        <translation>Dateiname:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Total size :</source>
+        <translation>Größe:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Selected files:</source>
+        <translation>Ausgewählt:</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Select all</source>
+        <translation>Alle auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Deselect all</source>
+        <translation>Keine auswählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Download!</source>
+        <translation>Herunterladen</translation>
     </message>
 </context>
 <context>
@@ -11174,7 +11218,7 @@ Es hilft auch, wenn Sie sich hinter einer Firewall/VPN befinden.</translation>
     <message>
         <location line="+18"/>
         <source>Plugins</source>
-        <translation type="unfinished">Plugins</translation>
+        <translation>Plugins</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -11531,7 +11575,7 @@ p, li { white-space: pre-wrap; }
     <name>SharedFilesDialog</name>
     <message>
         <location filename="../gui/SharedFilesDialog.ui" line="+984"/>
-        <location filename="../gui/SharedFilesDialog.cpp" line="+388"/>
+        <location filename="../gui/SharedFilesDialog.cpp" line="+389"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
@@ -11682,7 +11726,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Create collection file</source>
-        <translation type="unfinished"></translation>
+        <translation>Kollektion erstellen</translation>
     </message>
     <message>
         <location line="+171"/>
@@ -13480,51 +13524,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>rsCollectionDialog</name>
     <message>
-        <location filename="../gui/common/RsCollectionDialog.ui" line="+14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>File name :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Total size :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Selected files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <location line="+7"/>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Download!</source>
-        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>