diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index bccb3e4a7..733d27614 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -73,25 +73,22 @@ ChannelFeed::ChannelFeed(QWidget *parent)
connect(treeView, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( channelListCustomPopupMenu( QPoint ) ) );
mChannelId.clear();
- model = new QStandardItemModel(0, 2, this);
+
+ model = new QStandardItemModel(0, COLUMN_COUNT, this);
model->setHeaderData(COLUMN_NAME, Qt::Horizontal, tr("Name"), Qt::DisplayRole);
model->setHeaderData(COLUMN_POPULARITY, Qt::Horizontal, tr("Popularity"), Qt::DisplayRole);
treeView->setModel(model);
- treeView->setEditTriggers(QAbstractItemView::NoEditTriggers);
treeView->setItemDelegate(new ChanGroupDelegate());
- treeView->setRootIsDecorated(true);
connect(treeView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(selectChannel(QModelIndex)));
- // hide header and id column
- treeView->setHeaderHidden(true);
-
/* Set header resize modes and initial section sizes TreeView*/
QHeaderView * _header = treeView->header () ;
- _header->setResizeMode ( COLUMN_POPULARITY, QHeaderView::Custom);
- _header->resizeSection ( COLUMN_NAME, 190 );
+ _header->setResizeMode ( COLUMN_NAME, QHeaderView::Stretch);
+ _header->setResizeMode ( COLUMN_POPULARITY, QHeaderView::Fixed);
+ _header->resizeSection ( COLUMN_POPULARITY, 25 );
// set ChannelList Font
itemFont = QFont("ARIAL", 10);
diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index 6a20fb394..ec717ea74 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -254,12 +254,27 @@ p, li { white-space: pre-wrap; }
Qt::CustomContextMenu
+
+ QAbstractItemView::NoEditTriggers
+
19
19
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.cpp b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
index 6d745f180..9001d111f 100644
--- a/retroshare-gui/src/gui/statusbar/peerstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
@@ -58,7 +58,7 @@ void PeerStatus::getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCo
if (statusPeers)
- statusPeers -> setText( tr("Friends:") + " " + QString::fromStdString(out.str()) + " | " + tr("Online:") + " " + QString::fromStdString(out2.str()) );
+ statusPeers -> setText( "" + tr("Friends") + ": " + QString::fromStdString(out.str()) + " | " + tr("Online") + ": " + QString::fromStdString(out2.str()) );
if (nOnlineCount > 0)
{
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index d5b140bd8..7f61c0d41 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 c06335676..f656ef4c2 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -856,7 +856,7 @@ p, li { white-space: pre-wrap; }
ChanMsgItem
-
+
Remove Item
Eintrag entfernen
@@ -877,12 +877,21 @@ p, li { white-space: pre-wrap; }
Abspielen
-
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans'; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Toggle Message Read Status</p></body></html>
+ Gelesen Status umschalten
+
+
+
New
Neu
-
+
Unsubscribe From Channel
Kanal abbestellen
@@ -1005,9 +1014,9 @@ p, li { white-space: pre-wrap; }
Hinzufügen
-
+
Set all to read
-
+ Alle als gelesen markieren
@@ -1035,7 +1044,7 @@ p, li { white-space: pre-wrap; }
Kanal abbestellen
-
+
Name
Name
@@ -1045,7 +1054,7 @@ p, li { white-space: pre-wrap; }
Beliebtheit
-
+
Own Channels
Meine Kanäle
@@ -1065,7 +1074,7 @@ p, li { white-space: pre-wrap; }
Andere Kanäle
-
+
Post to Channel
Kanalbeitrag erstellen
@@ -1100,12 +1109,12 @@ Abgeholt: %2
Verfügbar: %3
-
+
No Channel Selected
Keinen Kanal gewählt
-
+
Restore Publish Rights for Channel
Stelle Veröffentlichungsrechte für Kanal wieder her
@@ -2089,6 +2098,11 @@ Möchten Sie die Änderungen speichern?
+ Key recipients can publish to restricted-type channels, and can view and publish for private-type channels
+
+
+
+
Share Private Publish Key
Verteile privaten Schlüssel
@@ -4947,7 +4961,7 @@ p, li { white-space: pre-wrap; }
Blogs
-
+
Internal Error
Interener Fehler
@@ -5005,7 +5019,7 @@ p, li { white-space: pre-wrap; }
Schnellstart Assistent
-
+
Search
Suchen
@@ -5020,7 +5034,7 @@ p, li { white-space: pre-wrap; }
Messenger
-
+
Show/Hide
Anzeigen/Verbergen
@@ -5069,7 +5083,7 @@ p, li { white-space: pre-wrap; }
Maximieren
-
+
Links Cloud
Verknüpfungs-Wolke
@@ -5084,7 +5098,7 @@ p, li { white-space: pre-wrap; }
-
+
Help
Hilfe
@@ -5094,7 +5108,7 @@ p, li { white-space: pre-wrap; }
Über
-
+
Forums
Foren
@@ -5104,7 +5118,7 @@ p, li { white-space: pre-wrap; }
RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform
-
+
Open Messages
Öffne Nachrichten
@@ -5114,12 +5128,12 @@ p, li { white-space: pre-wrap; }
Anwendungen
-
+
Plugins
-
+
Do you really want to exit RetroShare ?
Wollen Sie RetroShare wirklich beenden?
@@ -7086,13 +7100,13 @@ p, li { white-space: pre-wrap; }
- <strong>Friends:</strong>
-
+ Friends
+ Freunde
- <span style="color:#0000FF"><strong>Online:</strong></span>
- <span style="color:#0000FF"><strong>Online:</strong></span>
+ Online
+ Online